update to electron 2.0

fix annoying loss of repl focus when moving window around

Fixes #943
Fixes #944

Author: starpit

app/content/css/ui.css

@@ -208,7 +208,6 @@ body:not(.subwindow) repl.sidecar-visible .repl-block, body.sidecar-full-screen
 }
 .result-table .repl-result, .result-table.repl-result {
     display: table;
-    border-collapse: collapse;
     border-spacing: 0;
     border: 1px solid;
     margin-top: 0.75em;
@@ -349,6 +348,9 @@ body/*:not(.sidecar-full-screen)*/ repl.sidecar-visible .repl-context, body/*:no
     text-overflow: ellipsis;
     white-space: nowrap;
 }
+.entity:first-child .entity-attributes > span {
+    border-top: none;
+}
 .entity-attributes > span {
     display: table-cell;
     vertical-align: middle;

app/content/js/repl.js

@@ -123,7 +123,12 @@ const formatOneListResult = options => (entity, idx, A) => {
             const interval = setInterval(() => {
                 try {
                     Promise.resolve(watch())
-                        .then(({ value, done=false, css, others=[] }) => {
+                        .then(({ value, done=false, css, others=[], unchanged=false }) => {
+                            if (unchanged) {
+                                // nothing to do, yet
+                                return
+                            }
+
                             // are we done polling for updates?
                             if (!value || done) {
                                 clearInterval(interval)
@@ -427,6 +432,11 @@ self.init = (prefs={}) => {
         }
     }
 
+    // we don't want the prompt to lose focus when the user drags when
+    // window around (which is initiated by clicking on the header)
+    document.querySelector('.page > header').onclick = evt => {
+        ui.getCurrentPrompt().focus()
+    }
 
     /** listen for paste events, focus on the current prompt first */
     document.body.onpaste = evt => {

app/main.js

@@ -215,7 +215,7 @@ function createWindow(noHeadless, executeThisArgvPlease, subwindowPlease, subwin
 	    const { clipboard, nativeImage, webContents } = electron
 	    webContents.fromId(contentsId).capturePage(rect, image => {
 		try {
-		    const buf = image.toPng()
+		    const buf = image.toPNG()
 		    clipboard.writeImage(nativeImage.createFromBuffer(buf))
 		    event.sender.send('capture-page-to-clipboard-done', buf)
 		} catch (err) {

app/package.json

@@ -25,7 +25,7 @@
   "license": "Apache-2.0",
   "bugs": "https://github.com/ibm-functions/shell",
   "devDependencies": {
-    "electron": "~1.8.4",
+    "electron": "~2.0.0",
     "nyc": "^11.3.0"
   },
   "dependencies": {