From 560f84a4bc65b7abd003951f191514761ba35e90 Mon Sep 17 00:00:00 2001
From: hogelog
Date: Tue, 11 Jan 2011 10:00:19 +0900
Subject: disable zoom in/out when load iframe.

https://github.com/philc/vimium/issuesearch?state=open&q=zoom#issue/271
---
 vimiumFrontend.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index eb3de996..680578c9 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -61,7 +61,8 @@ function initializePreDomReady() {
   checkIfEnabledForUrl();
 
   var getZoomLevelPort = chrome.extension.connect({ name: "getZoomLevel" });
-  getZoomLevelPort.postMessage({ domain: window.location.host });
+  if (window.self == window.parent)
+    getZoomLevelPort.postMessage({ domain: window.location.host });
 
   chrome.extension.sendRequest({handler: "getLinkHintCss"}, function (response) {
     linkHintCss = response.linkHintCss;
-- 
cgit v1.2.3


From 5f7c1506b774bfc7288bf66103e9f1eddd57115e Mon Sep 17 00:00:00 2001
From: Phil Crosby
Date: Thu, 3 Feb 2011 16:20:14 -0800
Subject: Update the readme to reflect the new bindings for scrolling up/down a
 half page

---
 README.markdown | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.markdown b/README.markdown
index 9b122f56..512fed22 100644
--- a/README.markdown
+++ b/README.markdown
@@ -30,10 +30,8 @@ Navigating the current page:
     l       scroll right
     gg      scroll to top of the page
     G       scroll to bottom of the 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
+    d, <c-d>, <c-e>   scroll down half a page
+    u, <c-u>, <c-y>   scroll up half a page
     f       open a link in the current tab
     F       open a link in a new tab
     r       reload
@@ -69,6 +67,8 @@ Additional advanced browsing commands:
     zH      scroll all the way left
     zL      scroll all the way right
     z0      reset zoom to default value
+    <c-f>   scroll down a full page
+    <c-b>   scroll up a full page
 
 
 Vimium supports command repetition so, for example, hitting '5t' will open 5 tabs in rapid succession. ESC (or
-- 
cgit v1.2.3


From cbb0e6b78c5e8c59e5f027151ed16a20dedaffea Mon Sep 17 00:00:00 2001
From: ilya
Date: Wed, 9 Feb 2011 00:31:46 -0800
Subject: added hogelog to credits

---
 CREDITS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CREDITS b/CREDITS
index 3a01884a..fb4be384 100644
--- a/CREDITS
+++ b/CREDITS
@@ -10,6 +10,7 @@ Contributors:
   Christian Stefanescu (github: stchris)
   ConradIrwin
   drizzd
+  hogelog
   int3
   Johannes Emerich (github: knuton)
   Julian Naydichev <rublind@gmail.com> (github: naydichev)
-- 
cgit v1.2.3


From 7d5f9b138f77db9a62f2d2847fd182372afdd9b3 Mon Sep 17 00:00:00 2001
From: ilya
Date: Wed, 9 Feb 2011 01:23:52 -0800
Subject: fix a bug with zoomReset

---
 vimiumFrontend.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index a5356f3f..6ddc15c3 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -221,18 +221,23 @@ function setPageZoomLevel(zoomLevel, showUINotification) {
 }
 
 function zoomIn() {
-  setPageZoomLevel(currentZoomLevel += 20, true);
-  saveZoomLevel(window.location.host, currentZoomLevel);
+  currentZoomLevel += 20;
+  setAndSaveZoom();
 }
 
 function zoomOut() {
-  setPageZoomLevel(currentZoomLevel -= 20, true);
-  saveZoomLevel(window.location.host, currentZoomLevel);
+  currentZoomLevel -= 20;
+  setAndSaveZoom();
 }
 
 function zoomReset() {
-  setPageZoomLevel(100, true);
-  saveZoomLevel(window.location.host, 100);
+  currentZoomLevel = 100;
+  setAndSaveZoom();
+}
+
+function setAndSaveZoom() {
+  setPageZoomLevel(currentZoomLevel, true);
+  saveZoomLevel(window.location.host, currentZoomLevel);
 }
 
 function scrollToBottom() { window.scrollTo(window.pageXOffset, document.body.scrollHeight); }
-- 
cgit v1.2.3


From 1edb16a47eb8a35fc3ea7991bfdfc8434d1d3bff Mon Sep 17 00:00:00 2001
From: Phil Crosby
Date: Wed, 9 Feb 2011 23:05:40 -0800
Subject: Style

---
 background_page.html | 8 +++++---
 vimiumFrontend.js    | 7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/background_page.html b/background_page.html
index d98967b4..77150244 100644
--- a/background_page.html
+++ b/background_page.html
@@ -18,8 +18,9 @@
   var focusedFrame = null;
   var framesForTab = {};
 
-  // Keys are either literal characters, or "named" - for example <a-b> (alt+b), <left> (the left arrow) or <f12>
-  // This regular expression captures two groups, the first is a named key, the second is the remainder of the string.
+  // Keys are either literal characters, or "named" - for example <a-b> (alt+b), <left> (left arrow) or <f12>
+  // This regular expression captures two groups: the first is a named key, the second is the remainder of
+  // the string.
   var namedKeyRegex = /^(<(?:[amc]-.|(?:[amc]-)?[a-z0-9]{2,5})>)(.*)$/;
 
   var defaultSettings = {
@@ -164,7 +165,8 @@
 
   function showHelp(callback, frameId) {
     chrome.tabs.getSelected(null, function(tab) {
-      chrome.tabs.sendRequest(tab.id, { name: "showHelpDialog", dialogHtml: helpDialogHtml(), frameId:frameId });
+      chrome.tabs.sendRequest(tab.id,
+        { name: "showHelpDialog", dialogHtml: helpDialogHtml(), frameId:frameId });
     });
   }
 
diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index 6ddc15c3..b7f9308f 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -153,8 +153,8 @@ function initializeWhenEnabled() {
 /*
  * The backend needs to know which frame has focus.
  */
-window.addEventListener("focus", function(e){
-  chrome.extension.sendRequest({handler: "frameFocused", frameId: frameId});
+window.addEventListener("focus", function(e) {
+  chrome.extension.sendRequest({ handler: "frameFocused", frameId: frameId });
 });
 
 /*
@@ -185,7 +185,8 @@ function initializeOnDomReady() {
 // This is a little hacky but sometimes the size wasn't available on domReady?
 function registerFrameIfSizeAvailable (top) {
   if (innerWidth != undefined && innerWidth != 0 && innerHeight != undefined && innerHeight != 0)
-    chrome.extension.sendRequest({ handler: "registerFrame", frameId: frameId, area: innerWidth * innerHeight, top: top, total: frames.length + 1 });
+    chrome.extension.sendRequest({ handler: "registerFrame", frameId: frameId,
+        area: innerWidth * innerHeight, top: top, total: frames.length + 1 });
   else
     setTimeout(function () { registerFrameIfSizeAvailable(top); }, 100);
 }
-- 
cgit v1.2.3


From a036d2dac281b2528c2087b08839e118e3f449ae Mon Sep 17 00:00:00 2001
From: Phil Crosby
Date: Wed, 9 Feb 2011 23:06:41 -0800
Subject: Preserve the "show advanced commands" setting after you close the
 vimium help dialog.

---
 background_page.html |  9 ++++++++-
 helpDialog.html      | 21 ++++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/background_page.html b/background_page.html
index 77150244..ee12a77d 100644
--- a/background_page.html
+++ b/background_page.html
@@ -79,7 +79,8 @@
     upgradeNotificationClosed: upgradeNotificationClosed,
     updateScrollPosition: handleUpdateScrollPosition,
     copyToClipboard: copyToClipboard,
-    isEnabledForUrl: isEnabledForUrl
+    isEnabledForUrl: isEnabledForUrl,
+    saveHelpDialogSettings: saveHelpDialogSettings
   };
 
   // Event handlers
@@ -151,6 +152,10 @@
     return { isEnabledForUrl: isEnabled };
   }
 
+  function saveHelpDialogSettings(request) {
+    localStorage["helpDialog_showAdvancedCommands"] = request.showAdvancedCommands;
+  }
+
   /*
    * Returns the previously saved zoom level for the current tab, or the default zoom level
    */
@@ -186,6 +191,8 @@
                                         showUnboundCommands, showCommandNames));
     dialogHtml = dialogHtml.replace("{{version}}", currentVersion);
     dialogHtml = dialogHtml.replace("{{title}}", customTitle || "Help");
+    dialogHtml = dialogHtml.replace("{{showAdvancedCommands}}",
+        localStorage["helpDialog_showAdvancedCommands"] == "true");
     return dialogHtml;
   }
 
diff --git a/helpDialog.html b/helpDialog.html
index c21c8b7b..ae78d149 100644
--- a/helpDialog.html
+++ b/helpDialog.html
@@ -132,10 +132,14 @@
 
   <script>
     VimiumHelpDialog = {
+      // This setting is pulled out of local storage. It's false by default.
+      advancedCommandsVisible: {{showAdvancedCommands}},
+
       init: function() {
         this.dialogElement = document.getElementById("vimiumHelpDialog");
         this.dialogElement.getElementsByClassName("toggleAdvancedCommands")[0].addEventListener("click", 
           VimiumHelpDialog.toggleAdvancedCommands, false);
+        this.showAdvancedCommands(this.advancedCommandsVisible);
       },
 
       /*
@@ -143,13 +147,20 @@
        */
       toggleAdvancedCommands: function(event) {
         event.preventDefault();
-        var advanced = VimiumHelpDialog.dialogElement.getElementsByClassName("advanced");
-        var shouldShow = (advanced[0].style.display == "" || advanced[0].style.display == "none");
+        VimiumHelpDialog.advancedCommandsVisible = !VimiumHelpDialog.advancedCommandsVisible;
+        chrome.extension.sendRequest({ handler: "saveHelpDialogSettings",
+            showAdvancedCommands: VimiumHelpDialog.advancedCommandsVisible });
+        VimiumHelpDialog.showAdvancedCommands(VimiumHelpDialog.advancedCommandsVisible);
+      },
+
+      showAdvancedCommands: function(visible) {
         VimiumHelpDialog.dialogElement.getElementsByClassName("toggleAdvancedCommands")[0].innerHTML =
-            shouldShow ? "Hide advanced commands" : "Show advanced commands";
+            visible ? "Hide advanced commands" : "Show advanced commands";
+        var advanced = VimiumHelpDialog.dialogElement.getElementsByClassName("advanced");
         for (var i = 0; i < advanced.length; i++)
-          advanced[i].style.display = (shouldShow ? "table-row" : "none");
-      }
+          advanced[i].style.display = (visible ? "table-row" : "none");
+      },
+
     };
 
     VimiumHelpDialog.init();
-- 
cgit v1.2.3


From e6424ce09d27f74608caf69472630537260692ed Mon Sep 17 00:00:00 2001
From: Phil Crosby
Date: Wed, 9 Feb 2011 23:11:18 -0800
Subject: Re-center the help dialog when it gets taller after clicking "show
 advanced commands"

---
 helpDialog.html   | 9 +++++++++
 vimiumFrontend.js | 6 ------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/helpDialog.html b/helpDialog.html
index ae78d149..0f1cd6e9 100644
--- a/helpDialog.html
+++ b/helpDialog.html
@@ -27,6 +27,7 @@
       margin-left:-320px;
       top:50px;
       -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0px 0px 6px;
+      z-index:99999998;
     }
     #vimiumHelpDialog a { color:blue; }
     #vimiumTitle, #vimiumTitle * { font-size:20px; }
@@ -140,6 +141,7 @@
         this.dialogElement.getElementsByClassName("toggleAdvancedCommands")[0].addEventListener("click", 
           VimiumHelpDialog.toggleAdvancedCommands, false);
         this.showAdvancedCommands(this.advancedCommandsVisible);
+        this.centerDialog();
       },
 
       /*
@@ -151,6 +153,7 @@
         chrome.extension.sendRequest({ handler: "saveHelpDialogSettings",
             showAdvancedCommands: VimiumHelpDialog.advancedCommandsVisible });
         VimiumHelpDialog.showAdvancedCommands(VimiumHelpDialog.advancedCommandsVisible);
+        VimiumHelpDialog.centerDialog();
       },
 
       showAdvancedCommands: function(visible) {
@@ -161,6 +164,12 @@
           advanced[i].style.display = (visible ? "table-row" : "none");
       },
 
+      centerDialog: function() {
+        var zoomFactor = currentZoomLevel / 100.0;
+        this.dialogElement.style.top = Math.max(
+            (window.innerHeight - this.dialogElement.clientHeight * zoomFactor) / 2.0,
+            20) / zoomFactor + "px";
+        }
     };
 
     VimiumHelpDialog.init();
diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index b7f9308f..b14e02cc 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -653,12 +653,6 @@ function showHelpDialog(html, fid) {
   container.getElementsByClassName("closeButton")[0].addEventListener("click", hideHelpDialog, false);
   container.getElementsByClassName("optionsPage")[0].addEventListener("click",
       function() { chrome.extension.sendRequest({ handler: "openOptionsPageInNewTab" }); }, false);
-
-  var dialog = document.getElementById("vimiumHelpDialog");
-  dialog.style.zIndex = "99999998";
-  var zoomFactor = currentZoomLevel / 100.0;
-  dialog.style.top =
-      Math.max((window.innerHeight - dialog.clientHeight * zoomFactor) / 2.0, 20) / zoomFactor + "px";
 }
 
 function hideHelpDialog(clickEvent) {
-- 
cgit v1.2.3


From e354fe9b12ce5251812f1129fb5a51ef08151bc9 Mon Sep 17 00:00:00 2001
From: ilya
Date: Thu, 10 Feb 2011 21:48:02 -0800
Subject: readme updates for 1.22 release

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

diff --git a/README.markdown b/README.markdown
index 512fed22..dc6de9bd 100644
--- a/README.markdown
+++ b/README.markdown
@@ -94,13 +94,14 @@ don't exceed 110 characters.
 Release Notes
 -------------
 
-1.22
+1.22 (02/10/2011)
 
 -  Some sites are now excluded by default.
 -  View source (`gs`) now opens in a new tab.
 -  Support for browsing paginated sites using `]]` and `[[` to go forward and backward respectively.
 -  `z0` will reset the zoom level for the current page.
 -  Many of the less-used commands are now marked as "advanced" and hidden in the help dialog by default, so that the core command set is more focused and approachable.
+-  Improvements to link hinting.
 -  Bugfixes.
 
 1.21 (10/24/2010)
-- 
cgit v1.2.3


From 189337855df4b4e53dc87073fb71b8a4c08ec7e3 Mon Sep 17 00:00:00 2001
From: ilya
Date: Thu, 10 Feb 2011 22:13:15 -0800
Subject: fix a readme mistake with the open/close tab

---
 README.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.markdown b/README.markdown
index dc6de9bd..366d553a 100644
--- a/README.markdown
+++ b/README.markdown
@@ -55,8 +55,8 @@ Manipulating tabs:
     J, gT      go one tab left
     K, gt      go one tab right
     t          create tab
-    d          close current tab
-    u          restore closed tab (i.e. unwind the 'd' command)
+    x          close current tab
+    X          restore closed tab (i.e. unwind the 'd' command)
 
 Additional advanced browsing commands:
     ]]      Follow the link labeled 'next' or '>'. Helpful for browsing paginated sites.
-- 
cgit v1.2.3


From 6dd82bddcb08b09aefdccafb16b9f55f41624342 Mon Sep 17 00:00:00 2001
From: ilya
Date: Thu, 10 Feb 2011 22:16:09 -0800
Subject: another readme update

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

diff --git a/README.markdown b/README.markdown
index 366d553a..eb155f99 100644
--- a/README.markdown
+++ b/README.markdown
@@ -56,7 +56,7 @@ Manipulating tabs:
     K, gt      go one tab right
     t          create tab
     x          close current tab
-    X          restore closed tab (i.e. unwind the 'd' command)
+    X          restore closed tab (i.e. unwind the 'x' command)
 
 Additional advanced browsing commands:
     ]]      Follow the link labeled 'next' or '>'. Helpful for browsing paginated sites.
-- 
cgit v1.2.3


From 7820ae2cd614015a1d57aeba90d8f24b2f9c7db2 Mon Sep 17 00:00:00 2001
From: ilya
Date: Thu, 10 Feb 2011 22:31:18 -0800
Subject: fix some incorrect bindings in the readme

---
 README.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.markdown b/README.markdown
index eb155f99..4d5cfcce 100644
--- a/README.markdown
+++ b/README.markdown
@@ -30,8 +30,8 @@ Navigating the current page:
     l       scroll right
     gg      scroll to top of the page
     G       scroll to bottom of the page
-    d, <c-d>, <c-e>   scroll down half a page
-    u, <c-u>, <c-y>   scroll up half a page
+    d, <c-d>  scroll down half a page
+    u, <c-u>  scroll up half a page
     f       open a link in the current tab
     F       open a link in a new tab
     r       reload
-- 
cgit v1.2.3


From 546638dd268c4c4338079cb87f0183bd706fea05 Mon Sep 17 00:00:00 2001
From: ilya
Date: Fri, 11 Feb 2011 12:16:07 -0800
Subject: Fix a bug where you can't save empty fields if there's a non-empty
 default. Also made the option saving code more robust to similar scenarios

---
 options.html | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/options.html b/options.html
index bfa01450..f52cb6ec 100644
--- a/options.html
+++ b/options.html
@@ -80,7 +80,9 @@
   var defaultSettings = chrome.extension.getBackgroundPage().defaultSettings;
 
   var editableFields = ["scrollStepSize", "defaultZoomLevel", "excludedUrls", "linkHintCharacters",
-    "userDefinedLinkHintCss", "keyMappings"];
+                        "userDefinedLinkHintCss", "keyMappings"];
+
+  var canBeEmptyFields = ["excludedUrls", "keyMappings", "userDefinedLinkHintCss"];
 
   var postSaveHooks = {
     keyMappings: function (value) {
@@ -118,10 +120,17 @@
       var fieldValue = $(fieldName).value.trim();
       var defaultFieldValue = (defaultSettings[fieldName] != null) ?
         defaultSettings[fieldName].toString() : "";
+
+      // Don't save to storage if it's equal to the default
       if (fieldValue == defaultFieldValue)
         delete localStorage[fieldName];
-      else
+      // ..or if it's empty and not a field that we allow to be empty.
+      else if (!fieldValue && canBeEmptyFields.indexOf(fieldName) == -1) {
+        delete localStorage[fieldName];
+        fieldValue = defaultFieldValue;
+      } else
         localStorage[fieldName] = fieldValue;
+
       $(fieldName).value = fieldValue;
       $(fieldName).setAttribute("savedValue", fieldValue);
 
@@ -133,7 +142,12 @@
   // Restores select box state to saved value from localStorage.
   function populateOptions() {
     for (var i = 0; i < editableFields.length; i++) {
-      $(editableFields[i]).value = localStorage[editableFields[i]] || defaultSettings[editableFields[i]] || "";
+      // If it's null or undefined, let's go to the default. We want to allow empty strings in certain cases.
+      if (localStorage[editableFields[i]] != "" && !localStorage[editableFields[i]]) {
+        $(editableFields[i]).value = defaultSettings[editableFields[i]] || "";
+      } else {
+        $(editableFields[i]).value = localStorage[editableFields[i]];
+      }
       $(editableFields[i]).setAttribute("savedValue", $(editableFields[i]).value);
     }
   }
-- 
cgit v1.2.3


From f047c493ecc1e31b789ba6f718264db780d456d4 Mon Sep 17 00:00:00 2001
From: ilya
Date: Fri, 11 Feb 2011 12:28:29 -0800
Subject: cut 1.23 release for bugfix

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

diff --git a/README.markdown b/README.markdown
index 4d5cfcce..420a607a 100644
--- a/README.markdown
+++ b/README.markdown
@@ -94,7 +94,7 @@ don't exceed 110 characters.
 Release Notes
 -------------
 
-1.22 (02/10/2011)
+1.22, 1.23 (02/10/2011)
 
 -  Some sites are now excluded by default.
 -  View source (`gs`) now opens in a new tab.
diff --git a/manifest.json b/manifest.json
index 161bdb30..72f7873d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Vimium",
-  "version": "1.22",
+  "version": "1.23",
   "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 e12b93096a05fe5b633f407c41c8dd9164308f1a Mon Sep 17 00:00:00 2001
From: ilya
Date: Fri, 11 Feb 2011 13:49:35 -0800
Subject: fix default fetching with excludedUrls

---
 background_page.html | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/background_page.html b/background_page.html
index ee12a77d..0e47bbf7 100644
--- a/background_page.html
+++ b/background_page.html
@@ -141,7 +141,7 @@
    */
   function isEnabledForUrl(request) {
     // excludedUrls are stored as a series of URL expressions separated by newlines.
-    var excludedUrls = (localStorage["excludedUrls"] || defaultSettings.excludedUrls).split("\n");
+    var excludedUrls = getSettingFromLocalStorage("excludedUrls").split("\n");
     var isEnabled = true;
     for (var i = 0; i < excludedUrls.length; i++) {
       // The user can add "*" to the URL which means ".*"
@@ -163,8 +163,7 @@
     var returnPort = chrome.tabs.connect(port.tab.id, { name: "returnZoomLevel" });
     var localStorageKey = "zoom" + args.domain;
     var zoomLevelForDomain = (localStorage[localStorageKey] || "").split(",")[1];
-    var zoomLevel = parseInt(zoomLevelForDomain || localStorage["defaultZoomLevel"] ||
-        defaultSettings.defaultZoomLevel);
+    var zoomLevel = parseInt(zoomLevelForDomain || getSettingFromLocalStorage("defaultZoomLevel"));
     returnPort.postMessage({ zoomLevel: zoomLevel });
   }
 
@@ -284,12 +283,22 @@
    * Used by the content scripts to get settings from the local storage.
    */
   function getSetting(args, port) {
-    var value = localStorage[args.key] ? localStorage[args.key] : defaultSettings[args.key];
-
+    var value = getSettingFromLocalStorage(args.key);
     var returnPort = chrome.tabs.connect(port.tab.id, { name: "returnSetting" });
     returnPort.postMessage({ key: args.key, value: value });
   }
 
+  /*
+   * Used by everyone to get settings from local storage.
+   */
+  function getSettingFromLocalStorage(setting) {
+    if (localStorage[setting] != "" && !localStorage[setting]) {
+      return defaultSettings[setting];
+    } else {
+      return localStorage[setting];
+    }
+  }
+
   /*
    * Persists the current zoom level for a given domain
    */
-- 
cgit v1.2.3


From 01c974dc057cc36a21375c460ca6c668d31c4d0d Mon Sep 17 00:00:00 2001
From: ilya
Date: Fri, 11 Feb 2011 13:51:06 -0800
Subject: cut 1.24 release for bugfix

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

diff --git a/README.markdown b/README.markdown
index 420a607a..8f3772f1 100644
--- a/README.markdown
+++ b/README.markdown
@@ -94,7 +94,7 @@ don't exceed 110 characters.
 Release Notes
 -------------
 
-1.22, 1.23 (02/10/2011)
+1.22, 1.23, 1.24 (02/10/2011)
 
 -  Some sites are now excluded by default.
 -  View source (`gs`) now opens in a new tab.
diff --git a/manifest.json b/manifest.json
index 72f7873d..cae92af3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Vimium",
-  "version": "1.23",
+  "version": "1.24",
   "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 c65e85a840ba25ee59141b8ae1c424ec804c81f9 Mon Sep 17 00:00:00 2001
From: ilya
Date: Fri, 11 Feb 2011 18:27:09 -0800
Subject: Make the options page use the normal help dialog code path when its
 showing the command view. This fixes a regression with the new advanced
 commands functionality -- the command view wasn't showing at all.

---
 options.html | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/options.html b/options.html
index f52cb6ec..4e2f6ecc 100644
--- a/options.html
+++ b/options.html
@@ -75,8 +75,6 @@
 
   <script type="text/javascript">
   $ = function(id) { return document.getElementById(id); };
-  currentlyShowingDialog = null;
-
   var defaultSettings = chrome.extension.getBackgroundPage().defaultSettings;
 
   var editableFields = ["scrollStepSize", "defaultZoomLevel", "excludedUrls", "linkHintCharacters",
@@ -99,8 +97,8 @@
       $(editableFields[i]).addEventListener("keyup", onOptionKeyup, false);
     $("advancedOptions").addEventListener("click", openAdvancedOptions, false);
     $("showCommands").addEventListener("click", function () {
-      showDialog("vimiumCommandListingContainer",
-        chrome.extension.getBackgroundPage().helpDialogHtml(true, true, "Command Listing"));
+      showHelpDialog(
+        chrome.extension.getBackgroundPage().helpDialogHtml(true, true, "Command Listing"), frameId);
     }, false);
   }
 
@@ -164,30 +162,6 @@
       elements[i].style.display = (elements[i].style.display == "table-row") ? "none" : "table-row";
     event.preventDefault();
   }
-
-  function showDialog(dialogId, dialogHtml) {
-    if (currentlyShowingDialog)
-      return false;
-
-    currentlyShowingDialog = dialogId;
-    var container = document.createElement("div");
-    container.id = currentlyShowingDialog;
-    container.innerHTML = dialogHtml;
-    container.getElementsByClassName("closeButton")[0].addEventListener("click", hideDialog, false);
-    container.getElementsByClassName("optionsPage")[0].style.display = 'none';
-    document.body.appendChild(container);
-    var dialog = document.getElementById("vimiumHelpDialog");
-    dialog.style.top = Math.max((window.innerHeight - dialog.clientHeight) / 2.0, 20) + "px";
-  }
-
-  function hideDialog() {
-    var dialog = document.getElementById(currentlyShowingDialog);
-    if (dialog)
-      dialog.parentNode.removeChild(dialog);
-
-    currentlyShowingDialog = null;
-  }
-
   </script>
 
   </head>
-- 
cgit v1.2.3


From dabef2b50b23df370a26031c25e62a410411d5a9 Mon Sep 17 00:00:00 2001
From: ilya
Date: Fri, 11 Feb 2011 18:29:43 -0800
Subject: Change the font size on the help dialog to 11 temporarily because,
 without more refactoring, the command view in the options page with advanced
 enabled is way too large.

---
 helpDialog.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpDialog.html b/helpDialog.html
index 0f1cd6e9..51ff1692 100644
--- a/helpDialog.html
+++ b/helpDialog.html
@@ -5,7 +5,7 @@
 <div id="vimiumHelpDialog">
   <style>
     #vimiumHelpDialog * {
-      font-size:12px;
+      font-size:11px;
       line-height:130%;
       color:black;
       background-color:transparent;
-- 
cgit v1.2.3


From 0bc004b21b91eac7b4690798ed22cafd871c97b0 Mon Sep 17 00:00:00 2001
From: ilya
Date: Fri, 11 Feb 2011 18:36:12 -0800
Subject: cutting 1.25, unfortunately

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

diff --git a/README.markdown b/README.markdown
index 8f3772f1..fcf50fad 100644
--- a/README.markdown
+++ b/README.markdown
@@ -94,7 +94,7 @@ don't exceed 110 characters.
 Release Notes
 -------------
 
-1.22, 1.23, 1.24 (02/10/2011)
+1.22, 1.23, 1.24, 1.25 (02/10/2011)
 
 -  Some sites are now excluded by default.
 -  View source (`gs`) now opens in a new tab.
diff --git a/manifest.json b/manifest.json
index cae92af3..23c6884b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Vimium",
-  "version": "1.24",
+  "version": "1.25",
   "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