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

Backed out 1 changesets (bug 1194706) for bc 5 test failures

Browse Source 
Backed out changeset 36cdf3559c3b (bug 1194706)
This commit is contained in:
Carsten "Tomcat" Book 2015-10-02 13:59:50 +02:00
parent fea5dd863a
commit 588aa7de11
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
toolkit/modules/PopupNotifications.jsm
View File

@ -691,9 +691,14 @@ PopupNotifications.prototype = {
if (!notifications)
notifications = this._currentNotifications;
let notificationsToShow = [];
// Filter out notifications that have been dismissed.
notificationsToShow = notifications.filter(function (n) {
return !n.dismissed && !n.options.neverShow;
});
if (!anchors.size && notifications.length)
anchors = this._getAnchorsForNotifications(notifications);
if (!anchors.size && notificationsToShow.length)
anchors = this._getAnchorsForNotifications(notificationsToShow);
let useIconBox = !!this.iconBox;
if (useIconBox && anchors.size) {
@ -705,18 +710,9 @@ PopupNotifications.prototype = {
}
}
let notificationsToShow = [];
// Filter out notifications that have been dismissed.
notificationsToShow = notifications.filter(function (n) {
return !n.dismissed && !n.options.neverShow;
});
if (useIconBox) {
// Hide icons of the previous tab.
// hide icons of the previous tab.
this._hideIcons();
// Make sure that panels can only be attached to anchors of shown
// notifications inside an iconBox.
anchors = this._getAnchorsForNotifications(notificationsToShow);
}
let haveNotifications = notifications.length > 0;