diff --git a/common/content/browser.js b/common/content/browser.js index 2fe98736..dc3afd88 100644 --- a/common/content/browser.js +++ b/common/content/browser.js @@ -58,7 +58,6 @@ var Browser = Module("browser", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), events: { DOMContentLoaded: function onDOMContentLoaded(event) { - util.dump("DOMContentLoaded"); let doc = event.originalTarget; if (doc instanceof HTMLDocument) this._triggerLoadAutocmd("DOMLoad", doc); @@ -68,7 +67,6 @@ var Browser = Module("browser", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), // event listener which is is called on each page load, even if the // page is loaded in a background tab load: function onLoad(event) { - util.dump("onLoad"); let doc = event.originalTarget; if (doc instanceof Document) dactyl.initDocument(doc); diff --git a/common/content/statusline.js b/common/content/statusline.js index 3ec88220..84148668 100644 --- a/common/content/statusline.js +++ b/common/content/statusline.js @@ -161,20 +161,22 @@ var StatusLine = Module("statusline", { // when session information is available, add [+] when we can go // backwards, [-] when we can go forwards let modified = ""; - if (window.getWebNavigation) { - let sh = window.getWebNavigation().sessionHistory; - if (sh && sh.index > 0) - modified += "+"; - if (sh && sh.index < sh.count - 1) - modified += "-"; + if (url === buffer.uri.spec) { + if (window.getWebNavigation) { + let sh = window.getWebNavigation().sessionHistory; + if (sh && sh.index > 0) + modified += "+"; + if (sh && sh.index < sh.count - 1) + modified += "-"; + } + if (modules.bookmarkcache) { + if (bookmarkcache.isBookmarked(url)) + modified += UTF8("❤"); + //modified += UTF8("♥"); + } + if (modules.quickmarks) + modified += quickmarks.find(url.replace(/#.*/, "")).join(""); } - if (modules.bookmarkcache) { - if (bookmarkcache.isBookmarked(url)) - modified += UTF8("❤"); - //modified += UTF8("♥"); - } - if (modules.quickmarks) - modified += quickmarks.find(url.replace(/#.*/, "")).join(""); url = losslessDecodeURI(url);