From 1ad34dcea418bf062564d349207d3b6cbcb526a3 Mon Sep 17 00:00:00 2001
From: Ilya Sukhar
Date: Tue, 5 Oct 2010 10:52:17 -0700
Subject: Fixed #221. Thanks hbt.

---
 linkHints.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/linkHints.js b/linkHints.js
index 7593a630..16d6fcbf 100644
--- a/linkHints.js
+++ b/linkHints.js
@@ -208,6 +208,7 @@ function updateLinkHints() {
       matchedLink.focus();
       // When focusing a textbox, put the selection caret at the end of the textbox's contents.
       matchedLink.setSelectionRange(matchedLink.value.length, matchedLink.value.length);
+      deactivateLinkHintsMode();
     } else {
       // When we're opening the link in the current tab, don't navigate to the selected link immediately;
       // we want to give the user some feedback depicting which link they've selected by focusing it.
-- 
cgit v1.2.3


From 828721c7913a2f334f6b6bac08de74c980c38ef5 Mon Sep 17 00:00:00 2001
From: Svein-Erik Larsen
Date: Thu, 14 Oct 2010 22:50:27 +0200
Subject: Fixed problems with / being interpreted as ? This also fixed problems
 with Norwegian keyboards. Incidentally, this allows website hotkeys to
 override vimium's hotkeys. I don't know if this is a desired effect, but I
 kind of like it :)

I have _only_ tested the code on Linux.
---
 CREDITS           |  1 +
 vimiumFrontend.js | 98 ++++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 66 insertions(+), 33 deletions(-)

diff --git a/CREDITS b/CREDITS
index 9f814f7a..c1ccd981 100644
--- a/CREDITS
+++ b/CREDITS
@@ -17,5 +17,6 @@ Contributors:
   Tim Morgan <tim@timmorgan.org> (github: seven1m)
   tsigo
   Werner Laurensse (github: ab3)
+  Svein-Erik Larsen <feinom@gmail.com> (github: feinom)
 
 Feel free to add real names in addition to GitHub usernames.
diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index d7c429cb..75225a78 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -141,6 +141,7 @@ function initializePreDomReady() {
  */
 function initializeWhenEnabled() {
   document.addEventListener("keydown", onKeydown, true);
+  document.addEventListener("keypress", onKeypress, true);
   document.addEventListener("focus", onFocusCapturePhase, true);
   document.addEventListener("blur", onBlurCapturePhase, true);
   enterInsertModeIfElementIsFocused();
@@ -308,7 +309,7 @@ function toggleViewSourceCallback(url) {
  *
  * Note that some keys will only register keydown events and not keystroke events, e.g. ESC.
  */
-function onKeydown(event) {
+function onKeypress(event) {
   var keyChar = "";
 
   if (linkHintsModeActivated)
@@ -316,36 +317,74 @@ function onKeydown(event) {
 
   // Ignore modifier keys by themselves.
   if (event.keyCode > 31) {
-    keyChar = getKeyChar(event);
+    keyChar = String.fromCharCode(event.charCode);
 
     // Enter insert mode when the user enables the native find interface.
-    if (keyChar == "f" && !event.shiftKey && isPrimaryModifierKey(event))
+    if (keyChar == "f" && isPrimaryModifierKey(event))
     {
       enterInsertMode();
       return;
     }
+  }
 
-    if (keyChar != "") // Again, ignore just modifiers. Maybe this should replace the keyCode > 31 condition.
+  if (findMode)
+  {
+    if (keyChar)
     {
-      var modifiers = [];
-
-      if (event.shiftKey)
-        keyChar = keyChar.toUpperCase();
-      if (event.metaKey)
-        modifiers.push("m");
-      if (event.ctrlKey)
-        modifiers.push("c");
-      if (event.altKey)
-        modifiers.push("a");
-
-      for (var i in modifiers)
-        keyChar = modifiers[i] + "-" + keyChar;
-
-      if (modifiers.length > 0 || keyChar.length > 1)
-        keyChar = "<" + keyChar + ">";
+      handleKeyCharForFindMode(keyChar);
+
+      // Don't let the space scroll us if we're searching.
+      if (event.keyCode == keyCodes.space)
+        event.preventDefault();
+    }
+  }
+
+  else if (!insertMode && !findMode) {
+    if (keyChar) {
+      if (currentCompletionKeys.indexOf(keyChar) != -1) {
+        event.preventDefault();
+        event.stopPropagation();
+      }
+      keyPort.postMessage({keyChar:keyChar, frameId:frameId});
     }
   }
+}
+
+function onKeydown(event) {
+  var keyChar = "";
 
+  if (linkHintsModeActivated)
+    return;
+  
+  // handle modifiers being pressed.don't handle shiftKey alone (to avoid / being interpreted as ?
+  if (event.metaKey && event.keyCode > 31 || event.ctrlKey && event.keyCode > 31 || event.altKey && event.keyCode > 31)
+  {
+    if (event.keyCode > 31)
+    {
+      keyChar = getKeyChar(event);
+  
+      if (keyChar != "") // Again, ignore just modifiers. Maybe this should replace the keyCode > 31 condition.
+      {
+        var modifiers = [];
+      
+        if (event.shiftKey)
+          keyChar = keyChar.toUpperCase();
+        if (event.metaKey)
+          modifiers.push("m");
+        if (event.ctrlKey)
+          modifiers.push("c");
+        if (event.altKey)
+          modifiers.push("a");
+
+        for (var i in modifiers)
+          keyChar = modifiers[i] + "-" + keyChar;
+
+        if (modifiers.length > 0 || keyChar.length > 1)
+          keyChar = "<" + keyChar + ">";
+      }
+    }
+  }
+        
   if (insertMode && isEscape(event))
   {
     // Note that we can't programmatically blur out of Flash embeds from Javascript.
@@ -359,14 +398,6 @@ function onKeydown(event) {
   {
     if (isEscape(event))
       exitFindMode();
-    else if (keyChar)
-    {
-      handleKeyCharForFindMode(keyChar);
-
-      // Don't let the space scroll us if we're searching.
-      if (event.keyCode == keyCodes.space)
-        event.preventDefault();
-    }
     // Don't let backspace take us back in history.
     else if (event.keyCode == keyCodes.backspace || event.keyCode == keyCodes.deleteKey)
     {
@@ -382,12 +413,13 @@ function onKeydown(event) {
   }
   else if (!insertMode && !findMode) {
     if (keyChar) {
-      if (currentCompletionKeys.indexOf(keyChar) != -1) {
-        event.preventDefault();
-        event.stopPropagation();
-      }
+        if (currentCompletionKeys.indexOf(keyChar) != -1) {
+            event.preventDefault();
+            event.stopPropagation();
+        }
+
+        keyPort.postMessage({keyChar:keyChar, frameId:frameId});
 
-      keyPort.postMessage({keyChar:keyChar, frameId:frameId});
     }
     else if (isEscape(event)) {
       keyPort.postMessage({keyChar:"<ESC>", frameId:frameId});
-- 
cgit v1.2.3


From db0073f1b707aa48557f8d8347af66a48e3293a3 Mon Sep 17 00:00:00 2001
From: Ilya Sukhar
Date: Wed, 20 Oct 2010 22:51:41 -0700
Subject: Refactor onKeypress and onKeydown a bit.

---
 vimiumFrontend.js | 65 +++++++++++++++++++++++--------------------------------
 1 file changed, 27 insertions(+), 38 deletions(-)

diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index 75225a78..19e2e0a2 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -320,32 +320,26 @@ function onKeypress(event) {
     keyChar = String.fromCharCode(event.charCode);
 
     // Enter insert mode when the user enables the native find interface.
-    if (keyChar == "f" && isPrimaryModifierKey(event))
-    {
+    if (keyChar == "f" && isPrimaryModifierKey(event)) {
       enterInsertMode();
       return;
     }
-  }
 
-  if (findMode)
-  {
-    if (keyChar)
-    {
-      handleKeyCharForFindMode(keyChar);
+    if (keyChar) {
+      if (findMode) {
+        handleKeyCharForFindMode(keyChar);
 
-      // Don't let the space scroll us if we're searching.
-      if (event.keyCode == keyCodes.space)
-        event.preventDefault();
-    }
-  }
+        // Don't let the space scroll us if we're searching.
+        if (event.keyCode == keyCodes.space)
+          event.preventDefault();
+      } else if (!insertMode && !findMode) {
+        if (currentCompletionKeys.indexOf(keyChar) != -1) {
+          event.preventDefault();
+          event.stopPropagation();
+        }
 
-  else if (!insertMode && !findMode) {
-    if (keyChar) {
-      if (currentCompletionKeys.indexOf(keyChar) != -1) {
-        event.preventDefault();
-        event.stopPropagation();
+        keyPort.postMessage({keyChar:keyChar, frameId:frameId});
       }
-      keyPort.postMessage({keyChar:keyChar, frameId:frameId});
     }
   }
 }
@@ -355,36 +349,32 @@ function onKeydown(event) {
 
   if (linkHintsModeActivated)
     return;
-  
+
   // handle modifiers being pressed.don't handle shiftKey alone (to avoid / being interpreted as ?
-  if (event.metaKey && event.keyCode > 31 || event.ctrlKey && event.keyCode > 31 || event.altKey && event.keyCode > 31)
-  {
-    if (event.keyCode > 31)
+  if (event.metaKey && event.keyCode > 31 || event.ctrlKey && event.keyCode > 31 || event.altKey && event.keyCode > 31) {
+    keyChar = getKeyChar(event);
+
+    if (keyChar != "") // Again, ignore just modifiers. Maybe this should replace the keyCode > 31 condition.
     {
-      keyChar = getKeyChar(event);
-  
-      if (keyChar != "") // Again, ignore just modifiers. Maybe this should replace the keyCode > 31 condition.
-      {
-        var modifiers = [];
-      
-        if (event.shiftKey)
+      var modifiers = [];
+
+      if (event.shiftKey)
           keyChar = keyChar.toUpperCase();
-        if (event.metaKey)
+      if (event.metaKey)
           modifiers.push("m");
-        if (event.ctrlKey)
+      if (event.ctrlKey)
           modifiers.push("c");
-        if (event.altKey)
+      if (event.altKey)
           modifiers.push("a");
 
-        for (var i in modifiers)
+      for (var i in modifiers)
           keyChar = modifiers[i] + "-" + keyChar;
 
-        if (modifiers.length > 0 || keyChar.length > 1)
+      if (modifiers.length > 0 || keyChar.length > 1)
           keyChar = "<" + keyChar + ">";
-      }
     }
   }
-        
+
   if (insertMode && isEscape(event))
   {
     // Note that we can't programmatically blur out of Flash embeds from Javascript.
@@ -419,7 +409,6 @@ function onKeydown(event) {
         }
 
         keyPort.postMessage({keyChar:keyChar, frameId:frameId});
-
     }
     else if (isEscape(event)) {
       keyPort.postMessage({keyChar:"<ESC>", frameId:frameId});
-- 
cgit v1.2.3


From ac4858bfe66563d5295d87c89322e5f138f1d191 Mon Sep 17 00:00:00 2001
From: Ilya Sukhar
Date: Wed, 20 Oct 2010 22:53:16 -0700
Subject: Added keyboard layout improvements to the README.

---
 README.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.markdown b/README.markdown
index 36e267bf..76805516 100644
--- a/README.markdown
+++ b/README.markdown
@@ -88,6 +88,7 @@ Release Notes
 -  A new command (`gi`) to focus the first (or n-th) text input box on the page.
 -  A new command (`<a-f>`) to open up multiple links at a time in new tabs.
 -  Frame support.
+-  More robust support for non-US keyboard layouts.
 -  Bug fixes.
 
 1.19 (06/29/2010)
-- 
cgit v1.2.3


From f7a534efe5d4c77c462955674dd4678bc10f2012 Mon Sep 17 00:00:00 2001
From: Ilya Sukhar
Date: Wed, 20 Oct 2010 23:42:44 -0700
Subject: Implemented a workaround for the Chrome bug that broke the 'yy'
 command. Closes 206. Relevant chrome bug:
 http://code.google.com/p/chromium/issues/detail?id=55188

---
 background_page.html | 11 ++++++++++-
 vimiumFrontend.js    |  6 +++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/background_page.html b/background_page.html
index 48084f77..4d03c99b 100644
--- a/background_page.html
+++ b/background_page.html
@@ -1,6 +1,7 @@
 <html>
 <head>
 <script type="text/javascript" src="commands.js"></script>
+<script type="text/javascript" src="lib/clipboard.js"></script>
 <script type="text/javascript" charset="utf-8">
   // Chromium #15242 will make this XHR request to access the manifest unnecessary.
   var manifestRequest = new XMLHttpRequest();
@@ -73,7 +74,8 @@
     registerFrame: registerFrame,
     frameFocused: handleFrameFocused,
     upgradeNotificationClosed: upgradeNotificationClosed,
-    updateScrollPosition: handleUpdateScrollPosition
+    updateScrollPosition: handleUpdateScrollPosition,
+    copyToClipboard: copyToClipboard
   };
 
   // Event handlers
@@ -250,6 +252,13 @@
     sendRequestToAllTabs({ name: "hideUpgradeNotification" });
   }
 
+  /*
+   * Copies some data (request.data) to the clipboard.
+   */
+  function copyToClipboard(request) {
+    Clipboard.copy(request.data);
+  }
+
   /*
    * Used by the content scripts to get settings from the local storage.
    */
diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index 19e2e0a2..8e5b8246 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -286,7 +286,11 @@ function toggleViewSource() {
 }
 
 function copyCurrentUrl() {
-  getCurrentUrlHandlers.push(function (url) { Clipboard.copy(url); });
+  // 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
+  //getCurrentUrlHandlers.push(function (url) { Clipboard.copy(url); });
+  getCurrentUrlHandlers.push(function (url) { chrome.extension.sendRequest({ handler: "copyToClipboard", data: url }); });
 
   // TODO(ilya): Convert to sendRequest.
   var getCurrentUrlPort = chrome.extension.connect({ name: "getCurrentTabUrl" });
-- 
cgit v1.2.3


From 9232479ac78f295413802b1cc74f6b6056e0a814 Mon Sep 17 00:00:00 2001
From: Ilya Sukhar
Date: Thu, 21 Oct 2010 00:14:51 -0700
Subject: Fix for file:// support regression after Chrome API changed.

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index d49adfa2..d43f0855 100644
--- a/manifest.json
+++ b/manifest.json
@@ -14,7 +14,7 @@
   ],
   "content_scripts": [
     {
-      "matches": ["http://*/*", "https://*/*", "file://*/*", "ftp://*/*" ],
+      "matches": ["<all_urls>"],
       "js": ["lib/keyboardUtils.js",
              "lib/clipboard.js",
              "linkHints.js",
-- 
cgit v1.2.3


From 780e1bf58ef09b5b4a7c9a0c3ad0c72a2265b39e Mon Sep 17 00:00:00 2001
From: Christof Musik
Date: Sun, 24 Oct 2010 01:06:49 +0200
Subject: fixed bug which showed help page on searching with /

---
 lib/keyboardUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/keyboardUtils.js b/lib/keyboardUtils.js
index 98725d95..fe3dcd59 100644
--- a/lib/keyboardUtils.js
+++ b/lib/keyboardUtils.js
@@ -44,7 +44,7 @@ function getKeyChar(event) {
     // https://bugs.webkit.org/show_bug.cgi?id=19906 for more details.
     if ((platform == "Windows" || platform == "Linux") && keyIdentifierCorrectionMap[keyIdentifier]) {
       correctedIdentifiers = keyIdentifierCorrectionMap[keyIdentifier];
-      keyIdentifier = event.shiftKey ? correctedIdentifiers[1] : correctedIdentifiers[0];
+      keyIdentifier = event.shiftKey ? correctedIdentifiers[0] : correctedIdentifiers[1];
     }
     var unicodeKeyInHex = "0x" + keyIdentifier.substring(2);
     return String.fromCharCode(parseInt(unicodeKeyInHex)).toLowerCase();
-- 
cgit v1.2.3


From 080bffabcf0eb3be789db257c1417ffbfd17277d Mon Sep 17 00:00:00 2001
From: Ilya Sukhar
Date: Sun, 24 Oct 2010 15:47:56 -0700
Subject: Fixed Vimium getting overridden by Google Instant Search.

May be subject to internationalization issues still but it's much better than before.---
 vimiumFrontend.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index 8e5b8246..77580a29 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -386,6 +386,10 @@ function onKeydown(event) {
       // Remove focus so the user can't just get himself back into insert mode by typing in the same input box.
       if (isEditable(event.srcElement)) { event.srcElement.blur(); }
       exitInsertMode();
+
+      // Added to prevent Google Instant from reclaiming the keystroke and putting us back into the search box.
+      // TOOD(ilya): Revisit this. Not sure it's the absolute best approach.
+      event.stopPropagation();
     }
   }
   else if (findMode)
@@ -418,6 +422,16 @@ function onKeydown(event) {
       keyPort.postMessage({keyChar:"<ESC>", frameId:frameId});
     }
   }
+
+  // Added to prevent propagating this event to other listeners if it's one that'll trigger a Vimium command.
+  // The goal is to avoid the scenario where Google Instant Search uses every keydown event to dump us
+  // back into the search box. As a side effect, this should also prevent overriding by other sites.
+  //
+  // Subject to internationalization issues since we're using keyIdentifier instead of charCode (in keypress).
+  //
+  // TOOD(ilya): Revisit this. Not sure it's the absolute best approach.
+  if (keyChar == "" && !insertMode && currentCompletionKeys.indexOf(getKeyChar(event)) != -1)
+    event.stopPropagation();
 }
 
 function refreshCompletionKeys(completionKeys) {
-- 
cgit v1.2.3


From 8e40282eea37c59e54566f37d0d34f89d4c7dabe Mon Sep 17 00:00:00 2001
From: Ilya Sukhar
Date: Sun, 24 Oct 2010 15:52:13 -0700
Subject: Cutting 1.20 release

---
 README.markdown | 4 ++--
 manifest.json   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.markdown b/README.markdown
index 76805516..4e4e7faa 100644
--- a/README.markdown
+++ b/README.markdown
@@ -81,7 +81,7 @@ When you're done, send us a pull request on Github. Feel free to include a chang
 Release Notes
 -------------
 
-1.20 (Unreleased)
+1.20 (10/24/2010)
 
 -  In link hints mode, holding down the shift key will now toggle between opening in the current tab and opening in a new tab.
 -  Two new commands (`zH` and `zL`) to scroll to the left and right edges of the page.
@@ -89,7 +89,7 @@ Release Notes
 -  A new command (`<a-f>`) to open up multiple links at a time in new tabs.
 -  Frame support.
 -  More robust support for non-US keyboard layouts.
--  Bug fixes.
+-  Numerous bug fixes.
 
 1.19 (06/29/2010)
 
diff --git a/manifest.json b/manifest.json
index d43f0855..7eb74fdb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Vimium",
-  "version": "1.19",
+  "version": "1.20",
   "description": "The Hacker's Browser. Vimium provides keyboard shortcuts for navigation and control in the spirit of Vim.",
   "icons": {  "16": "icons/icon16.png",
               "48": "icons/icon48.png",
-- 
cgit v1.2.3


From c00dae33b8734d151437cdf4681423a01f89d674 Mon Sep 17 00:00:00 2001
From: Ilya Sukhar
Date: Sun, 24 Oct 2010 16:10:08 -0700
Subject: Updating the README with all the latest commands.

---
 README.markdown | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.markdown b/README.markdown
index 4e4e7faa..38c20729 100644
--- a/README.markdown
+++ b/README.markdown
@@ -34,6 +34,8 @@ Navigating the current page:
     <c-u>, <c-y>   scroll up a page
     <c-f>   scroll down a full page
     <c-b>   scroll up a full page
+    zH      scroll all the way left
+    zL      scroll all the way right
     f       activate link hints mode to open in current tab
     F       activate link hints mode to open in new tab
     <a-f>   activate link hints mode to open multiple links in a new tab
@@ -48,6 +50,7 @@ Navigating the current page:
     yy      copy the current url to the clipboard
     gu      go up one level in the URL hierarchy
     gf      cycle forward to the next frame
+    gi      focus the first (or n-th) text input box on the page
 
 Navigating your history:
     H       go back in history
-- 
cgit v1.2.3


From 658981295b5c90b821b5eae1b3e2b6783db5e46d Mon Sep 17 00:00:00 2001
From: Ilya Sukhar
Date: Sun, 24 Oct 2010 19:43:57 -0700
Subject: Fix an excluded URLs regression due to frame support.

---
 background_page.html | 11 +++++------
 vimiumFrontend.js    | 25 ++++++++++++++-----------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/background_page.html b/background_page.html
index 4d03c99b..f4a40ffa 100644
--- a/background_page.html
+++ b/background_page.html
@@ -59,7 +59,6 @@
   var portHandlers = {
     keyDown:              handleKeyDown,
     returnScrollPosition: handleReturnScrollPosition,
-    isEnabledForUrl:      isEnabledForUrl,
     getCurrentTabUrl:     getCurrentTabUrl,
     getZoomLevel:         getZoomLevel,
     saveZoomLevel:        saveZoomLevel,
@@ -75,7 +74,8 @@
     frameFocused: handleFrameFocused,
     upgradeNotificationClosed: upgradeNotificationClosed,
     updateScrollPosition: handleUpdateScrollPosition,
-    copyToClipboard: copyToClipboard
+    copyToClipboard: copyToClipboard,
+    isEnabledForUrl: isEnabledForUrl
   };
 
   // Event handlers
@@ -134,18 +134,17 @@
   /*
    * Checks the user's preferences in local storage to determine if Vimium is enabled for the given URL.
    */
-  function isEnabledForUrl(args, port) {
-    var returnPort = chrome.tabs.connect(port.tab.id, { name: "returnIsEnabledForUrl" });
+  function isEnabledForUrl(request) {
     // excludedUrls are stored as a series of URL expressions separated by newlines.
     var excludedUrls = (localStorage["excludedUrls"] || "").split("\n");
     var isEnabled = true;
     for (var i = 0; i < excludedUrls.length; i++) {
       // The user can add "*" to the URL which means ".*"
       var regexp = new RegExp("^" + excludedUrls[i].replace(/\*/g, ".*") + "$");
-      if (args.url.match(regexp))
+      if (request.url.match(regexp))
         isEnabled = false;
     }
-    returnPort.postMessage({ isEnabledForUrl: isEnabled });
+    return { isEnabledForUrl: isEnabled };
   }
 
   /*
diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index 77580a29..b108d141 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -47,8 +47,7 @@ function setSetting(args) { settings[args.key] = args.value; }
 function initializePreDomReady() {
   for (var i in settingsToLoad) { getSetting(settingsToLoad[i]); }
 
-  var isEnabledForUrlPort = chrome.extension.connect({ name: "isEnabledForUrl" });
-  isEnabledForUrlPort.postMessage({ url: window.location.toString() });
+  checkIfEnabledForUrl();
 
   var getZoomLevelPort = chrome.extension.connect({ name: "getZoomLevel" });
   getZoomLevelPort.postMessage({ domain: window.location.host });
@@ -117,15 +116,6 @@ function initializePreDomReady() {
         if (isEnabledForUrl)
           setPageZoomLevel(currentZoomLevel);
       });
-    } else if (port.name == "returnIsEnabledForUrl") {
-      port.onMessage.addListener(function(args) {
-        isEnabledForUrl = args.isEnabledForUrl;
-        if (isEnabledForUrl)
-          initializeWhenEnabled();
-        else if (HUD.isReady())
-          // Quickly hide any HUD we might already be showing, e.g. if we entered insertMode on page load.
-          HUD.hide();
-      });
     } else if (port.name == "returnSetting") {
       port.onMessage.addListener(setSetting);
     } else if (port.name == "refreshCompletionKeys") {
@@ -434,6 +424,19 @@ function onKeydown(event) {
     event.stopPropagation();
 }
 
+function checkIfEnabledForUrl() {
+    var url = window.location.toString();
+
+    chrome.extension.sendRequest({ handler: "isEnabledForUrl", url: url }, function (response) {
+      isEnabledForUrl = response.isEnabledForUrl;
+      if (isEnabledForUrl)
+        initializeWhenEnabled();
+      else if (HUD.isReady())
+        // Quickly hide any HUD we might already be showing, e.g. if we entered insertMode on page load.
+        HUD.hide();
+    });
+}
+
 function refreshCompletionKeys(completionKeys) {
   if (completionKeys)
     currentCompletionKeys = completionKeys;
-- 
cgit v1.2.3


From 7df813ef221be04e4d4a459ecc941dcbddfb6056 Mon Sep 17 00:00:00 2001
From: Ilya Sukhar
Date: Sun, 24 Oct 2010 19:51:02 -0700
Subject: Release 1.21

---
 README.markdown | 4 ++++
 manifest.json   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 38c20729..ba16e643 100644
--- a/README.markdown
+++ b/README.markdown
@@ -84,6 +84,10 @@ When you're done, send us a pull request on Github. Feel free to include a chang
 Release Notes
 -------------
 
+1.21 (10/24/2010)
+
+-  Critical bugfix for an excluded URLs regression due to frame support.
+
 1.20 (10/24/2010)
 
 -  In link hints mode, holding down the shift key will now toggle between opening in the current tab and opening in a new tab.
diff --git a/manifest.json b/manifest.json
index 7eb74fdb..0459a80b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Vimium",
-  "version": "1.20",
+  "version": "1.21",
   "description": "The Hacker's Browser. Vimium provides keyboard shortcuts for navigation and control in the spirit of Vim.",
   "icons": {  "16": "icons/icon16.png",
               "48": "icons/icon48.png",
-- 
cgit v1.2.3