diff options
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/options.coffee | 1 | ||||
| -rw-r--r-- | pages/options.html | 5 | ||||
| -rw-r--r-- | pages/popup.coffee | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/pages/options.coffee b/pages/options.coffee index cb6c1184..1b7faea0 100644 --- a/pages/options.coffee +++ b/pages/options.coffee @@ -89,6 +89,7 @@ populateOptions = -> # Self-handling options build their own DOM, and provide callbacks for saveOptions and restoreToDefaults. for field of selfHandlingFields selfHandlingCallbacks[field] = selfHandlingFields[field]($(field),enableSaveButton) + onDataLoaded() restoreToDefaults = -> return unless confirm "Are you sure you want to return Vimium's settings to their defaults?" diff --git a/pages/options.html b/pages/options.html index c9fc5a63..b0ae8fd5 100644 --- a/pages/options.html +++ b/pages/options.html @@ -183,11 +183,6 @@ border-radius: 2px; color: #444; } - .exclusionRemoveButton { - /* cursor: pointer; */ - /* border: none; */ - /* background: none; */ - } input.pattern, input.passKeys { font-family: Consolas, "Liberation Mono", Courier, monospace; font-size: 14px; diff --git a/pages/popup.coffee b/pages/popup.coffee index ff943f32..2f3cee2a 100644 --- a/pages/popup.coffee +++ b/pages/popup.coffee @@ -7,13 +7,12 @@ onLoad = -> document.getElementById("optionsLink").setAttribute "href", chrome.runtime.getURL("pages/options.html") chrome.tabs.getSelected null, (tab) -> isEnabled = chrome.extension.getBackgroundPage().isEnabledForUrl(url: tab.url) + # Check if we have an existing exclusing rule for this page. if isEnabled.rule - # There is an existing exclusion rule for this page. originalRule = isEnabled.rule originalPattern = originalRule.pattern originalPassKeys = originalRule.passKeys else - # There is not an existing exclusion rule. # The common use case is to disable Vimium at the domain level. # This regexp will match "http://www.example.com/" from "http://www.example.com/path/to/page.html". domain = (tab.url.match(/[^\/]*\/\/[^\/]*\//) or tab.url) + "*" |