diff options
| author | Ilya Sukhar | 2011-01-29 13:03:11 -0800 |
|---|---|---|
| committer | Ilya Sukhar | 2011-01-29 13:03:11 -0800 |
| commit | a84c9cb1363a27af1b4ab9bee32b4620f18ff469 (patch) | |
| tree | 49bd2da649c72af7ea69665f12cbf606a740a087 | |
| parent | 6b851077a2f826c12bee116ec6cfcf3ed73d709d (diff) | |
| parent | 41bdf1383ea5a019dd5afd1810b3069bbd715fdf (diff) | |
| download | vimium-a84c9cb1363a27af1b4ab9bee32b4620f18ff469.tar.bz2 | |
Merge branch 'master' of https://github.com/stchris/vimium into stchris-master
| -rw-r--r-- | commands.js | 4 | ||||
| -rw-r--r-- | vimiumFrontend.js | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/commands.js b/commands.js index 7ee25520..7f30df97 100644 --- a/commands.js +++ b/commands.js @@ -107,6 +107,7 @@ function clearKeyMappingsAndSetDefaults() { mapKeyToCommand('zi', 'zoomIn'); mapKeyToCommand('zo', 'zoomOut'); + mapKeyToCommand('z0', 'zoomReset'); mapKeyToCommand('gi', 'focusInput'); @@ -154,6 +155,7 @@ addCommand('reload', 'Reload the page'); addCommand('toggleViewSource', 'View page source'); addCommand('zoomIn', 'Zoom in'); addCommand('zoomOut', 'Zoom out'); +addCommand('zoomReset', 'Reset zoom to default value'); addCommand('copyCurrentUrl', 'Copy the current URL to the clipboard'); addCommand('enterInsertMode', 'Enter insert mode'); @@ -195,7 +197,7 @@ var commandGroups = { ["scrollDown", "scrollUp", "scrollLeft", "scrollRight", "scrollToTop", "scrollToBottom", "scrollToLeft", "scrollToRight", "scrollPageDown", "scrollPageUp", "scrollFullPageUp", "scrollFullPageDown", - "reload", "toggleViewSource", "zoomIn", "zoomOut", "copyCurrentUrl", "goUp", + "reload", "toggleViewSource", "zoomIn", "zoomOut", "zoomReset", "copyCurrentUrl", "goUp", "enterInsertMode", "focusInput", "activateLinkHintsMode", "activateLinkHintsModeToOpenInNewTab", "activateLinkHintsModeWithQueue", "goPrevious", "goNext", diff --git a/vimiumFrontend.js b/vimiumFrontend.js index cc991f02..8c5f94db 100644 --- a/vimiumFrontend.js +++ b/vimiumFrontend.js @@ -229,6 +229,11 @@ function zoomOut() { saveZoomLevel(window.location.host, currentZoomLevel); } +function zoomReset() { + setPageZoomLevel(100, true); + saveZoomLevel(window.location.host, 100); +} + function scrollToBottom() { window.scrollTo(window.pageXOffset, document.body.scrollHeight); } function scrollToTop() { window.scrollTo(window.pageXOffset, 0); } function scrollToLeft() { window.scrollTo(0, window.pageYOffset); } |