Clobber focusAndSelectUrlBar.

1 files changed, 16 insertions, 0 deletions

diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 5fcf2edd..998fe994 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -40,9 +40,25 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
         styles.registerSheet("resource://dactyl-skin/dactyl.css");
 
         prefs.safeSet("accessibility.typeaheadfind.autostart", false);
+
+        this.cleanups = [];
+        this.cleanups.push(util.overlayObject(window, {
+            focusAndSelectUrlBar: function focusAndSelectUrlBar() {
+                switch (options.get("strictfocus").getKey(document.documentURIObject || util.newURI(document.documentURI), "moderate")) {
+                case "laissez-faire":
+                    if (!Events.isHidden(window.gURLBar, true))
+                        return focusAndSelectUrlBar.superapply(this, arguments);
+                default:
+                    // Evil. Ignore.
+                }
+            }
+        }));
     },
 
     cleanup: function () {
+        for (let cleanup in values(this.cleanups))
+            cleanup.call(this);
+
         delete window.dactyl;
         delete window.liberator;