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

Bug 220626 - Enable keyboard access to Blocked Popups notification bar. r=mconnor,a=mkaply

Browse Source
This commit is contained in:
doronr%us.ibm.com 2005-04-28 17:28:00 +00:00
parent 479cc410ea
commit 271626f6de
3 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/base/content/browser.js
View File

@ -218,12 +218,14 @@ const gPopupBlockerObserver = {
var brandShortName = brandBundle.getString("brandShortName");
var message;
var popupCount = gBrowser.selectedBrowser.pageReport.length;
var popupButtonText = bundle_browser.getString("popupWarningButton");
if (popupCount > 1)
message = bundle_browser.getFormattedString("popupWarningMultiple", [brandShortName, popupCount]);
else
message = bundle_browser.getFormattedString("popupWarning", [brandShortName]);
gBrowser.showMessage(gBrowser.selectedBrowser, "chrome://browser/skin/Info.png",
message, "", null, null, "blockedPopupOptions", "top", true);
message, popupButtonText, null, null, "blockedPopupOptions", "top", true);
}
}
else
@ -5784,7 +5786,7 @@ missingPluginInstaller.prototype.newMissingPlugin = function(aEvent){
var messageString = bundle_browser.getString("missingpluginsMessage.title");
var buttonString = bundle_browser.getString("missingpluginsMessage.button.label");
tabbrowser.showMessage(browser, iconURL, messageString, buttonString,
tabbrowser.showMessage(browser, iconURL, messageString, buttonString,
"", "missing-plugin", null, "top", true);
}

5
browser/locales/en-US/chrome/browser/browser.properties
View File

@ -68,8 +68,9 @@ xpinstallDisabledWarning=Software installation is currently disabled. Click Edit
xpinstallDisabledWarningButton=Edit Options...
themeWarning=To protect your computer, %S prevented this site (%S) from installing themes.
themeWarningButton=Edit Options...
popupWarning=%S prevented this site from opening a popup window. Click here for options...
popupWarningMultiple=%S prevented this site from opening %S popup windows. Click here for options...
popupWarning=%S prevented this site from opening a popup window.
popupWarningMultiple=%S prevented this site from opening %S popup windows.
popupWarningButton=Options
popupAllow=Allow popups for %S
popupBlock=Block popups for %S
popupWarningDontShowFromMessage=Don't show this message when popups are blocked

48
toolkit/content/widgets/browser.xml
View File

@ -886,16 +886,16 @@
<binding id="browsermessage" extends="xul:hbox">
<content align="center">
<xul:hbox anonid="messagePopupContainer" align="center" flex="1">
<xul:hbox align="center" flex="1">
<xul:image anonid="messageImage" class="messageImage"/>
<xul:description anonid="messageText" class="messageText" flex="1"/>
</xul:hbox>
<xul:button anonid="messageButton" class="messageButton"/>
<xul:button anonid="messageButton" class="messageButton"/>
<xul:spacer class="tabs-right"/>
<xul:hbox hidden="true" anonid="messageClose" class="tabs-closebutton-box"
<xul:hbox hidden="true" anonid="messageClose" class="tabs-closebutton-box"
align="center" pack="end">
<xul:toolbarbutton ondblclick="event.preventBubble();"
class="tabs-closebutton close-button"
<xul:toolbarbutton ondblclick="event.preventBubble();"
class="tabs-closebutton close-button"
oncommand="this.parentNode.parentNode.hide();"/>
</xul:hbox>
</content>
@ -925,7 +925,7 @@
<![CDATA[
this._imageElement.setAttribute("src", val);
return val;
]]>
]]>
</setter>
</property>
@ -935,19 +935,30 @@
<field name="source">
"";
</field>
<field name="_popup">
"";
</field>
<property name="popup">
<setter>
<![CDATA[
if (val)
document.getAnonymousElementByAttribute(this, "anonid", "messagePopupContainer").setAttribute("popup", val);
else
document.getAnonymousElementByAttribute(this, "anonid", "messagePopupContainer").removeAttribute("popup");
this._popup = val;
// store scope
var myThis = this;
var lambda = function (event) {myThis.showPopup(event);}
if (val) {
document.getAnonymousElementByAttribute(this, "anonid", "messageButton").addEventListener("command", lambda, false);
} else {
document.getAnonymousElementByAttribute(this, "anonid", "messageButton").removeEventListener("command", lambda, false);
}
return val;
]]>
</setter>
<getter>
<![CDATA[
return document.getAnonymousElementByAttribute(this, "anonid", "messagePopupContainer").getAttribute("popup");
return this._popup;
]]>
</getter>
</property>
@ -971,7 +982,7 @@
this._textElement.removeChild(this._textElement.firstChild);
this._textElement.appendChild(document.createTextNode(val));
return val;
]]>
]]>
</setter>
</property>
@ -993,7 +1004,7 @@
else
this._buttonElement.setAttribute("style", "max-width: 1px; visibility: hidden;");
return val;
]]>
]]>
</setter>
</property>
<property name="closeButton">
@ -1007,7 +1018,7 @@
var elm = document.getAnonymousElementByAttribute(this, "anonid", "messageClose");
elm.hidden = !val;
return val;
]]>
]]>
</setter>
</property>
<method name="hide">
@ -1017,6 +1028,15 @@
]]>
</body>
</method>
<method name="showPopup">
<parameter name="event"/>
<body>
<![CDATA[
document.getElementById(this.popup).showPopup(event.originalTarget, -1, -1, "popup", "bottomleft", "topleft");
]]>
</body>
</method>
</implementation>
<handlers>
<handler event="command">