diff options
| -rw-r--r-- | background_scripts/exclusions.coffee | 39 | ||||
| -rw-r--r-- | background_scripts/main.coffee | 87 | ||||
| -rw-r--r-- | lib/clipboard.coffee | 2 | ||||
| -rw-r--r-- | lib/utils.coffee | 6 | ||||
| -rw-r--r-- | tests/unit_tests/exclusion_test.coffee | 16 | ||||
| -rw-r--r-- | tests/unit_tests/utils_test.coffee | 4 |
6 files changed, 73 insertions, 81 deletions
diff --git a/background_scripts/exclusions.coffee b/background_scripts/exclusions.coffee index 95100935..10450670 100644 --- a/background_scripts/exclusions.coffee +++ b/background_scripts/exclusions.coffee @@ -1,11 +1,9 @@ -root = exports ? window - RegexpCache = cache: {} - clear: -> @cache = {} + clear: (@cache = {}) -> get: (pattern) -> - if regexp = @cache[pattern] - regexp + if pattern of @cache + @cache[pattern] else @cache[pattern] = # We use try/catch to ensure that a broken regexp doesn't wholly cripple Vimium. @@ -14,11 +12,10 @@ RegexpCache = catch /^$/ # Match the empty string. -# The Exclusions class manages the exclusion rule setting. -# An exclusion is an object with two attributes: pattern and passKeys. -# The exclusions are an array of such objects. +# The Exclusions class manages the exclusion rule setting. An exclusion is an object with two attributes: +# pattern and passKeys. The exclusion rules are an array of such objects. -root.Exclusions = Exclusions = +Exclusions = # Make RegexpCache, which is required on the page popup, accessible via the Exclusions object. RegexpCache: RegexpCache @@ -28,26 +25,32 @@ root.Exclusions = Exclusions = # is the default. However, when called from the page popup, we are testing what effect candidate new rules # would have on the current tab. In this case, the candidate rules are provided by the caller. getRule: (url, rules=@rules) -> - matches = (rule for rule in rules when rule.pattern and 0 <= url.search(RegexpCache.get(rule.pattern))) - # An absolute exclusion rule (with no passKeys) takes priority. - for rule in matches + matchingRules = (rule for rule in rules when rule.pattern and 0 <= url.search RegexpCache.get rule.pattern) + # An absolute exclusion rule (one with no passKeys) takes priority. + for rule in matchingRules return rule unless rule.passKeys # Strip whitespace from all matching passKeys strings, and join them together. - passKeys = (rule.passKeys.split(/\s+/).join "" for rule in matches).join "" - if 0 < matches.length - pattern: (rule.pattern for rule in matches).join " | " # Not used; for debugging only. + passKeys = (rule.passKeys.split(/\s+/).join "" for rule in matchingRules).join "" + if 0 < matchingRules.length passKeys: Utils.distinctCharacters passKeys else null + isEnabledForUrl: (url) -> + rule = Exclusions.getRule url + isEnabledForUrl: not rule or 0 < rule.passKeys.length + passKeys: rule?.passKeys ? "" + setRules: (rules) -> # Callers map a rule to null to have it deleted, and rules without a pattern are useless. @rules = rules.filter (rule) -> rule and rule.pattern - Settings.set("exclusionRules", @rules) + Settings.set "exclusionRules", @rules postUpdateHook: (@rules) -> RegexpCache.clear() # Register postUpdateHook for exclusionRules setting. -Settings.postUpdateHooks["exclusionRules"] = (value) -> - Exclusions.postUpdateHook value +Settings.postUpdateHooks["exclusionRules"] = Exclusions.postUpdateHook.bind Exclusions + +root = exports ? window +extend root, {Exclusions} diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee index 79c3b005..4ce8c03a 100644 --- a/background_scripts/main.coffee +++ b/background_scripts/main.coffee @@ -74,12 +74,6 @@ chrome.runtime.onMessage.addListener((request, sender, sendResponse) -> # Ensure the sendResponse callback is freed. return false) -# -# Used by the content scripts to get their full URL. This is needed for URLs like "view-source:http:# .." -# because window.location doesn't know anything about the Chrome-specific "view-source:". -# -getCurrentTabUrl = (request, sender) -> sender.tab.url - onURLChange = (details) -> chrome.tabs.sendMessage details.tabId, name: "checkEnabledAfterURLChange" @@ -161,13 +155,6 @@ TabOperations = chrome.tabs.create tabConfig, callback # -# Copies or pastes some data (request.data) to/from the clipboard. -# We return null to avoid the return value from the copy operations being passed to sendResponse. -# -copyToClipboard = (request) -> Clipboard.copy(request.data); null -pasteFromClipboard = (request) -> Clipboard.paste() - -# # Selects the tab with the ID specified in request.id # selectSpecificTab = (request) -> @@ -175,10 +162,6 @@ selectSpecificTab = (request) -> chrome.windows.update(tab.windowId, { focused: true }) chrome.tabs.update(request.id, { selected: true })) -repeatCommand = (command) -> (request) -> - if 0 < request.count-- - command request, (request) -> (repeatCommand command) request - moveTab = ({count, tab, registryEntry}) -> count = -count if registryEntry.command == "moveTabLeft" chrome.tabs.getAllInWindow null, (tabs) -> @@ -188,12 +171,14 @@ moveTab = ({count, tab, registryEntry}) -> chrome.tabs.move tab.id, index: Math.max minIndex, Math.min maxIndex, tab.index + count -# Start action functions +mkRepeatCommand = (command) -> (request) -> + if 0 < request.count-- + command request, (request) -> (mkRepeatCommand command) request -# These are commands which are bound to keystroke which must be handled by the background page. They are +# These are commands which are bound to keystrokes which must be handled by the background page. They are # mapped in commands.coffee. BackgroundCommands = - createTab: repeatCommand (request, callback) -> + createTab: mkRepeatCommand (request, callback) -> request.url ?= do -> url = Settings.get "newTabUrl" if url == "pages/blank.html" @@ -202,7 +187,7 @@ BackgroundCommands = else url TabOperations.openUrlInNewTab request, (tab) -> callback extend request, {tab, tabId: tab.id} - duplicateTab: repeatCommand (request, callback) -> + duplicateTab: mkRepeatCommand (request, callback) -> chrome.tabs.duplicate request.tabId, (tab) -> callback extend request, {tab, tabId: tab.id} moveTabToNewWindow: ({count, tab}) -> chrome.tabs.query {currentWindow: true}, (tabs) -> @@ -220,7 +205,7 @@ BackgroundCommands = activeTabIndex = tab.index startTabIndex = Math.max 0, Math.min activeTabIndex, tabs.length - count chrome.tabs.remove (tab.id for tab in tabs[startTabIndex...startTabIndex + count]) - restoreTab: repeatCommand (request, callback) -> chrome.sessions.restore null, callback request + restoreTab: mkRepeatCommand (request, callback) -> chrome.sessions.restore null, callback request openCopiedUrlInCurrentTab: (request) -> TabOperations.openUrlInCurrentTab extend request, url: Clipboard.paste() openCopiedUrlInNewTab: (request) -> @createTab extend request, url: Clipboard.paste() togglePinTab: ({tab}) -> chrome.tabs.update tab.id, {pinned: !tab.pinned} @@ -242,13 +227,14 @@ BackgroundCommands = # Remove tabs before, after, or either side of the currently active tab removeTabsRelative = (direction, {tab: activeTab}) -> chrome.tabs.query {currentWindow: true}, (tabs) -> - shouldDelete = switch direction - when "before" - (index) -> index < activeTab.index - when "after" - (index) -> index > activeTab.index - when "both" - (index) -> index != activeTab.index + shouldDelete = + switch direction + when "before" + (index) -> index < activeTab.index + when "after" + (index) -> index > activeTab.index + when "both" + (index) -> index != activeTab.index chrome.tabs.remove (tab.id for tab in tabs when not tab.pinned and shouldDelete tab.index) @@ -270,15 +256,13 @@ selectTab = (direction, {count, tab}) -> chrome.tabs.update tabs[toSelect].id, selected: true chrome.tabs.onUpdated.addListener (tabId, changeInfo, tab) -> - return unless changeInfo.status == "loading" # only do this once per URL change + return unless changeInfo.status == "loading" # Only do this once per URL change. cssConf = allFrames: true code: Settings.get("userDefinedLinkHintCss") runAt: "document_start" chrome.tabs.insertCSS tabId, cssConf, -> chrome.runtime.lastError -# End action functions - Frames = onConnect: (sender, port) -> [tabId, frameId] = [sender.tab.id, sender.frameId] @@ -293,7 +277,7 @@ Frames = # we tidy up in the chrome.tabs.onRemoved listener. This elides any dependency on the order in which # events happen (e.g. on navigation, a new top frame registers before the old one unregisters). if tabId of frameIdsForTab and frameId != 0 - frameIdsForTab[tabId] = frameIdsForTab[tabId].filter (fId) -> fId != frameId + frameIdsForTab[tabId] = (fId for fId in frameIdsForTab[tabId] when fId != frameId) # Return our onMessage handler for this port. (request, port) => @@ -301,10 +285,7 @@ Frames = isEnabledForUrl: ({request, tabId, port}) -> urlForTab[tabId] = request.url if request.frameIsFocused - rule = Exclusions.getRule request.url - enabledState = - isEnabledForUrl: not rule or 0 < rule.passKeys.length - passKeys: rule?.passKeys ? "" + enabledState = Exclusions.isEnabledForUrl request.url if request.frameIsFocused chrome.browserAction.setIcon tabId: tabId, path: @@ -315,7 +296,6 @@ Frames = else "icons/browser_action_enabled.png" - # Send the response. The tests require this to be last. port.postMessage extend request, enabledState domReady: ({tabId, frameId}) -> @@ -339,14 +319,6 @@ cycleToFrame = (frames, frameId, count = 0) -> count = (count + Math.max 0, frames.indexOf frameId) % frames.length [frames[count..]..., frames[0...count]...] -# Send a message to all frames in the current tab. -sendMessageToFrames = (request, sender) -> - chrome.tabs.sendMessage sender.tab.id, request.message - -# For debugging only. This allows content scripts to log messages to the extension's logging page. -bgLog = (request, sender) -> - BgUtils.log "#{request.frameId} #{request.message}", sender - # Port handler mapping portHandlers = completions: handleCompletions @@ -354,22 +326,26 @@ portHandlers = sendRequestHandlers = runBackgroundCommand: (request) -> BackgroundCommands[request.registryEntry.command] request - getCurrentTabUrl: getCurrentTabUrl - openUrlInNewTab: TabOperations.openUrlInNewTab + # getCurrentTabUrl is used by the content scripts to get their full URL, because window.location cannot help + # with Chrome-specific URLs like "view-source:http:..". + getCurrentTabUrl: ({tab}) -> tab.url + openUrlInNewTab: (request) -> TabOperations.openUrlInNewTab request openUrlInIncognito: (request) -> chrome.windows.create incognito: true, url: Utils.convertToUrl request.url openUrlInCurrentTab: TabOperations.openUrlInCurrentTab openOptionsPageInNewTab: (request) -> chrome.tabs.create url: chrome.runtime.getURL("pages/options.html"), index: request.tab.index + 1 frameFocused: handleFrameFocused nextFrame: BackgroundCommands.nextFrame - copyToClipboard: copyToClipboard - pasteFromClipboard: pasteFromClipboard + copyToClipboard: Clipboard.copy.bind Clipboard + pasteFromClipboard: Clipboard.paste.bind Clipboard selectSpecificTab: selectSpecificTab createMark: Marks.create.bind(Marks) gotoMark: Marks.goto.bind(Marks) - sendMessageToFrames: sendMessageToFrames - log: bgLog + # Send a message to all frames in the current tab. + sendMessageToFrames: (request, sender) -> chrome.tabs.sendMessage sender.tab.id, request.message fetchFileContents: (request, sender) -> fetchFileContents request.fileName + # For debugging only. This allows content scripts to log messages to the extension's logging page. + log: ({frameId, message}, sender) -> BgUtils.log "#{frameId} #{message}", sender # We always remove chrome.storage.local/findModeRawQueryListIncognito on startup. chrome.storage.local.remove "findModeRawQueryListIncognito" @@ -395,7 +371,7 @@ window.runTests = -> open(chrome.runtime.getURL('tests/dom_tests/dom_tests.html' # # Show notification on upgrade. -showUpgradeMessage = -> +do showUpgradeMessage = -> # Avoid showing the upgrade notification when previousVersion is undefined, which is the case for new # installs. Settings.set "previousVersion", currentVersion unless Settings.get "previousVersion" @@ -419,12 +395,9 @@ showUpgradeMessage = -> # We need to wait for the user to accept the "notifications" permission. chrome.permissions.onAdded.addListener showUpgradeMessage -showUpgradeMessage() - # The install date is shown on the logging page. chrome.runtime.onInstalled.addListener ({reason}) -> unless reason in ["chrome_update", "shared_module_update"] chrome.storage.local.set installDate: new Date().toString() -root.TabOperations = TabOperations -root.Frames = Frames +extend root, {TabOperations, Frames} diff --git a/lib/clipboard.coffee b/lib/clipboard.coffee index f0fb83b1..af143dd9 100644 --- a/lib/clipboard.coffee +++ b/lib/clipboard.coffee @@ -6,7 +6,7 @@ Clipboard = textArea # http://groups.google.com/group/chromium-extensions/browse_thread/thread/49027e7f3b04f68/f6ab2457dee5bf55 - copy: (data) -> + copy: ({data}) -> textArea = @_createTextArea() textArea.value = data diff --git a/lib/utils.coffee b/lib/utils.coffee index 3b2a59a4..31bb47b6 100644 --- a/lib/utils.coffee +++ b/lib/utils.coffee @@ -162,10 +162,8 @@ Utils = # Transform "zjkjkabz" into "abjkz". distinctCharacters: (str) -> - unique = "" - for char in str.split("").sort() - unique += char unless 0 <= unique.indexOf char - unique + chars = str.split("").sort() + (ch for ch, index in chars when index == 0 or ch != chars[index-1]).join "" # Compares two version strings (e.g. "1.1" and "1.5") and returns # -1 if versionA is < versionB, 0 if they're equal, and 1 if versionA is > versionB. diff --git a/tests/unit_tests/exclusion_test.coffee b/tests/unit_tests/exclusion_test.coffee index 649dfd1f..54cb4ed3 100644 --- a/tests/unit_tests/exclusion_test.coffee +++ b/tests/unit_tests/exclusion_test.coffee @@ -15,12 +15,13 @@ root.Marks = extend(global, require "../../lib/utils.js") Utils.getCurrentVersion = -> '1.44' extend(global,require "../../lib/settings.js") +extend(global,require "../../lib/clipboard.js") extend(global, require "../../background_scripts/exclusions.js") extend(global, require "../../background_scripts/commands.js") extend(global, require "../../background_scripts/main.js") isEnabledForUrl = (request) -> - Frames.isEnabledForUrl {request, tabId: 0, port: postMessage: (request) -> request} + Exclusions.isEnabledForUrl request.url # These tests cover only the most basic aspects of excluded URLs and passKeys. # @@ -34,6 +35,9 @@ context "Excluded URLs and pass keys", { pattern: "http*://www.facebook.com/*", passKeys: "cdcd" } { pattern: "http*://www.bbc.com/*", passKeys: "" } { pattern: "http*://www.bbc.com/*", passKeys: "ab" } + { pattern: "http*://www.example.com/*", passKeys: "a bb c bba a" } + { pattern: "http*://www.duplicate.com/*", passKeys: "ace" } + { pattern: "http*://www.duplicate.com/*", passKeys: "bdf" } ]) should "be disabled for excluded sites", -> @@ -56,3 +60,13 @@ context "Excluded URLs and pass keys", assert.isTrue rule.isEnabledForUrl assert.isFalse rule.passKeys + should "handle spaces and duplicates in passkeys", -> + rule = isEnabledForUrl({ url: 'http://www.example.com/pages' }) + assert.isTrue rule.isEnabledForUrl + assert.equal "abc", rule.passKeys + + should "handle multiple passkeys rules", -> + rule = isEnabledForUrl({ url: 'http://www.duplicate.com/pages' }) + assert.isTrue rule.isEnabledForUrl + assert.equal "abcdef", rule.passKeys + diff --git a/tests/unit_tests/utils_test.coffee b/tests/unit_tests/utils_test.coffee index 9b71ca72..93849349 100644 --- a/tests/unit_tests/utils_test.coffee +++ b/tests/unit_tests/utils_test.coffee @@ -125,3 +125,7 @@ context "makeIdempotent", assert.equal 1, @count @func() assert.equal 1, @count + +context "distinctCharacters", + should "eliminate duplicate characters", -> + assert.equal "abc", Utils.distinctCharacters "bbabaabbacabbbab" |