diff options
| author | jez | 2011-02-01 02:03:12 +0800 |
|---|---|---|
| committer | jez | 2011-02-01 02:05:37 +0800 |
| commit | d31aa9fefc26f562f45043ad184846c469a580a9 (patch) | |
| tree | b8330f4dca6e0aa523c89847f0f7fe34611f0e15 | |
| parent | 7d07dbf78e044c1f717786ec8df1cb0febd9838e (diff) | |
| download | vimium-d31aa9fefc26f562f45043ad184846c469a580a9.tar.bz2 | |
Tidy up merge
| -rw-r--r-- | commands.js | 6 | ||||
| -rw-r--r-- | manifest.json | 2 | ||||
| -rw-r--r-- | vimiumFrontend.js | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/commands.js b/commands.js index 7c0f4a9d..b5d0a359 100644 --- a/commands.js +++ b/commands.js @@ -146,6 +146,9 @@ function clearKeyMappingsAndSetDefaults() { "x": "removeTab", "X": "restoreTab", + "b": "activateBookmarkFindMode", + "B": "activateBookmarkFindModeToOpenInNewTab", + "gf": "nextFrame" }; @@ -207,6 +210,9 @@ var commandDescriptions = { removeTab: ["Close current tab", { background: true }], restoreTab: ["Restore closed tab", { background: true }], + activateBookmarkFindMode: ["Open a bookmark in the current tab"], + activateBookmarkFindModeToOpenInNewTab: ["Open a bookmark in a new tab"], + nextFrame: ["Cycle forward to the next frame on the page", { background: true }] }; diff --git a/manifest.json b/manifest.json index e100f42d..417467b7 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ "options_page": "options.html", "permissions": [ "tabs", - "bookmarks", + "bookmarks", "http://*/*", "https://*/*" ], diff --git a/vimiumFrontend.js b/vimiumFrontend.js index 6877be5f..e0b6eb6a 100644 --- a/vimiumFrontend.js +++ b/vimiumFrontend.js @@ -266,7 +266,6 @@ function scrollFullPageDown() { window.scrollBy(0, window.innerHeight); } function scrollLeft() { window.scrollBy(-1 * settings.get("scrollStepSize"), 0); } function scrollRight() { window.scrollBy(settings.get("scrollStepSize"), 0); } - function focusInput(count) { var results = document.evaluate(textInputXPath, document.documentElement, null, |