Imported Upstream version 1.1+hg7904

[dactyl.git] / common / modules / finder.jsm

diff --git a/common/modules/finder.jsm b/common/modules/finder.jsm
index 738b17772bf4835fe5def2d718c3d6f4b26ad4f3..2f263ba04ba0745f66196fe4da25895c29021391 100644 (file)
--- a/common/modules/finder.jsm
+++ b/common/modules/finder.jsm
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2013 Kris Maglione <maglione.k@gmail.com>
+// Copyright (c) 2008-2014 Kris Maglione <maglione.k@gmail.com>
 //
 // This work is licensed for reuse under an MIT license. Details are
 // given in the LICENSE.txt file included with this file.
@@ -253,10 +253,10 @@ var RangeFinder = Module("rangefinder", {
 
             get prompt() this.mode === modules.modes.FIND_BACKWARD ? "?" : "/",
 
-            get onCancel() modules.rangefinder.closure.onCancel,
-            get onChange() modules.rangefinder.closure.onChange,
-            get onHistory() modules.rangefinder.closure.onHistory,
-            get onSubmit() modules.rangefinder.closure.onSubmit
+            get onCancel()  modules.rangefinder.bound.onCancel,
+            get onChange()  modules.rangefinder.bound.onChange,
+            get onHistory() modules.rangefinder.bound.onHistory,
+            get onSubmit()  modules.rangefinder.bound.onSubmit
         });
     },
     mappings: function initMappings(dactyl, modules, window) {
@@ -626,7 +626,7 @@ var RangeFind = Class("RangeFind", {
         if (!this.matchCase)
             pattern = pattern.toLowerCase();
 
-        if (!again && (pattern === "" || pattern.indexOf(this.lastString) !== 0 || this.backward)) {
+        if (!again && (pattern === "" || !pattern.startsWith(this.lastString) || this.backward)) {
             if (!private_)
                 this.range.deselect();
             if (pattern === "")
@@ -707,12 +707,12 @@ var RangeFind = Class("RangeFind", {
 
     addListeners: function addListeners() {
         for (let range in array.iterValues(this.ranges))
-            range.window.addEventListener("unload", this.closure.onUnload, true);
+            range.window.addEventListener("unload", this.bound.onUnload, true);
     },
     purgeListeners: function purgeListeners() {
         for (let range in array.iterValues(this.ranges))
             try {
-                range.window.removeEventListener("unload", this.closure.onUnload, true);
+                range.window.removeEventListener("unload", this.bound.onUnload, true);
             }
             catch (e if e.result === Cr.NS_ERROR_FAILURE) {}
     },