Skip to content

Commit

Permalink
Fix tracking protection indication inside #identity-popup
Browse files Browse the repository at this point in the history
  • Loading branch information
Infocatcher committed Dec 7, 2015
1 parent d1f9979 commit 6e215dc
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,10 @@ var privateTab = {
}
}
}
if("TrackingProtection" in window) { // Firefox 42+
var identityPopup = document.getElementById("identity-popup");
identityPopup && identityPopup.addEventListener("popupshowing", this, true);
}
}.bind(this), 0);

if(reason == WINDOW_LOADED)
Expand Down Expand Up @@ -542,6 +546,10 @@ var privateTab = {
// This may happens after our "domwindowclosed" notification!
this.destroyWindowClosingHandler(window);
}
if("TrackingProtection" in window) { // Firefox 42+
var identityPopup = document.getElementById("identity-popup");
identityPopup && identityPopup.removeEventListener("popupshowing", this, true);
}
this.setupListAllTabs(window, false);
this.setupUndoCloseTabs(window, false);
this.destroyControls(window, force);
Expand Down Expand Up @@ -1932,6 +1940,8 @@ var privateTab = {
this.updateUndoCloseTabs(popup);
else if(id == "tabContextMenu")
this.updateTabContext(window);
else if(id == "identity-popup")
window.TrackingProtection.updateEnabled();
else if(
id == "tabbrowser-tab-tooltip"
|| this.isSeaMonkey
Expand Down

0 comments on commit 6e215dc

Please sign in to comment.