Import r6948 from upstream hg supporting Firefox up to 24.*

[dactyl.git] / common / content / browser.js

diff --git a/common/content/browser.js b/common/content/browser.js
index cc504ff12b97ba7c742b0a7827d0c0a8409397e4..79d98d2df8fbe57b2b024b557a0307d349d0beef 100644 (file)
--- a/common/content/browser.js
+++ b/common/content/browser.js
@@ -1,10 +1,10 @@
 // Copyright (c) 2006-2008 by Martin Stubenschrott <stubenschrott@vimperator.org>
 // Copyright (c) 2007-2011 by Doug Kearns <dougkearns@gmail.com>
-// Copyright (c) 2008-2011 by Kris Maglione <maglione.k at Gmail>
+// Copyright (c) 2008-2012 Kris Maglione <maglione.k at Gmail>
 //
 // 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";
 
 /** @scope modules */
 
@@ -66,7 +66,7 @@ var Browser = Module("browser", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
     events: {
         DOMContentLoaded: function onDOMContentLoaded(event) {
             let doc = event.originalTarget;
-            if (doc instanceof HTMLDocument)
+            if (doc instanceof Ci.nsIDOMHTMLDocument)
                 this._triggerLoadAutocmd("DOMLoad", doc);
         },
 
@@ -78,7 +78,7 @@ var Browser = Module("browser", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
             if (doc instanceof Document)
                 dactyl.initDocument(doc);
 
-            if (doc instanceof HTMLDocument) {
+            if (doc instanceof Ci.nsIDOMHTMLDocument) {
                 if (doc.defaultView.frameElement) {
                     // document is part of a frameset
 
@@ -202,11 +202,11 @@ var Browser = Module("browser", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
         commands.add(["redr[aw]"],
             "Redraw the screen",
             function () {
-                window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils)
-                      .redraw();
                 statusline.overLink = null;
                 statusline.updateStatus();
                 commandline.clear();
+                window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils)
+                      .redraw();
             },
             { argCount: "0" });
     },
@@ -222,7 +222,7 @@ var Browser = Module("browser", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
             if (dactyl.forceTarget in openModes)
                 mode = openModes[dactyl.forceTarget];
 
-            CommandExMode().open(mode + "open " + (args || ""))
+            CommandExMode().open(mode + "open " + (args || ""));
         }
 
         function decode(uri) util.losslessDecodeURI(uri)
@@ -267,12 +267,12 @@ var Browser = Module("browser", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
 
         mappings.add([modes.NORMAL], ["<open-homepage>", "gh"],
             "Open homepage",
-            function () { BrowserHome(); });
+            function () { window.BrowserHome(); });
 
         mappings.add([modes.NORMAL], ["<tab-open-homepage>", "gH"],
             "Open homepage in a new tab",
             function () {
-                let homepages = gHomeButton.getHomePage();
+                let homepages = window.gHomeButton.getHomePage();
                 dactyl.open(homepages, { from: "homepage", where: dactyl.NEW_TAB });
             });
 
@@ -282,4 +282,4 @@ var Browser = Module("browser", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
     }
 });
 
-// vim: set fdm=marker sw=4 ts=4 et:
+// vim: set fdm=marker sw=4 sts=4 ts=8 et: