diff options
| author | Stephen Blott | 2015-04-29 14:21:02 +0100 |
|---|---|---|
| committer | Stephen Blott | 2015-04-29 14:21:02 +0100 |
| commit | 2259a8a37cf5a7ab971141777f478d430e33e1df (patch) | |
| tree | 844560bbaecfbd9ca017591bd2e6e47a49b88465 | |
| parent | acfa46cea94e951bc4955affe90db04675eda882 (diff) | |
| download | vimium-2259a8a37cf5a7ab971141777f478d430e33e1df.tar.bz2 | |
Revert "Only grab focus after link transition."
This reverts commit f1e46d8145c834a712f6be7c1e5bd590c72da749.
| -rw-r--r-- | background_scripts/main.coffee | 2 | ||||
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee index 559a904d..3a3392d8 100644 --- a/background_scripts/main.coffee +++ b/background_scripts/main.coffee @@ -100,7 +100,7 @@ root.isEnabledForUrl = isEnabledForUrl = (request, sender) -> } onURLChange = (details) -> - chrome.tabs.sendMessage details.tabId, extend details, name: "checkEnabledAfterURLChange" + chrome.tabs.sendMessage details.tabId, name: "checkEnabledAfterURLChange" # Re-check whether Vimium is enabled for a frame when the url changes without a reload. chrome.webNavigation.onHistoryStateUpdated.addListener onURLChange # history.pushState. diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index da2292de..1bf49a26 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -610,11 +610,11 @@ checkIfEnabledForUrl = (frameIsFocused = windowIsFocused()) -> # When we're informed by the background page that a URL in this tab has changed, we check if we have the # correct enabled state (but only if this frame has the focus). -checkEnabledAfterURLChange = (request) -> +checkEnabledAfterURLChange = -> if windowIsFocused() checkIfEnabledForUrl() # We also grab back the focus. See #1588. - new GrabBackFocus() if request.transitionType in [ "link", "form_submit" ] + new GrabBackFocus # Exported to window, but only for DOM tests. window.refreshCompletionKeys = (response) -> |