Merge branch 'v0.5.5' into linux

* v0.5.5:
  The notification of 'Copy to Clipboard' must be slient
  modify window API to fit the new version of electron
  bump up version of electron

browser/finder/index.js

@@ -29,7 +29,6 @@ function hideFinder () {
 function notify (title, options) {
   if (process.platform === 'win32') {
     options.icon = path.join('file://', global.__dirname, '../../resources/app.png')
-    options.silent = false
   }
   return new window.Notification(title, options)
 }
@@ -96,7 +95,8 @@ class FinderMain extends React.Component {
 
     ipcRenderer.send('copy-finder')
     notify('Saved to Clipboard!', {
-      body: 'Paste it wherever you want!'
+      body: 'Paste it wherever you want!',
+      silent: true
     })
     hideFinder()
   }

lib/finder-window.js

@@ -79,12 +79,12 @@ var config = {
   show: false,
   frame: false,
   resizable: false,
-  'zoom-factor': 1.0,
+  zoomFactor: 1.0,
-  'web-preferences': {
+  webPreferences: {
-    'overlay-scrollbars': true,
+    blinkFeatures: 'OverlayScrollbars'
-    'skip-taskbar': true
   },
-  'standard-window': false
+  skipTaskbar: true,
+  standardWindow: false
 }
 
 if (process.platform === 'darwin') {

lib/finder.html

@@ -39,7 +39,7 @@
     var scriptEl=document.createElement('script')
     scriptEl.setAttribute("type","text/javascript")
     scriptEl.setAttribute("src", scriptUrl)
-    document.getElementsByTagName("head")[0].appendChild(scriptEl)
+    document.body.appendChild(scriptEl)
   </script>
 </body>
 </html>

lib/main-window.js

@@ -6,11 +6,11 @@ const path = require('path')
 var mainWindow = new BrowserWindow({
   width: 1080,
   height: 720,
-  'zoom-factor': 1.0,
+  zoomFactor: 1.0,
-  'web-preferences': {
+  webPreferences: {
-    'overlay-scrollbars': true
+    blinkFeatures: 'OverlayScrollbars'
   },
-  'standard-window': false
+  standardWindow: false
 })
 
 const url = path.resolve(__dirname, './main.html')

lib/main.html

@@ -68,7 +68,7 @@
     var scriptEl = document.createElement('script')
     scriptEl.setAttribute("type","text/javascript")
     scriptEl.setAttribute("src", scriptUrl)
-    document.getElementsByTagName("head")[0].appendChild(scriptEl)
+    document.body.appendChild(scriptEl)
   </script>
 </body>
 </html>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "boost",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Boostnote",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "webpack": "webpack-dev-server --hot --inline --config webpack.config.js"
   },
   "config": {
-    "electron-version": "0.35.4"
+    "electron-version": "0.36.10"
   },
   "repository": {
     "type": "git",
@@ -56,7 +56,7 @@
     "babel-preset-react-hmre": "^1.0.1",
     "css-loader": "^0.19.0",
     "electron-packager": "^5.1.0",
-    "electron-prebuilt": "^0.35.1",
+    "electron-prebuilt": "^0.36.10",
     "electron-release": "^2.2.0",
     "grunt": "^0.4.5",
     "grunt-electron-installer": "^1.2.0",