diff options
13 files changed, 7 insertions, 96 deletions
diff --git a/application/palemoon/base/content/browser.xul b/application/palemoon/base/content/browser.xul index 6545e0ac2..c2553f295 100644 --- a/application/palemoon/base/content/browser.xul +++ b/application/palemoon/base/content/browser.xul @@ -449,7 +449,6 @@ <box id="notification-popup-box" hidden="true" align="center"> <image id="default-notification-icon" class="notification-anchor-icon" role="button"/> <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/> - <image id="push-notification-icon" class="notification-anchor-icon" role="button"/> <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> diff --git a/application/palemoon/components/nsBrowserGlue.js b/application/palemoon/components/nsBrowserGlue.js index 3908ae81f..642e27c6b 100644 --- a/application/palemoon/components/nsBrowserGlue.js +++ b/application/palemoon/components/nsBrowserGlue.js @@ -1751,42 +1751,6 @@ ContentPermissionPrompt.prototype = { } }, - _promptPush : function(aRequest) { - var browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties"); - var requestingURI = aRequest.principal.URI; - - var message = browserBundle.formatStringFromName("push.enablePush", - [requestingURI.host], 1); - - var actions = [ - { - stringId: "push.alwaysAllow", - action: Ci.nsIPermissionManager.ALLOW_ACTION, - expireType: null, - callback: function() {} - }, - { - stringId: "push.allowForSession", - action: Ci.nsIPermissionManager.ALLOW_ACTION, - expireType: Ci.nsIPermissionManager.EXPIRE_SESSION, - callback: function() {} - }, - { - stringId: "push.alwaysBlock", - action: Ci.nsIPermissionManager.DENY_ACTION, - expireType: null, - callback: function() {} - }] - - var options = { - learnMoreURL: Services.urlFormatter.formatURLPref("browser.push.warning.infoURL"), - }; - - this._showPrompt(aRequest, message, "push", actions, "push", - "push-notification-icon", options); - - }, - _promptGeo : function(aRequest) { var browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties"); var requestingURI = aRequest.principal.URI; @@ -1866,9 +1830,13 @@ ContentPermissionPrompt.prototype = { }, ]; + var options = { + learnMoreURL: Services.urlFormatter.formatURLPref("browser.push.warning.infoURL"), + }; + this._showPrompt(aRequest, message, "desktop-notification", actions, "web-notifications", - "web-notifications-notification-icon", null); + "web-notifications-notification-icon", options); }, _promptPointerLock: function CPP_promtPointerLock(aRequest, autoAllow) { @@ -1922,7 +1890,6 @@ ContentPermissionPrompt.prototype = { const kFeatureKeys = { "geolocation" : "geo", "desktop-notification" : "desktop-notification", "pointerLock" : "pointerLock", - "push" : "push" }; // Make sure that we support the request. @@ -1966,10 +1933,6 @@ ContentPermissionPrompt.prototype = { case "pointerLock": this._promptPointerLock(request, autoAllow); break; - case "push": - this._promptPush(request); - break; - } }, }; diff --git a/application/palemoon/components/preferences/aboutPermissions.js b/application/palemoon/components/preferences/aboutPermissions.js index db717e1c6..f41b71658 100644 --- a/application/palemoon/components/preferences/aboutPermissions.js +++ b/application/palemoon/components/preferences/aboutPermissions.js @@ -449,19 +449,6 @@ var PermissionDefaults = { let value = (aValue != this.DENY); Services.prefs.setBoolPref("full-screen-api.pointer-lock.enabled", value); }, - - get push() { - if (!Services.prefs.getBoolPref("dom.push.enabled")) { - return this.DENY; - } - // We always ask for permission to push with a specific site, - // so there is no global ALLOW. - return this.UNKNOWN; - }, - set push(aValue) { - let value = (aValue != this.DENY); - Services.prefs.setBoolPref("dom.push.enabled", value); - }, } /** @@ -509,13 +496,13 @@ var AboutPermissions = { */ _supportedPermissions: ["password", "image", "popup", "cookie", "desktop-notification", "install", "geo", "indexedDB", - "fullscreen", "pointerLock", "push"], + "fullscreen", "pointerLock"], /** * Permissions that don't have a global "Allow" option. */ _noGlobalAllow: ["desktop-notification", "geo", "indexedDB", "fullscreen", - "pointerLock", "push"], + "pointerLock"], /** * Permissions that don't have a global "Deny" option. diff --git a/application/palemoon/locales/en-US/chrome/browser/browser.properties b/application/palemoon/locales/en-US/chrome/browser/browser.properties index aff5b6f7d..bf363d103 100644 --- a/application/palemoon/locales/en-US/chrome/browser/browser.properties +++ b/application/palemoon/locales/en-US/chrome/browser/browser.properties @@ -305,15 +305,6 @@ webNotifications.neverShow=Always Block Notifications webNotifications.neverShow.accesskey=N webNotifications.showFromSite=Would you like to show notifications from %S? -# Push Notifications -push.allowForSession=Allow for Session -push.allowForSession.accesskey=S -push.alwaysAllow=Always Allow Push Notifications -push.alwaysAllow.accesskey=A -push.alwaysBlock=Always Block Push Notifications -push.alwaysBlock.accesskey=B -push.enablePush=Would you like to allow Push Notifications for %S? - # Pointer lock UI pointerLock.allow2=Hide pointer diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/aboutPermissions.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/aboutPermissions.dtd index c6c48de7e..9e36520c8 100644 --- a/application/palemoon/locales/en-US/chrome/browser/preferences/aboutPermissions.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/preferences/aboutPermissions.dtd @@ -55,6 +55,4 @@ <!ENTITY pointerLock.label "Hide the Mouse Pointer"> -<!ENTITY push.label "Receive Push Notifications"> - <!ENTITY focusSearch.key "f"> diff --git a/application/palemoon/themes/linux/jar.mn b/application/palemoon/themes/linux/jar.mn index d1c6d4013..7e67d0129 100644 --- a/application/palemoon/themes/linux/jar.mn +++ b/application/palemoon/themes/linux/jar.mn @@ -23,8 +23,6 @@ browser.jar: * skin/classic/browser/engineManager.css skin/classic/browser/Geolocation-16.png skin/classic/browser/Geolocation-64.png - skin/classic/browser/Push-16.png - skin/classic/browser/Push-64.png skin/classic/browser/Go-arrow.png skin/classic/browser/identity.png skin/classic/browser/imagedocument.png diff --git a/application/palemoon/themes/linux/preferences/aboutPermissions.css b/application/palemoon/themes/linux/preferences/aboutPermissions.css index a642b385f..406568831 100644 --- a/application/palemoon/themes/linux/preferences/aboutPermissions.css +++ b/application/palemoon/themes/linux/preferences/aboutPermissions.css @@ -98,9 +98,6 @@ .pref-icon[type="geo"] { list-style-image: url(chrome://browser/skin/Geolocation-64.png); } -.pref-icon[type="push"] { - list-style-image: url(chrome://browser/skin/Push-64.png); -} .pref-icon[type="indexedDB"] { list-style-image: url(chrome://global/skin/icons/question-64.png); } diff --git a/application/palemoon/themes/osx/browser.css b/application/palemoon/themes/osx/browser.css index 26661558f..da9484069 100644 --- a/application/palemoon/themes/osx/browser.css +++ b/application/palemoon/themes/osx/browser.css @@ -1848,10 +1848,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://browser/skin/Geolocation-64.png); } -.popup-notification-icon[popupid="push"] { - list-style-image: url(chrome://browser/skin/Push-64.png); -} - .popup-notification-icon[popupid="xpinstall-disabled"], .popup-notification-icon[popupid="addon-progress"], .popup-notification-icon[popupid="addon-install-cancelled"], diff --git a/application/palemoon/themes/osx/jar.mn b/application/palemoon/themes/osx/jar.mn index 0e12fdffa..186cd8a75 100644 --- a/application/palemoon/themes/osx/jar.mn +++ b/application/palemoon/themes/osx/jar.mn @@ -24,8 +24,6 @@ browser.jar: * skin/classic/browser/engineManager.css skin/classic/browser/Geolocation-16.png skin/classic/browser/Geolocation-64.png - skin/classic/browser/Push-16.png - skin/classic/browser/Push-64.png skin/classic/browser/Info.png skin/classic/browser/identity.png skin/classic/browser/imagedocument.png diff --git a/application/palemoon/themes/osx/preferences/aboutPermissions.css b/application/palemoon/themes/osx/preferences/aboutPermissions.css index e10776e67..cfb941bbb 100644 --- a/application/palemoon/themes/osx/preferences/aboutPermissions.css +++ b/application/palemoon/themes/osx/preferences/aboutPermissions.css @@ -101,9 +101,6 @@ .pref-icon[type="geo"] { list-style-image: url(chrome://browser/skin/Geolocation-64.png); } -.pref-icon[type="push"] { - list-style-image: url(chrome://browser/skin/Push-64.png); -} .pref-icon[type="indexedDB"] { list-style-image: url(chrome://global/skin/icons/question-64.png); } diff --git a/application/palemoon/themes/windows/browser.css b/application/palemoon/themes/windows/browser.css index 6379eac60..1c51accae 100644 --- a/application/palemoon/themes/windows/browser.css +++ b/application/palemoon/themes/windows/browser.css @@ -2337,10 +2337,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://browser/skin/Geolocation-64.png); } -.popup-notification-icon[popupid="push"] { - list-style-image: url(chrome://browser/skin/Push-64.png); -} - .popup-notification-icon[popupid="xpinstall-disabled"], .popup-notification-icon[popupid="addon-progress"], .popup-notification-icon[popupid="addon-install-cancelled"], @@ -2466,10 +2462,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://browser/skin/Geolocation-16.png); } -#push-notification-icon { - list-style-image: url(chrome://browser/skin/Push-16.png); -} - #addons-notification-icon { list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png); } diff --git a/application/palemoon/themes/windows/jar.mn b/application/palemoon/themes/windows/jar.mn index d649d9c41..a66714b13 100644 --- a/application/palemoon/themes/windows/jar.mn +++ b/application/palemoon/themes/windows/jar.mn @@ -25,8 +25,6 @@ browser.jar: * skin/classic/browser/engineManager.css skin/classic/browser/Geolocation-16.png skin/classic/browser/Geolocation-64.png - skin/classic/browser/Push-16.png - skin/classic/browser/Push-64.png skin/classic/browser/Info.png skin/classic/browser/identity.png skin/classic/browser/imagedocument.png diff --git a/application/palemoon/themes/windows/preferences/aboutPermissions.css b/application/palemoon/themes/windows/preferences/aboutPermissions.css index 0a2a05358..d9db6ccbf 100644 --- a/application/palemoon/themes/windows/preferences/aboutPermissions.css +++ b/application/palemoon/themes/windows/preferences/aboutPermissions.css @@ -101,9 +101,6 @@ .pref-icon[type="geo"] { list-style-image: url(chrome://browser/skin/Geolocation-64.png); } -.pref-icon[type="push"] { - list-style-image: url(chrome://browser/skin/Push-64.png); -} .pref-icon[type="indexedDB"] { list-style-image: url(chrome://global/skin/icons/question-48.png); } |