1 files changed, 42 insertions, 23 deletions

diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index b14e02cc..58def011 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -4,8 +4,6 @@
  * the page's zoom level. We tell the background page that we're in domReady and ready to accept normal
  * commands by connectiong to a port named "domReady".
  */
-var settings = {};
-var settingsToLoad = ["scrollStepSize", "linkHintCharacters"];
 
 var getCurrentUrlHandlers = []; // function(url)
 
@@ -37,6 +35,35 @@ var textInputXPath = '//input[' +
                      textInputTypes.map(function (type) { return '@type="' + type + '"'; }).join(" or ") +
                      ' or not(@type)]';
 
+var settings = {
+  values: {},
+  loadedValues: 0,
+  valuesToLoad: ["scrollStepSize", "linkHintCharacters", "filterLinkHints"],
+
+  get: function (key) { return this.values[key]; },
+
+  load: function() {
+    for (var i in this.valuesToLoad) { this.sendMessage(this.valuesToLoad[i]); }
+  },
+
+  sendMessage: function (key) {
+    if (!settingPort)
+      settingPort = chrome.extension.connect({ name: "getSetting" });
+    settingPort.postMessage({ key: key });
+  },
+
+  receiveMessage: function (args) {
+    // not using 'this' due to issues with binding on callback
+    settings.values[args.key] = args.value;
+    if (++settings.loadedValues == settings.valuesToLoad.length)
+      settings.initializeOnReady();
+  },
+
+  initializeOnReady: function () {
+    linkHints.init();
+  }
+};
+
 /*
  * Give this frame a unique id.
  */
@@ -44,19 +71,11 @@ frameId = Math.floor(Math.random()*999999999)
 
 var hasModifiersRegex = /^<([amc]-)+.>/;
 
-function getSetting(key) {
-  if (!settingPort)
-    settingPort = chrome.extension.connect({ name: "getSetting" });
-  settingPort.postMessage({ key: key });
-}
-
-function setSetting(args) { settings[args.key] = args.value; }
-
 /*
  * Complete initialization work that sould be done prior to DOMReady, like setting the page's zoom level.
  */
 function initializePreDomReady() {
-  for (var i in settingsToLoad) { getSetting(settingsToLoad[i]); }
+  settings.load();
 
   checkIfEnabledForUrl();
 
@@ -94,11 +113,11 @@ function initializePreDomReady() {
   chrome.extension.onConnect.addListener(function(port, name) {
     if (port.name == "executePageCommand") {
       port.onMessage.addListener(function(args) {
-        if (this[args.command] && frameId == args.frameId) {
+        if (frameId == args.frameId) {
           if (args.passCountToFunction) {
-            this[args.command].call(null, args.count);
+            utils.invokeCommandString(args.command, [args.count]);
           } else {
-            for (var i = 0; i < args.count; i++) { this[args.command].call(); }
+            for (var i = 0; i < args.count; i++) { utils.invokeCommandString(args.command); }
           }
         }
 
@@ -129,7 +148,7 @@ function initializePreDomReady() {
           setPageZoomLevel(currentZoomLevel);
       });
     } else if (port.name == "returnSetting") {
-      port.onMessage.addListener(setSetting);
+      port.onMessage.addListener(settings.receiveMessage);
     } else if (port.name == "refreshCompletionKeys") {
       port.onMessage.addListener(function (args) {
         refreshCompletionKeys(args.completionKeys);
@@ -245,14 +264,14 @@ function scrollToBottom() { window.scrollTo(window.pageXOffset, document.body.sc
 function scrollToTop() { window.scrollTo(window.pageXOffset, 0); }
 function scrollToLeft() { window.scrollTo(0, window.pageYOffset); }
 function scrollToRight() { window.scrollTo(document.body.scrollWidth, window.pageYOffset); }
-function scrollUp() { window.scrollBy(0, -1 * settings["scrollStepSize"]); }
-function scrollDown() { window.scrollBy(0, settings["scrollStepSize"]); }
+function scrollUp() { window.scrollBy(0, -1 * settings.get("scrollStepSize")); }
+function scrollDown() { window.scrollBy(0, settings.get("scrollStepSize")); }
 function scrollPageUp() { window.scrollBy(0, -1 * window.innerHeight / 2); }
 function scrollPageDown() { window.scrollBy(0, window.innerHeight / 2); }
 function scrollFullPageUp() { window.scrollBy(0, -window.innerHeight); }
 function scrollFullPageDown() { window.scrollBy(0, window.innerHeight); }
-function scrollLeft() { window.scrollBy(-1 * settings["scrollStepSize"], 0); }
-function scrollRight() { window.scrollBy(settings["scrollStepSize"], 0); }
+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,
@@ -329,7 +348,7 @@ function toggleViewSourceCallback(url) {
 function onKeypress(event) {
   var keyChar = "";
 
-  if (linkHintsModeActivated)
+  if (linkHints.modeActivated)
     return;
 
   // Ignore modifier keys by themselves.
@@ -364,7 +383,7 @@ function onKeypress(event) {
 function onKeydown(event) {
   var keyChar = "";
 
-  if (linkHintsModeActivated)
+  if (linkHints.modeActivated)
     return;
 
   // handle modifiers being pressed.don't handle shiftKey alone (to avoid / being interpreted as ?
@@ -488,7 +507,7 @@ function isFocusable(element) { return isEditable(element) || isEmbed(element);
  * Embedded elements like Flash and quicktime players can obtain focus but cannot be programmatically
  * unfocused.
  */
-function isEmbed(element) { return ["EMBED", "OBJECT"].indexOf(element.tagName) > 0; }
+function isEmbed(element) { return ["embed", "object"].indexOf(element.nodeName.toLowerCase()) > 0; }
 
 /*
  * Input or text elements are considered focusable and able to receieve their own keyboard events,
@@ -501,7 +520,7 @@ function isEditable(target) {
   if (target.getAttribute("contentEditable") == "true")
     return true;
   var focusableInputs = ["input", "textarea", "select", "button"];
-  return focusableInputs.indexOf(target.tagName.toLowerCase()) >= 0;
+  return focusableInputs.indexOf(target.nodeName.toLowerCase()) >= 0;
 }
 
 function enterInsertMode() {