diff options
| -rw-r--r-- | background_page.html | 8 | ||||
| -rw-r--r-- | background_scripts/completion.coffee | 2 | ||||
| -rw-r--r-- | background_scripts/settings.coffee | 2 | ||||
| -rw-r--r-- | content_scripts/vimium_frontend.js | 4 | ||||
| -rw-r--r-- | content_scripts/vomnibar.js | 4 | ||||
| -rw-r--r-- | tests/utils_test.coffee | 26 |
6 files changed, 23 insertions, 23 deletions
diff --git a/background_page.html b/background_page.html index f3b68d3e..c3b170f8 100644 --- a/background_page.html +++ b/background_page.html @@ -6,7 +6,7 @@ <script type="text/javascript" src="background_scripts/settings.js"></script> <script type="text/javascript" src="background_scripts/completion.js"></script> <script type="text/javascript" charset="utf-8"> - var currentVersion = utils.getCurrentVersion(); + var currentVersion = Utils.getCurrentVersion(); var tabQueue = {}; // windowId -> Array var openTabs = {}; // tabId -> object with various tab properties @@ -191,7 +191,7 @@ html.push( "<tr class='vimiumReset " + (Commands.advancedCommands.indexOf(command) >= 0 ? "advanced" : "") + "'>", - "<td class='vimiumReset'>", utils.escapeHtml(bindings), "</td>", + "<td class='vimiumReset'>", Utils.escapeHtml(bindings), "</td>", "<td class='vimiumReset'>:</td><td class='vimiumReset'>", availableCommands[command].description); if (showCommandNames) @@ -228,7 +228,7 @@ */ function openUrlInCurrentTab(request) { chrome.tabs.getSelected(null, function(tab) { - chrome.tabs.update(tab.id, { url: utils.convertToUrl(request.url) }); + chrome.tabs.update(tab.id, { url: Utils.convertToUrl(request.url) }); }); } @@ -237,7 +237,7 @@ */ function openUrlInNewTab(request) { chrome.tabs.getSelected(null, function(tab) { - chrome.tabs.create({ url: utils.convertToUrl(request.url), index: tab.index + 1, selected: true }); + chrome.tabs.create({ url: Utils.convertToUrl(request.url), index: tab.index + 1, selected: true }); }); } diff --git a/background_scripts/completion.coffee b/background_scripts/completion.coffee index cc14c3a4..5d0f939a 100644 --- a/background_scripts/completion.coffee +++ b/background_scripts/completion.coffee @@ -30,7 +30,7 @@ class Suggestion @html = "<div class='topHalf'> <span class='source'>#{@type}</span> - <span class='title'>#{@highlightTerms(utils.escapeHtml(@title))}</span> + <span class='title'>#{@highlightTerms(Utils.escapeHtml(@title))}</span> </div> <div class='bottomHalf'> <span class='url'>#{@shortenUrl(@highlightTerms(@url))}</span> diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index ba9d1831..3b80dba6 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -46,7 +46,7 @@ Settings = localStorage[key] = if (localStorage[key] == "true") then true else false else localStorage[key] = JSON.stringify(localStorage[key]) - this.set("settingsVersion", utils.getCurrentVersion()) + this.set("settingsVersion", Utils.getCurrentVersion()) get: (key) -> if (key of localStorage) then JSON.parse(localStorage[key]) else this.defaults[key] diff --git a/content_scripts/vimium_frontend.js b/content_scripts/vimium_frontend.js index fc9976ad..2784882b 100644 --- a/content_scripts/vimium_frontend.js +++ b/content_scripts/vimium_frontend.js @@ -145,9 +145,9 @@ function initializePreDomReady() { port.onMessage.addListener(function(args) { if (frameId == args.frameId) { if (args.passCountToFunction) { - utils.invokeCommandString(args.command, [args.count]); + Utils.invokeCommandString(args.command, [args.count]); } else { - for (var i = 0; i < args.count; i++) { utils.invokeCommandString(args.command); } + for (var i = 0; i < args.count; i++) { Utils.invokeCommandString(args.command); } } } diff --git a/content_scripts/vomnibar.js b/content_scripts/vomnibar.js index b2fc14c4..c1deeb3c 100644 --- a/content_scripts/vomnibar.js +++ b/content_scripts/vomnibar.js @@ -171,7 +171,7 @@ var vomnibar = (function() { }, initDom: function() { - this.box = utils.createElementFromHtml( + this.box = Utils.createElementFromHtml( '<div id="vomnibar" class="vimiumReset">' + '<div class="searchArea">' + '<input type="text" />' + @@ -201,7 +201,7 @@ var vomnibar = (function() { refresh: function() { chrome.extension.sendRequest({ handler: "refreshCompleter", name: this.name }); }, filter: function(query, callback) { - var id = utils.createUniqueId(); + var id = Utils.createUniqueId(); this.filterPort.onMessage.addListener(function(msg) { if (msg.id != id) return; // The result objects coming from the background page will be of the form: diff --git a/tests/utils_test.coffee b/tests/utils_test.coffee index 051266c1..c5e5d002 100644 --- a/tests/utils_test.coffee +++ b/tests/utils_test.coffee @@ -3,18 +3,18 @@ extend(global, require "../lib/utils.js") context "convertToUrl", should "detect and clean up valid URLs", -> - assert.equal "http://www.google.com/", utils.convertToUrl("http://www.google.com/") - assert.equal "http://www.google.com/", utils.convertToUrl(" http://www.google.com/ ") - assert.equal "http://www.google.com", utils.convertToUrl("www.google.com") - assert.equal "http://google.com", utils.convertToUrl("google.com") - assert.equal "http://localhost", utils.convertToUrl("localhost") - assert.equal "http://xyz.museum", utils.convertToUrl("xyz.museum") - assert.equal "chrome://extensions", utils.convertToUrl("chrome://extensions") - assert.equal "http://user:pass@ftp.xyz.com/test", utils.convertToUrl("user:pass@ftp.xyz.com/test") - assert.equal "http://127.0.0.1", utils.convertToUrl("127.0.0.1") - assert.equal "http://127.0.0.1:8080", utils.convertToUrl("127.0.0.1:8080") - assert.equal "http://[::]:8080", utils.convertToUrl("[::]:8080") + assert.equal "http://www.google.com/", Utils.convertToUrl("http://www.google.com/") + assert.equal "http://www.google.com/", Utils.convertToUrl(" http://www.google.com/ ") + assert.equal "http://www.google.com", Utils.convertToUrl("www.google.com") + assert.equal "http://google.com", Utils.convertToUrl("google.com") + assert.equal "http://localhost", Utils.convertToUrl("localhost") + assert.equal "http://xyz.museum", Utils.convertToUrl("xyz.museum") + assert.equal "chrome://extensions", Utils.convertToUrl("chrome://extensions") + assert.equal "http://user:pass@ftp.xyz.com/test", Utils.convertToUrl("user:pass@ftp.xyz.com/test") + assert.equal "http://127.0.0.1", Utils.convertToUrl("127.0.0.1") + assert.equal "http://127.0.0.1:8080", Utils.convertToUrl("127.0.0.1:8080") + assert.equal "http://[::]:8080", Utils.convertToUrl("[::]:8080") should "convert non-URL terms into search queries", -> - assert.equal "http://www.google.com/search?q=google", utils.convertToUrl("google") - assert.equal "http://www.google.com/search?q=go%20ogle.com", utils.convertToUrl("go ogle.com") + assert.equal "http://www.google.com/search?q=google", Utils.convertToUrl("google") + assert.equal "http://www.google.com/search?q=go%20ogle.com", Utils.convertToUrl("go ogle.com") |