Backed out changeset 317093217f10 from
Bug 595810 (see
Bug 603228 for more info)
--- a/suite/common/bindings/notification.xml
+++ b/suite/common/bindings/notification.xml
@@ -778,78 +778,16 @@
// reload the browser to make the new plugin show.
this.activeBrowser.reload();
]]>
</handler>
</handlers>
</binding>
- <binding id="popup-notification"
- extends="chrome://communicator/content/bindings/notification.xml#browser-notificationbox">
- <implementation>
- <method name="showGeolocationPrompt">
- <parameter name="file"/>
- <parameter name="site"/>
- <parameter name="image"/>
- <parameter name="allowCallback"/>
- <parameter name="cancelCallback"/>
- <body>
- <![CDATA[
- var type = "geolocation";
- var mainAction = {
- label: this._stringBundle.GetStringFromName(type + ".shareLocation"),
- accessKey: this._stringBundle.GetStringFromName(type + ".shareLocation.accesskey"),
- callback: function(aNotification) {
- allowCallback(false);
- }
- };
-
- var secondaryActions = [{
- label: this._stringBundle.GetStringFromName(type + ".dontShareLocation"),
- accessKey: this._stringBundle.GetStringFromName(type + ".dontShareLocation.accesskey"),
- callback: function (aNotification) {
- cancelCallback(false);
- }
- }, {
- label: this._stringBundle.GetStringFromName(type + ".neverShareLocation"),
- accessKey: this._stringBundle.GetStringFromName(type + ".neverShareLocation.accesskey"),
- callback: function (aNotification) {
- cancelCallback(true);
- }
- }, {
- label: this._stringBundle.GetStringFromName(type + ".alwaysShareLocation"),
- accessKey: this._stringBundle.GetStringFromName(type + ".alwaysShareLocation.accesskey"),
- callback: function (aNotification) {
- allowCallback(true);
- }
- }];
-
- var message;
- if (site) {
- message = this._stringBundle
- .formatStringFromName(type + ".siteWantsToKnow",
- [site], 1);
- } else {
- message = this._stringBundle
- .formatStringFromName(type + ".fileWantsToKnow",
- [file], 1);
- secondaryActions.length = 1;
- }
-
- PopupNotifications.show(this.activeBrowser,
- "geolocation", message,
- "geo-notification-icon", mainAction,
- secondaryActions);
- ]]>
- </body>
- </method>
- </implementation>
- </binding>
-
<binding id="sidebar-notification"
extends="chrome://global/content/bindings/notification.xml#notification">
<content>
<xul:vbox class="notification-inner outset" flex="1" xbl:inherits="type">
<xul:hbox align="center">
<xul:image anonid="messageImage" class="messageImage" xbl:inherits="src=image"/>
<xul:arrowscrollbox orient="horizontal" flex="1" pack="end"
oncommand="document.getBindingParent(this)._doButtonCommand(event);">
--- a/suite/common/communicator.css
+++ b/suite/common/communicator.css
@@ -46,20 +46,16 @@ toolbar[printpreview="true"] {
}
/* ::::: notification box ::::: */
.browser-notificationbox {
-moz-binding: url("chrome://communicator/content/bindings/notification.xml#browser-notificationbox");
}
-.browser-notificationbox[popupnotification="true"] {
- -moz-binding: url("chrome://communicator/content/bindings/notification.xml#popup-notification");
-}
-
/* ::::: toolbaritem ::::: */
toolbaritem {
-moz-binding: url("chrome://global/content/bindings/general.xml#basecontrol");
}
/* With the move to the new toolkit, SeaMonkey needs to overwrite certain bindings
* if it wants to keep its distinctive likeness. The now hidden new toolkit bindings
* will stay accessible via a set xpfe="false" attribute, though, where necessary.
--- a/suite/locales/en-US/chrome/common/notification.properties
+++ b/suite/locales/en-US/chrome/common/notification.properties
@@ -18,26 +18,22 @@ xpinstallPromptWarning=%S prevented this
xpinstallPromptInstallButton=Install Software…
xpinstallPromptInstallButton.accesskey=I
xpinstallDisabledMessageLocked=Software installation has been disabled by your system administrator.
xpinstallDisabledMessage=Software installation is currently disabled. Click Enable and try again.
xpinstallDisabledButton=Enable
xpinstallDisabledButton.accesskey=n
# Geolocation UI
-# LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareLocation geolocation.alwaysShare geolocation.neverShare):
+# LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareLocation):
#If you're having trouble with the word Share, please use Allow and Block in your language.
geolocation.shareLocation=Share Location
geolocation.shareLocation.accesskey=a
geolocation.dontShareLocation=Don't Share
geolocation.dontShareLocation.accesskey=o
-geolocation.alwaysShareLocation=Always Share
-geolocation.alwaysShareLocation.accesskey=A
-geolocation.neverShareLocation=Never Share
-geolocation.neverShareLocation.accesskey=N
geolocation.siteWantsToKnow=%S wants to know your location.
geolocation.fileWantsToKnow=The file %S wants to know your location.
# LOCALIZATION NOTE (geolocation.learnMore): Use the unicode ellipsis char, \u2026,
# or use "..." unless \u2026 doesn't suit traditions in your locale.
geolocation.learnMore=Learn More…
geolocation.remember=Remember for this website
# Block autorefresh
