Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-05 00:02:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 943292 - Camera icon/popup for gUM access can get hidden, r=felipe.

Browse Source
This commit is contained in:
Florian Quèze 2014-01-17 23:31:07 +01:00
parent 7c8c0e018c
commit a3ac567800
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
toolkit/modules/PopupNotifications.jsm
View File

@ -302,7 +302,7 @@ PopupNotifications.prototype = {
if (!notification.dismissed && isActive) {
this.window.getAttention();
if (notification.anchorElement.parentNode != this.iconBox) {
notification.anchorElement.setAttribute(ICON_ATTRIBUTE_SHOWING, "true");
this._updateAnchorIcon(notifications, notification.anchorElement);
}
}
@ -640,20 +640,7 @@ PopupNotifications.prototype = {
this._showIcons(notifications);
this.iconBox.hidden = false;
} else if (anchorElement) {
anchorElement.setAttribute(ICON_ATTRIBUTE_SHOWING, "true");
// use the anchorID as a class along with the default icon class as a
// fallback if anchorID is not defined in CSS. We always use the first
// notifications icon, so in the case of multiple notifications we'll
// only use the default icon
if (anchorElement.classList.contains("notification-anchor-icon")) {
// remove previous icon classes
let className = anchorElement.className.replace(/([-\w]+-notification-icon\s?)/g,"")
className = "default-notification-icon " + className;
if (notifications.length == 1) {
className = notifications[0].anchorID + " " + className;
}
anchorElement.className = className;
}
this._updateAnchorIcon(notifications, anchorElement);
}
// Also filter out notifications that have been dismissed.
@ -687,6 +674,24 @@ PopupNotifications.prototype = {
}
},
_updateAnchorIcon: function PopupNotifications_updateAnchorIcon(notifications,
anchorElement) {
anchorElement.setAttribute(ICON_ATTRIBUTE_SHOWING, "true");
// Use the anchorID as a class along with the default icon class as a
// fallback if anchorID is not defined in CSS. We always use the first
// notifications icon, so in the case of multiple notifications we'll
// only use the default icon.
if (anchorElement.classList.contains("notification-anchor-icon")) {
// remove previous icon classes
let className = anchorElement.className.replace(/([-\w]+-notification-icon\s?)/g,"")
className = "default-notification-icon " + className;
if (notifications.length == 1) {
className = notifications[0].anchorID + " " + className;
}
anchorElement.className = className;
}
},
_showIcons: function PopupNotifications_showIcons(aCurrentNotifications) {
for (let notification of aCurrentNotifications) {
let anchorElm = notification.anchorElement;