wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 896314 fix permission icon when swapping social providers, r=felipe

Browse Source
This commit is contained in:
Shane Caraveo 2013-07-29 09:35:41 -07:00
parent 3ca1129cca
commit 6977a96548
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/base/content/browser-social.js
View File

@ -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

34
toolkit/modules/PopupNotifications.jsm
View File

@ -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);
}
},
/**