diff options
| author | Stephen Blott | 2015-02-21 06:45:54 +0000 |
|---|---|---|
| committer | Stephen Blott | 2015-02-23 06:25:48 +0000 |
| commit | 731d45a8e8faf1f209632d5093bef5b554e26bb6 (patch) | |
| tree | de9d18e0ec901410c124f8ee62d6c8ee77592217 /background_scripts | |
| parent | 30485767273aabdd1190ba84b3002f8f15526695 (diff) | |
| download | vimium-731d45a8e8faf1f209632d5093bef5b554e26bb6.tar.bz2 | |
Ensure inconito mode flag and find-mode-history are initialised.
See #1495.
Diffstat (limited to 'background_scripts')
| -rw-r--r-- | background_scripts/main.coffee | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee index 1301cb77..9eafc2a2 100644 --- a/background_scripts/main.coffee +++ b/background_scripts/main.coffee @@ -77,11 +77,12 @@ getCurrentTabUrl = (request, sender) -> sender.tab.url # Checks the user's preferences in local storage to determine if Vimium is enabled for the given URL, and # whether any keys should be passed through to the underlying page. # -root.isEnabledForUrl = isEnabledForUrl = (request) -> +root.isEnabledForUrl = isEnabledForUrl = (request, sender) -> rule = Exclusions.getRule(request.url) { isEnabledForUrl: not rule or rule.passKeys passKeys: rule?.passKeys or "" + incognito: sender.tab.incognito } # Retrieves the help dialog HTML template from a file, and populates it with the latest keybindings. @@ -371,7 +372,7 @@ root.updateActiveState = updateActiveState = (tabId) -> if response isCurrentlyEnabled = response.enabled currentPasskeys = response.passKeys - config = isEnabledForUrl({url: tab.url}) + config = isEnabledForUrl { url: tab.url }, { tab: tab } enabled = config.isEnabledForUrl passKeys = config.passKeys if (enabled and passKeys) |