Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1578769 - handle the "else" part of attributes; r=MattN

Browse Source 
A `popupnotification` could be reused, we should remove/reset optional attributes to avoid unexpected behavior.

Differential Revision: https://phabricator.services.mozilla.com/D44686

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Liang-Heng Chen 2019-09-05 08:42:29 +00:00
parent 51a48d706f
commit 21ac75bbc5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
toolkit/modules/PopupNotifications.jsm
View File

@ -1028,12 +1028,16 @@ PopupNotifications.prototype = {
popupnotification.removeAttribute("menucommand");
}
let classes = "popup-notification-icon";
if (n.options.popupIconClass) {
let classes = "popup-notification-icon " + n.options.popupIconClass;
popupnotification.setAttribute("iconclass", classes);
classes += " " + n.options.popupIconClass;
}
popupnotification.setAttribute("iconclass", classes);
if (n.options.popupIconURL) {
popupnotification.setAttribute("icon", n.options.popupIconURL);
} else {
popupnotification.removeAttribute("icon");
}
if (n.options.learnMoreURL) {
@ -1104,14 +1108,13 @@ PopupNotifications.prototype = {
telemetryStatId++;
}
}
if (n.secondaryActions.length < 2) {
popupnotification.setAttribute("dropmarkerhidden", "true");
}
} else {
popupnotification.setAttribute("secondarybuttonhidden", "true");
popupnotification.setAttribute("dropmarkerhidden", "true");
}
popupnotification.setAttribute(
"dropmarkerhidden",
n.secondaryActions.length < 2 ? "true" : "false"
);
let checkbox = n.options.checkbox;
if (checkbox && checkbox.label) {