854035 - PopupNotification should reset mainAction label when it's removed

Status: RESOLVED FIXED

(Toolkit :: General, defect)

Description

[Justin Dolske [:Dolske]]

Attachment: Patch v.1

Found testing bug 737100. The door hanger there follows the typical allow/always/never, but with the twist that if the underlying permission is already "always", we show a buttonless prompt as a reminder.

That works, unless you first show the prompt with a button and then show it again in the same session without the button.

EG (with v10 of patch there)
0) load http://mozilla.pettay.fi/moztests/pointerlock/pointerlock.html
1) click "lock"
2) get the allow/always/never prompt, select "always"
3) Hit escape, click "lock again"
4) get the reminder prompt, but there is an unexpected "allow" button

If you open a new window, load that page, and click "lock" you get the expected buttonless prompt.

Trivial fix. xul.css control the button's display via:

206 .popup-notification-menubutton:not([label]) {
207   display: none;
208 }

Comment 1

[Matthew N. [:MattN]]

Comment on attachment 728487 [details] [diff] [review]
Patch v.1

Review of attachment 728487 [details] [diff] [review]:
-----------------------------------------------------------------

::: toolkit/content/PopupNotifications.jsm
@@ +473,5 @@
>          popupnotification.setAttribute("buttoncommand", "PopupNotifications._onButtonCommand(event);");
>          popupnotification.setAttribute("menucommand", "PopupNotifications._onMenuCommand(event);");
>          popupnotification.setAttribute("closeitemcommand", "PopupNotifications._dismiss();event.stopPropagation();");
> +      } else {
> +        popupnotification.removeAttribute("buttonlabel");

I may be more consistent to remove the attributes that we don't set when there is no mainAction.

Comment 2

[Justin Dolske [:Dolske]]

Attachment: Patch v.2

Comment 3

[Justin Dolske [:Dolske]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/3536b7a3185b

Comment 4

[Joe Drew (not getting mail)]

https://hg.mozilla.org/mozilla-central/rev/3536b7a3185b