diff --git a/mozilla/suite/browser/linkToolbarOverlay.js b/mozilla/suite/browser/linkToolbarOverlay.js
index 18376c913ac..f08f3d56717 100644
--- a/mozilla/suite/browser/linkToolbarOverlay.js
+++ b/mozilla/suite/browser/linkToolbarOverlay.js
@@ -178,6 +178,7 @@ LinkToolbarUI.prototype.toggleLinkToolbar =
function(checkedItem)
{
this.goToggleTristateToolbar("linktoolbar", checkedItem);
+ this.initHandlers();
if (this.isLinkToolbarEnabled())
this.doRefresh();
else
@@ -215,5 +216,26 @@ function(id, checkedItem)
document.persist(id, "hidden");
}
}
+LinkToolbarUI.prototype.initHandlers =
+function()
+{
+ var contentArea = document.getElementById("appcontent");
+ if (this.isLinkToolbarEnabled())
+ {
+ if (!this.handlersActive) {
+ contentArea.addEventListener("load", linkToolbarUI.refresh, true);
+ contentArea.addEventListener("unload", linkToolbarUI.clear, true);
+ this.handlersActive = true;
+ }
+ } else
+ {
+ if (this.handlersActive) {
+ contentArea.removeEventListener("load", linkToolbarUI.refresh, true);
+ contentArea.removeEventListener("unload", linkToolbarUI.clear, true);
+ this.handlersActive = false;
+ }
+ }
+}
const linkToolbarUI = new LinkToolbarUI;
+
diff --git a/mozilla/suite/browser/linkToolbarOverlay.xul b/mozilla/suite/browser/linkToolbarOverlay.xul
index 3c3ed1f4805..397bdc38056 100644
--- a/mozilla/suite/browser/linkToolbarOverlay.xul
+++ b/mozilla/suite/browser/linkToolbarOverlay.xul
@@ -1,195 +1,193 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mozilla/suite/browser/navigator.xul b/mozilla/suite/browser/navigator.xul
index 7cf317cce75..127c8184992 100644
--- a/mozilla/suite/browser/navigator.xul
+++ b/mozilla/suite/browser/navigator.xul
@@ -27,6 +27,7 @@ Contributor(s): ______________________________________. -->
+