Merge branch 'release-1.11'

README.md

@@ -20,7 +20,7 @@ The app is quite stable now. Basic stuff, as well as more advanced operations, s
 
 # Self-hosting
 
-Everything you need to host this app on your server is any static file server. The app is a single HTML file + cache manifest (optionally; for offline access).
+Everything you need to host this app on your server is any static file server. The app is a single HTML file + a service worker (optionally; for offline access).
 You can download the latest distribution files from [gh-pages](https://github.com/keeweb/keeweb/archive/gh-pages.zip) branch.  
 
 If you are using Docker:

app/scripts/auto-type/helper/auto-type-helper-linux.js

@@ -9,7 +9,7 @@ AutoTypeHelper.prototype.getActiveWindowInfo = function(callback) {
         complete(err, out) {
             let windowInfo;
             if (out) {
-                const [id, title] = out.trim().split('\n');
+                const [title, id] = out.trim().split('\n');
                 windowInfo = {
                     id,
                     title

app/scripts/auto-type/index.js

@@ -28,6 +28,7 @@ const AutoType = {
         Events.on('auto-type', e => this.handleEvent(e));
         Events.on('main-window-blur', e => this.resetPendingEvent(e));
         Events.on('main-window-will-close', e => this.resetPendingEvent(e));
+        appModel.files.on('change', () => this.processPendingEvent());
     },
 
     handleEvent(e) {
@@ -209,7 +210,6 @@ const AutoType = {
             const evt = { filter, windowInfo };
             if (!this.appModel.files.hasOpenFiles()) {
                 this.pendingEvent = evt;
-                this.appModel.files.once('change', this.processPendingEvent, this);
                 logger.debug('auto-type event delayed');
                 this.focusMainWindow();
             } else {
@@ -262,7 +262,6 @@ const AutoType = {
     resetPendingEvent() {
         if (this.pendingEvent) {
             this.pendingEvent = null;
-            this.appModel.files.off('change', this.processPendingEvent, this);
             logger.debug('auto-type event cancelled');
         }
     },
@@ -273,7 +272,6 @@ const AutoType = {
         }
         logger.debug('processing pending auto-type event');
         const evt = this.pendingEvent;
-        this.appModel.files.off('change', this.processPendingEvent, this);
         this.pendingEvent = null;
         this.processEventWithFilter(evt);
     }

app/scripts/plugins/plugin-gallery.js

@@ -33,22 +33,33 @@ const PluginGallery = {
                 this.logger.error('Network error loading plugins');
                 resolve();
             });
-        }).then(data => {
-            return this.verifySignature(data).then(gallery => {
+        })
+            .then(data => {
                 this.loading = false;
-                this.loadError = !gallery;
-                if (gallery) {
-                    this.logger.debug(
-                        `Loaded ${gallery.plugins.length} plugins`,
-                        this.logger.ts(ts)
-                    );
-                    this.gallery = gallery;
-                    this.saveGallery(gallery);
+                if (!data) {
+                    this.loadError = true;
+                    Events.emit('plugin-gallery-load-complete');
+                    return;
                 }
+                return this.verifySignature(data).then(gallery => {
+                    this.loadError = !gallery;
+                    if (gallery) {
+                        this.logger.debug(
+                            `Loaded ${gallery.plugins.length} plugins`,
+                            this.logger.ts(ts)
+                        );
+                        this.gallery = gallery;
+                        this.saveGallery(gallery);
+                    }
+                    Events.emit('plugin-gallery-load-complete');
+                    return gallery;
+                });
+            })
+            .catch(e => {
+                this.loadError = true;
+                this.logger.error('Error loading plugin gallery', e);
                 Events.emit('plugin-gallery-load-complete');
-                return gallery;
             });
-        });
     },
 
     verifySignature(gallery) {

desktop/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "KeeWeb",
-  "version": "1.11.3",
+  "version": "1.11.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

desktop/package.json

@@ -1,6 +1,6 @@
 {
     "name": "KeeWeb",
-    "version": "1.11.3",
+    "version": "1.11.4",
     "description": "Free cross-platform password manager compatible with KeePass",
     "main": "main.js",
     "homepage": "https://keeweb.info",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "keeweb",
-  "version": "1.11.3",
+  "version": "1.11.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "keeweb",
-    "version": "1.11.3",
+    "version": "1.11.4",
     "description": "Free cross-platform password manager compatible with KeePass",
     "main": "Gruntfile.js",
     "private": true,

release-notes.md

@@ -1,5 +1,10 @@
 Release notes
 -------------
+##### v1.11.4 (2019-09-29)
+`-` fix #1277: auto-type window matching on Linux  
+`-` fix #1278: entry selection auto-type window issues  
+`-` fixed displaying errors on the plugins page  
+
 ##### v1.11.3 (2019-09-29)
 `-` fix #1275: starting the app after closing on macOS  
 `-` fix #1276 GDrive connection issues