зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 1 changesets (bug 1194706) for bc 5 test failures
Backed out changeset 36cdf3559c3b (bug 1194706) --HG-- extra : rebase_source : ba381ad2f0966857476c00f57de545c5ceadc8b0
This commit is contained in:
Родитель
0a1854e6d7
Коммит
e89756ce4d
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче