diff options
| author | Stephen Blott | 2014-12-24 05:44:56 +0000 |
|---|---|---|
| committer | Stephen Blott | 2014-12-24 05:44:56 +0000 |
| commit | 17b621240aaafd9b8863c5b15b7a2e26c5d0c105 (patch) | |
| tree | e3fd5099786ed09c63f29911f6f6d8112256ec5e | |
| parent | 99d784ff593378be41b5e6eb87867826fee9e921 (diff) | |
| parent | 25473c3dea3d847d36bda9c56a190dd3b0e5a43f (diff) | |
| download | vimium-17b621240aaafd9b8863c5b15b7a2e26c5d0c105.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into post-1.46
| -rw-r--r-- | background_scripts/settings.coffee | 2 | ||||
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index 4a63a5fb..e90bc1f8 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -62,7 +62,7 @@ root.Settings = Settings = defaults: scrollStepSize: 60 smoothScroll: true - keyMappings: "# Insert your prefered key mappings here." + keyMappings: "# Insert your preferred key mappings here." linkHintCharacters: "sadfjklewcmpgh" linkHintNumbers: "0123456789" filterLinkHints: false diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 071e87a6..2de08c39 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -205,7 +205,7 @@ initializeOnDomReady = -> registerFrame = -> # Don't register frameset containers; focusing them is no use. - if document.body.tagName.toLowerCase() != "frameset" + unless document.body?.tagName.toLowerCase() == "frameset" chrome.runtime.sendMessage handler: "registerFrame" frameId: frameId |