diff options
| author | Jez Ng | 2012-09-08 16:37:05 -0400 | 
|---|---|---|
| committer | Jez Ng | 2012-09-08 16:37:05 -0400 | 
| commit | adf8b7cc617279e50594477560ec7031e2ab68ea (patch) | |
| tree | f43660994fb29770bd38e4b11cc11d828ecc0615 /content_scripts/vimium_frontend.coffee | |
| parent | 3e5bba24ede4f9392ff666634a0a8f05e21a02d1 (diff) | |
| parent | e740ea52b646f1b7cd0ef13e15571b20adaa3bd8 (diff) | |
| download | vimium-adf8b7cc617279e50594477560ec7031e2ab68ea.tar.bz2 | |
Merge branch 'next-release'
Diffstat (limited to 'content_scripts/vimium_frontend.coffee')
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 14 | 
1 files changed, 7 insertions, 7 deletions
| diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index ab3b1fbf..adec11c5 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -295,8 +295,8 @@ extend window,        chrome.extension.sendRequest({ handler: "openUrlInNewTab", url: url, selected: true })    copyCurrentUrl: -> -    # TODO(ilya): When the following bug is fixed, revisit this approach of sending back to the background page -    # to copy. +    # TODO(ilya): When the following bug is fixed, revisit this approach of sending back to the background +    # page to copy.      # http://code.google.com/p/chromium/issues/detail?id=55188      chrome.extension.sendRequest { handler: "getCurrentTabUrl" }, (url) ->        chrome.extension.sendRequest { handler: "copyToClipboard", data: url } @@ -895,9 +895,9 @@ window.showHelpDialog = (html, fid) ->        this.dialogElement.style.maxHeight = window.innerHeight - 80        this.showAdvancedCommands(this.getShowAdvancedCommands()) -    #  +    #      # Advanced commands are hidden by default so they don't overwhelm new and casual users. -    #  +    #      toggleAdvancedCommands: (event) ->        event.preventDefault()        showAdvanced = VimiumHelpDialog.getShowAdvancedCommands() @@ -958,9 +958,9 @@ HUD =      HUD.displayElement().style.display = ""    showUpgradeNotification: (version) -> -    HUD.upgradeNotificationElement().innerHTML = "Vimium has been updated to " + -      "<a class='vimiumReset' href='https://chrome.google.com/extensions/detail/dbepggeogbaibhgnhhndojpepiihcmeb'>" + -      version + "</a>.<a class='vimiumReset close-button' href='#'>x</a>" +    HUD.upgradeNotificationElement().innerHTML = "Vimium has been updated to  +      <a class='vimiumReset' href='https://chrome.google.com/extensions/detail/dbepggeogbaibhgnhhndojpepiihcmeb'> +      #{version}</a>.<a class='vimiumReset close-button' href='#'>x</a>"      links = HUD.upgradeNotificationElement().getElementsByTagName("a")      links[0].addEventListener("click", HUD.onUpdateLinkClicked, false)      links[1].addEventListener "click", (event) -> | 
