From 29a250d16f3da960271c0a68b58fd16632b57bb1 Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Sun, 13 Jan 2019 19:39:37 +0100 Subject: [PATCH 1/5] Only focuses input field when app or browser is active on lock. Fixes #423 --- app/scripts/util/browser-focus.js | 11 +++++++++++ app/scripts/views/open-view.js | 11 ++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 app/scripts/util/browser-focus.js diff --git a/app/scripts/util/browser-focus.js b/app/scripts/util/browser-focus.js new file mode 100644 index 00000000..c370fa1f --- /dev/null +++ b/app/scripts/util/browser-focus.js @@ -0,0 +1,11 @@ +const BrowserFocus = function () { + this.isFocused = false; + window.onblur = function () { this.isFocused = false; }.bind(this); + window.onfocus = function () { this.isFocused = true; }.bind(this); +}; + +BrowserFocus.prototype.hasFocus = function () { + return this.isFocused; +}; + +module.exports = BrowserFocus; diff --git a/app/scripts/views/open-view.js b/app/scripts/views/open-view.js index 9f4fc5b7..c72d1e60 100644 --- a/app/scripts/views/open-view.js +++ b/app/scripts/views/open-view.js @@ -15,6 +15,7 @@ const InputFx = require('../util/input-fx'); const Comparators = require('../util/comparators'); const Storage = require('../storage'); const Launcher = require('../comp/launcher'); +const BrowserFocus = require('../util/browser-focus'); const logger = new Logger('open-view'); @@ -69,6 +70,9 @@ const OpenView = Backbone.View.extend({ KeyHandler.onKey(Keys.DOM_VK_RETURN, this.enterKeyPress, this); KeyHandler.onKey(Keys.DOM_VK_DOWN, this.moveOpenFileSelectionDown, this); KeyHandler.onKey(Keys.DOM_VK_UP, this.moveOpenFileSelectionUp, this); + if (!FeatureDetector.isDesktop) { + this.browserFocus = new BrowserFocus(); + } }, render: function () { @@ -107,7 +111,12 @@ const OpenView = Backbone.View.extend({ focusInput: function() { if (!FeatureDetector.isMobile) { - this.inputEl.focus(); + if ( + (FeatureDetector.isDesktop && Launcher.isAppFocused()) || + (this.browserFocus.hasFocus()) + ) { + this.inputEl.focus(); + } } }, From 7fd72ff687b4504999c3011a6154f0339ae1769b Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Mon, 14 Jan 2019 08:56:33 +0100 Subject: [PATCH 2/5] Moved complete focus detection to a new util component --- app/scripts/util/browser-focus.js | 11 ----------- app/scripts/util/feature-detector.js | 1 + app/scripts/util/focus-detector.js | 20 ++++++++++++++++++++ app/scripts/views/open-view.js | 16 ++++------------ 4 files changed, 25 insertions(+), 23 deletions(-) delete mode 100644 app/scripts/util/browser-focus.js create mode 100644 app/scripts/util/focus-detector.js diff --git a/app/scripts/util/browser-focus.js b/app/scripts/util/browser-focus.js deleted file mode 100644 index c370fa1f..00000000 --- a/app/scripts/util/browser-focus.js +++ /dev/null @@ -1,11 +0,0 @@ -const BrowserFocus = function () { - this.isFocused = false; - window.onblur = function () { this.isFocused = false; }.bind(this); - window.onfocus = function () { this.isFocused = true; }.bind(this); -}; - -BrowserFocus.prototype.hasFocus = function () { - return this.isFocused; -}; - -module.exports = BrowserFocus; diff --git a/app/scripts/util/feature-detector.js b/app/scripts/util/feature-detector.js index 45f6a571..d0cd196d 100644 --- a/app/scripts/util/feature-detector.js +++ b/app/scripts/util/feature-detector.js @@ -14,6 +14,7 @@ const FeatureDetector = { isFrame: window.top !== window, isSelfHosted: !isDesktop && !/^http(s?):\/\/((localhost:8085)|((app|beta)\.keeweb\.info))/.test(location.href), needFixClicks: /Edge\/14/.test(navigator.appVersion), + isBrowser: !this.isDesktop && !this.isMobile, actionShortcutSymbol: function(formatting) { return this.isMac ? '⌘' : formatting ? 'ctrl + ' : 'ctrl-'; diff --git a/app/scripts/util/focus-detector.js b/app/scripts/util/focus-detector.js new file mode 100644 index 00000000..a2e8dc11 --- /dev/null +++ b/app/scripts/util/focus-detector.js @@ -0,0 +1,20 @@ +const FeatureDetector = require('./feature-detector'); +const Launcher = require('../comp/launcher'); + +const FocusDetector = function () { + this.isFocused = false; + if (FeatureDetector.isBrowser) { + window.onblur = () => { this.isFocused = false; }; + window.onfocus = () => { this.isFocused = true; }; + } +}; + +FocusDetector.prototype.hasFocus = function () { + if (FeatureDetector.isBrowser) { + return this.isFocused; + } else { + return Launcher.isAppFocused(); + } +}; + +module.exports = FocusDetector; diff --git a/app/scripts/views/open-view.js b/app/scripts/views/open-view.js index c72d1e60..3fbd2235 100644 --- a/app/scripts/views/open-view.js +++ b/app/scripts/views/open-view.js @@ -7,7 +7,6 @@ const SecureInput = require('../comp/secure-input'); const DropboxChooser = require('../comp/dropbox-chooser'); const KeyHandler = require('../comp/key-handler'); const StorageFileListView = require('../views/storage-file-list-view'); -const FeatureDetector = require('../util/feature-detector'); const Logger = require('../util/logger'); const Locale = require('../util/locale'); const UrlUtil = require('../util/url-util'); @@ -15,7 +14,7 @@ const InputFx = require('../util/input-fx'); const Comparators = require('../util/comparators'); const Storage = require('../storage'); const Launcher = require('../comp/launcher'); -const BrowserFocus = require('../util/browser-focus'); +const FocusDetector = require('../util/focus-detector'); const logger = new Logger('open-view'); @@ -70,9 +69,7 @@ const OpenView = Backbone.View.extend({ KeyHandler.onKey(Keys.DOM_VK_RETURN, this.enterKeyPress, this); KeyHandler.onKey(Keys.DOM_VK_DOWN, this.moveOpenFileSelectionDown, this); KeyHandler.onKey(Keys.DOM_VK_UP, this.moveOpenFileSelectionUp, this); - if (!FeatureDetector.isDesktop) { - this.browserFocus = new BrowserFocus(); - } + this.focusDetector = new FocusDetector(); }, render: function () { @@ -110,13 +107,8 @@ const OpenView = Backbone.View.extend({ }, focusInput: function() { - if (!FeatureDetector.isMobile) { - if ( - (FeatureDetector.isDesktop && Launcher.isAppFocused()) || - (this.browserFocus.hasFocus()) - ) { - this.inputEl.focus(); - } + if (this.focusDetector.hasFocus()) { + this.inputEl.focus(); } }, From 75eaf88d84c822a630fa470616d72402bf2742b8 Mon Sep 17 00:00:00 2001 From: antelle Date: Mon, 14 Jan 2019 19:05:16 +0100 Subject: [PATCH 3/5] fixed focus detector --- app/scripts/{util => comp}/focus-detector.js | 13 ++++++++----- app/scripts/util/feature-detector.js | 1 - app/scripts/views/open-view.js | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) rename app/scripts/{util => comp}/focus-detector.js (55%) diff --git a/app/scripts/util/focus-detector.js b/app/scripts/comp/focus-detector.js similarity index 55% rename from app/scripts/util/focus-detector.js rename to app/scripts/comp/focus-detector.js index a2e8dc11..21f5bc94 100644 --- a/app/scripts/util/focus-detector.js +++ b/app/scripts/comp/focus-detector.js @@ -1,19 +1,22 @@ -const FeatureDetector = require('./feature-detector'); +const FeatureDetector = require('../util/feature-detector'); const Launcher = require('../comp/launcher'); const FocusDetector = function () { - this.isFocused = false; - if (FeatureDetector.isBrowser) { + this.isFocused = true; + this.detectsFocusWithEvents = !FeatureDetector.isDesktop && !FeatureDetector.isMobile; + if (this.detectsFocusWithEvents) { window.onblur = () => { this.isFocused = false; }; window.onfocus = () => { this.isFocused = true; }; } }; FocusDetector.prototype.hasFocus = function () { - if (FeatureDetector.isBrowser) { + if (this.detectsFocusWithEvents) { return this.isFocused; - } else { + } else if (Launcher) { return Launcher.isAppFocused(); + } else { + return true; } }; diff --git a/app/scripts/util/feature-detector.js b/app/scripts/util/feature-detector.js index d0cd196d..45f6a571 100644 --- a/app/scripts/util/feature-detector.js +++ b/app/scripts/util/feature-detector.js @@ -14,7 +14,6 @@ const FeatureDetector = { isFrame: window.top !== window, isSelfHosted: !isDesktop && !/^http(s?):\/\/((localhost:8085)|((app|beta)\.keeweb\.info))/.test(location.href), needFixClicks: /Edge\/14/.test(navigator.appVersion), - isBrowser: !this.isDesktop && !this.isMobile, actionShortcutSymbol: function(formatting) { return this.isMac ? '⌘' : formatting ? 'ctrl + ' : 'ctrl-'; diff --git a/app/scripts/views/open-view.js b/app/scripts/views/open-view.js index 3fbd2235..8adb1bd2 100644 --- a/app/scripts/views/open-view.js +++ b/app/scripts/views/open-view.js @@ -14,7 +14,7 @@ const InputFx = require('../util/input-fx'); const Comparators = require('../util/comparators'); const Storage = require('../storage'); const Launcher = require('../comp/launcher'); -const FocusDetector = require('../util/focus-detector'); +const FocusDetector = require('../comp/focus-detector'); const logger = new Logger('open-view'); From 6f2cc1c1874e4caf347a1311e2b236bfb212da99 Mon Sep 17 00:00:00 2001 From: antelle Date: Thu, 17 Jan 2019 20:33:27 +0100 Subject: [PATCH 4/5] release notes --- release-notes.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release-notes.md b/release-notes.md index 6ef6b5c0..9b593d50 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,5 +1,8 @@ Release notes ------------- +##### v1.7.4 (2019-01-17) +`-` fix #423: input focus issues in desktop apps + ##### v1.7.3 (2019-01-13) `-` fixed window activation when KeeWeb is launched second time `-` fix #1087: Windows AutoType helper is now using .NET Framework v4 From ddf5b3987238737bd1f4d730bc0f3eb1c84f0328 Mon Sep 17 00:00:00 2001 From: antelle Date: Thu, 17 Jan 2019 20:34:26 +0100 Subject: [PATCH 5/5] bump version --- desktop/package-lock.json | 2 +- desktop/package.json | 2 +- package-lock.json | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/desktop/package-lock.json b/desktop/package-lock.json index b19d4307..dac08436 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -1,6 +1,6 @@ { "name": "KeeWeb", - "version": "1.7.3", + "version": "1.7.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/desktop/package.json b/desktop/package.json index 718b7cb6..1921a1f6 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -1,6 +1,6 @@ { "name": "KeeWeb", - "version": "1.7.3", + "version": "1.7.4", "description": "Free cross-platform password manager compatible with KeePass", "main": "main.js", "homepage": "https://keeweb.info", diff --git a/package-lock.json b/package-lock.json index 824abe84..f64c51f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "keeweb", - "version": "1.7.3", + "version": "1.7.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 222715bf..60e9f854 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "keeweb", - "version": "1.7.3", + "version": "1.7.4", "description": "Free cross-platform password manager compatible with KeePass", "main": "Gruntfile.js", "private": true,