Merge branch 'master' into develop

app/scripts/comp/focus-detector.js

@@ -6,14 +6,18 @@ const FocusDetector = {
     init() {
         this.isFocused = true;
         this.detectsFocusWithEvents = !FeatureDetector.isDesktop && !FeatureDetector.isMobile;
-        window.onfocus = () => {
-            this.isFocused = true;
-            Backbone.trigger('focus');
-        };
-        window.onblur = () => {
-            this.isFocused = false;
-            Backbone.trigger('blur');
-        };
+        window.addEventListener('focus', () => {
+            if (!FocusDetector.isFocused) {
+                FocusDetector.isFocused = true;
+                Backbone.trigger('focus');
+            }
+        });
+        window.addEventListener('blur', () => {
+            if (FocusDetector.isFocused) {
+                FocusDetector.isFocused = false;
+                Backbone.trigger('blur');
+            }
+        });
     },
 
     hasFocus() {

desktop/package-lock.json

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

desktop/package.json

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

package.json

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

release-notes.md

@@ -1,5 +1,8 @@
 Release notes
 -------------
+##### v1.7.6 (2019-02-07)
+`-` fixed focus issues in desktop apps  
+
 ##### v1.7.5 (2019-02-04)
 `-` fix #1096: focus issues after minimizing  
 `-` fix #1094: plugin installation in MS Edge