Merge branch 'master' of github.com:philc/vimium

Conflicts:
	settings.html

4 files changed, 20 insertions, 9 deletions

diff --git a/CREDITS b/CREDITS
index 22c56028..8baece39 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3,5 +3,10 @@ Authors & Maintainers:
   Phil Crosby <phil.crosby@gmail.com> (github: philc)
 
 Contributors:
-  lack
   acrollet
+  akhilman
+  drizzd
+  lack
+  markstos
+
+Feel free to add real names in addition to GitHub usernames.
diff --git a/README.markdown b/README.markdown
index e3d0a4cd..680a8b15 100644
--- a/README.markdown
+++ b/README.markdown
@@ -29,8 +29,8 @@ Navigating the current page:
     l       scroll right
     gg      scroll to top of the page
     G       scroll to bottom of the page
-    <c-d>   scroll down a page
-    <c-u>   scroll up a page
+    <c-d>, <c-e>   scroll down a page
+    <c-u>, <c-y>   scroll up a page
     <c-f>   scroll down a full page
     <c-b>   scroll up a full page
     f       activate link hints mode to open in current page
@@ -56,8 +56,8 @@ Manipulating tabs:
     d          close current tab
     u          restore closed tab (i.e. unwind the 'd' command)
 
-Vimium supports command repetition so, for example, hitting '5t' will open 5 tabs in rapid succession. ESC
-will clear any partial commands in the queue.
+Vimium supports command repetition so, for example, hitting '5t' will open 5 tabs in rapid succession. ESC (or
+<c-[>) will clear any partial commands in the queue.
 
 Contributing
 ------------
@@ -73,6 +73,10 @@ Release Notes
 
 -  Commands <c-f> and <c-b> to scroll a full page up or down.
 -  Bugfixes related to entering insert mode when the page first loads, and when focusing Flash embeds.
+-  Added command listing to the settings page for easy reference.
+-  J & K have reversed for tab switching. J goes left and K goes right.
+-  <c-[> is now equivalent to ESC.
+-  <c-e> & <c-y> are now mapped to scroll down and up respectively.
 
 1.11, 1.12 (01/08/2010)
 
diff --git a/background_page.html b/background_page.html
index 72ee32cb..5d93186a 100644
--- a/background_page.html
+++ b/background_page.html
@@ -229,6 +229,8 @@
   keyToCommandRegistry['l']  = 'scrollRight';
   keyToCommandRegistry['gg'] = 'scrollToTop';
   keyToCommandRegistry['G']  = 'scrollToBottom';
+  keyToCommandRegistry['<c-e>']  = 'scrollDown';
+  keyToCommandRegistry['<c-y>']  = 'scrollUp';
   keyToCommandRegistry['<c-d>'] = "scrollPageDown";
   keyToCommandRegistry['<c-u>'] = "scrollPageUp";
   keyToCommandRegistry['<c-f>'] = "scrollFullPageDown";
diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index 6f417f88..9e9ce41b 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -237,7 +237,7 @@ function getKeyChar(event) {
     return String.fromCharCode(parseInt(unicodeKeyInHex)).toLowerCase();
 }
 
-function isCtrl(event) {
+function isPrimaryModifierKey(event) {
   if (platform == "Mac")
     return event.metaKey;
   else
@@ -245,8 +245,8 @@ function isCtrl(event) {
 }
 
 function isEscape(event) {
-  return event.keyCode == keyCodes.ESC || 
-    (isCtrl(event) && getKeyChar(event) == '[');
+  return event.keyCode == keyCodes.ESC ||
+    (event.ctrlKey && getKeyChar(event) == '['); // c-[ is mapped to ESC in Vim by default.
 }
 
 /**
@@ -267,7 +267,7 @@ function onKeydown(event) {
     keyChar = getKeyChar(event);
 
     // Enter insert mode when the user enables the native find interface.
-    if (keyChar == "f" && !event.shiftKey && isCtrl(event))
+    if (keyChar == "f" && !event.shiftKey && isPrimaryModifierKey(event))
     {
       enterInsertMode();
       return;