From 1e941af1a6e4dba4e4495b4ca139147139752ff5 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 23 Oct 2010 07:25:28 -0400
Subject: [PATCH] Fix finder scrolling bug introduced by revision 267fb6b1319e.

---
 common/content/finder.js | 6 +++---
 common/content/hints.js  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/content/finder.js b/common/content/finder.js
index 273ba607..b9ceb1cc 100644
--- a/common/content/finder.js
+++ b/common/content/finder.js
@@ -54,7 +54,7 @@ const RangeFinder = Module("rangefinder", {
         if (!this.rangeFind
             || this.rangeFind.window.get() != window
             || linksOnly  != !!this.rangeFind.elementPath
-            || regexp     != this.rangeFind.regex
+            || regexp     != this.rangeFind.regexp
             || matchCase  != this.rangeFind.matchCase
             || !!backward != this.rangeFind.reverse) {
 
@@ -522,10 +522,10 @@ const RangeFind = Class("RangeFind", {
         if (!this.matchCase)
             word = word.toLowerCase();
 
-        if (!again && (word == "" || word.indexOf(this.lastString) != 0 || this.backward)) {
+        if (!again && (word === "" || word.indexOf(this.lastString) !== 0 || this.backward)) {
             if (!private_)
                 this.range.deselect();
-            if (word == "")
+            if (word === "")
                 this.range.descroll();
             this.lastRange = this.startRange;
             this.range = this.ranges.first;
diff --git a/common/content/hints.js b/common/content/hints.js
index 0e727cf8..e831d9c2 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -382,7 +382,7 @@ const Hints = Module("hints", {
         let activeHint = this._hintNumber || 1;
         this._validHints = [];
 
-        for (let [,{ doc: doc, start: start, end: end }] in Iterator(this._docs)) {
+        for (let { doc, start, end } in values(this._docs)) {
             let [offsetX, offsetY] = this._getContainerOffsets(doc);
 
         inner:
@@ -438,7 +438,7 @@ const Hints = Module("hints", {
         if (options["usermode"]) {
             let css = [];
             // FIXME: Broken for imgspans.
-            for (let [, { doc: doc }] in Iterator(this._docs)) {
+            for (let { doc } in values(this._docs)) {
                 for (let elem in util.evaluateXPath("//*[@dactyl:highlight and @number]", doc)) {
                     let group = elem.getAttributeNS(NS, "highlight");
                     css.push(highlight.selector(group) + "[number=" + elem.getAttribute("number").quote() + "] { " + elem.style.cssText + " }");
@@ -459,7 +459,7 @@ const Hints = Module("hints", {
      *     hint disappears.
      */
     _removeHints: function _removeHints(timeout, slight) {
-        for (let [,{ doc: doc, start: start, end: end }] in Iterator(this._docs)) {
+        for (let { doc, start, end } in values(this._docs)) {
             for (let elem in util.evaluateXPath("//*[@dactyl:highlight='hints']", doc))
                 elem.parentNode.removeChild(elem);
             for (let i in util.range(start, end + 1))