Import r6923 from upstream hg supporting Firefox up to 22.0a1

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

diff --git a/common/modules/finder.jsm b/common/modules/finder.jsm
index bde3f4293ff777681cb6b34a0e683b354a4e1049..ee85905b3f89322b6bbd7b93bd58febc674a6fe4 100644 (file)
--- a/common/modules/finder.jsm
+++ b/common/modules/finder.jsm
@@ -1,19 +1,20 @@
-// Copyright (c) 2008-2011 by Kris Maglione <maglione.k@gmail.com>
+// Copyright (c) 2008-2012 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.
-/* use strict */
+"use strict";
 
-Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("finder", {
     exports: ["RangeFind", "RangeFinder", "rangefinder"],
-    require: ["prefs"]
-}, this);
+    require: ["prefs", "util"]
+});
 
-this.lazyRequire("buffer", ["Buffer"]);
-this.lazyRequire("overlay", ["overlay"]);
+lazyRequire("buffer", ["Buffer"]);
+lazyRequire("overlay", ["overlay"]);
 
-function equals(a, b) XPCNativeWrapper(a) == XPCNativeWrapper(b);
+function id(w) w.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils)
+                .outerWindowID;
+function equals(a, b) id(a) == id(b);
 
 /** @instance rangefinder */
 var RangeFinder = Module("rangefinder", {
@@ -260,7 +261,7 @@ var RangeFinder = Module("rangefinder", {
             get onSubmit() modules.rangefinder.closure.onSubmit
         });
     },
-    mappings: function (dactyl, modules, window) {
+    mappings: function initMappings(dactyl, modules, window) {
         const { Buffer, buffer, config, mappings, modes, rangefinder } = modules;
         var myModes = config.browserModes.concat([modes.CARET]);
 
@@ -295,7 +296,7 @@ var RangeFinder = Module("rangefinder", {
             });
 
     },
-    options: function (dactyl, modules, window) {
+    options: function initOptions(dactyl, modules, window) {
         const { options, rangefinder } = modules;
 
         options.add(["hlfind", "hlf"],