Merge remote-tracking branch 'venshi/master'

2 files changed, 18 insertions, 8 deletions

diff --git a/background_page.html b/background_page.html
index 814c0687..3a8e5b64 100644
--- a/background_page.html
+++ b/background_page.html
@@ -30,11 +30,20 @@
     linkHintCharacters: "sadfjklewcmpgh",
     filterLinkHints: false,
     userDefinedLinkHintCss:
-      "#vimiumHintMarkerContainer .vimiumHintMarker \n/* linkhint boxes */ " +
-      "{\nbackground-color:yellow;\nborder:1px solid #E3BE23;\n}\n\n" +
-      "#vimiumHintMarkerContainer .vimiumHintMarker span \n/* linkhint text */ " +
-      "{\ncolor: black;\nfont-weight: bold;\nfont-size: 12px;\n}\n\n" +
-      "#vimiumHintMarkerContainer .vimiumHintMarker > .matchingCharacter {\n\n}",
+      "#vimiumHintMarkerContainer .vimiumHintMarker {" + "\n" +
+      "/* linkhint boxes */ " + "\n" +
+      "background-color: yellow;" + "\n" +
+      "border: 1px solid #E3BE23;" + "\n" +
+      "}" + "\n\n" +
+      "#vimiumHintMarkerContainer .vimiumHintMarker span {" + "\n" +
+      "/* linkhint text */ " + "\n" +
+      "color: black;" + "\n" +
+      "font-weight: bold;" + "\n" + 
+      "font-size: 12px;" + "\n" +
+      "}" + "\n\n" +
+      "#vimiumHintMarkerContainer .vimiumHintMarker > .matchingCharacter {" + "\n" +
+      "}",
+
     excludedUrls: "http*://mail.google.com/*\n" +
                   "http*://www.google.com/reader/*\n",
 
diff --git a/linkHints.js b/linkHints.js
index e72c3f7f..1fdc0322 100644
--- a/linkHints.js
+++ b/linkHints.js
@@ -97,7 +97,7 @@ var linkHints = {
     // Also note that adding these nodes to document.body all at once is significantly faster than one-by-one.
     this.hintMarkerContainingDiv = document.createElement("div");
     this.hintMarkerContainingDiv.id = "vimiumHintMarkerContainer";
-    this.hintMarkerContainingDiv.className = "vimiumReset internalVimiumHintMarker";
+    this.hintMarkerContainingDiv.className = "vimiumReset";
     for (var i = 0; i < this.hintMarkers.length; i++)
       this.hintMarkerContainingDiv.appendChild(this.hintMarkers[i]);
 
@@ -132,7 +132,7 @@ var linkHints = {
         var img = document.querySelector("img[usemap='#" + map.getAttribute("name") + "']");
         if (!img) continue;
         var imgClientRects = img.getClientRects();
-        if (!imgClientRects) continue;
+        if (imgClientRects.length == 0) continue;
         var c = element.coords.split(/,/);
         var coords = [parseInt(c[0], 10), parseInt(c[1], 10), parseInt(c[2], 10), parseInt(c[3], 10)];
         var rect = {
@@ -256,7 +256,8 @@ var linkHints = {
   showMarker: function(linkMarker, matchingCharCount) {
     linkMarker.style.display = "";
     for (var j = 0, count = linkMarker.childNodes.length; j < count; j++)
-      linkMarker.childNodes[j].className = (j >= matchingCharCount) ? "" : "matchingCharacter";
+      (j < matchingCharCount) ? linkMarker.childNodes[j].classList.add("matchingCharacter") :
+                                linkMarker.childNodes[j].classList.remove("matchingCharacter");
   },
 
   hideMarker: function(linkMarker) {