mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-06 21:05:37 +00:00
bug 896314 fix permission icon when swapping social providers, r=felipe
This commit is contained in:
parent
c40bbaf264
commit
d99d7f422a
@ -1366,6 +1366,7 @@ SocialSidebar = {
|
||||
// Make sure the right sidebar URL is loaded
|
||||
if (sbrowser.getAttribute("src") != Social.provider.sidebarURL) {
|
||||
sbrowser.setAttribute("src", Social.provider.sidebarURL);
|
||||
PopupNotifications.locationChange(sbrowser);
|
||||
}
|
||||
|
||||
// if the document has not loaded, delay until it is
|
||||
|
@ -21,6 +21,18 @@ const PREF_SECURITY_DELAY = "security.notification_enable_delay";
|
||||
let popupNotificationsMap = new WeakMap();
|
||||
let gNotificationParents = new WeakMap;
|
||||
|
||||
function getAnchorFromBrowser(aBrowser) {
|
||||
let anchor = aBrowser.getAttribute("popupnotificationanchor") ||
|
||||
aBrowser.popupnotificationanchor;
|
||||
if (anchor) {
|
||||
if (anchor instanceof Ci.nsIDOMXULElement) {
|
||||
return anchor;
|
||||
}
|
||||
return aBrowser.ownerDocument.getElementById(anchor);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Notification object describes a single popup notification.
|
||||
*
|
||||
@ -60,16 +72,7 @@ Notification.prototype = {
|
||||
get anchorElement() {
|
||||
let iconBox = this.owner.iconBox;
|
||||
|
||||
let anchorElement = null;
|
||||
let anchor = this.browser.getAttribute("popupnotificationanchor") ||
|
||||
this.browser.popupnotificationanchor;
|
||||
if (anchor) {
|
||||
if (anchor instanceof Ci.nsIDOMXULElement) {
|
||||
anchorElement = anchor;
|
||||
} else {
|
||||
anchorElement = this.browser.ownerDocument.getElementById(anchor);
|
||||
}
|
||||
}
|
||||
let anchorElement = getAnchorFromBrowser(this.browser);
|
||||
|
||||
if (!iconBox)
|
||||
return anchorElement;
|
||||
@ -344,8 +347,15 @@ PopupNotifications.prototype = {
|
||||
|
||||
this._setNotificationsForBrowser(aBrowser, notifications);
|
||||
|
||||
if (aBrowser.docShell.isActive)
|
||||
this._update(notifications);
|
||||
if (aBrowser.docShell.isActive) {
|
||||
// get the anchor element if the browser has defined one so it will
|
||||
// _update will handle both the tabs iconBox and non-tab permission
|
||||
// anchors.
|
||||
let anchorElement = notifications.length > 0 ? notifications[0].anchorElement : null;
|
||||
if (!anchorElement)
|
||||
anchorElement = getAnchorFromBrowser(aBrowser);
|
||||
this._update(notifications, anchorElement);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user