From 6e4da38d2d63cbecbb3bca29450ab84a759dff24 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 5 Apr 2019 15:12:51 +0200 Subject: Zap the robots. Resolves #1036 --- .../basilisk/base/content/aboutRobots-icon.png | Bin 9817 -> 0 bytes .../base/content/aboutRobots-widget-left.png | Bin 2224 -> 0 bytes .../basilisk/base/content/aboutRobots.xhtml | 108 --------------------- application/basilisk/base/jar.mn | 3 - .../basilisk/components/about/AboutRedirector.cpp | 5 - application/basilisk/components/build/nsModule.cpp | 1 - .../locales/en-US/chrome/browser/aboutRobots.dtd | 29 ------ application/basilisk/locales/jar.mn | 1 - .../basilisk/modules/ProcessHangMonitor.jsm | 2 +- .../palemoon/base/content/aboutRobots-icon.png | Bin 9817 -> 0 bytes .../base/content/aboutRobots-widget-left.png | Bin 2224 -> 0 bytes .../palemoon/base/content/aboutRobots.xhtml | 108 --------------------- application/palemoon/base/jar.mn | 3 - .../palemoon/components/BrowserComponents.manifest | 1 - .../palemoon/components/nsAboutRedirector.js | 4 - .../locales/en-US/chrome/browser/aboutRobots.dtd | 29 ------ application/palemoon/locales/jar.mn | 1 - 17 files changed, 1 insertion(+), 294 deletions(-) delete mode 100644 application/basilisk/base/content/aboutRobots-icon.png delete mode 100644 application/basilisk/base/content/aboutRobots-widget-left.png delete mode 100644 application/basilisk/base/content/aboutRobots.xhtml delete mode 100644 application/basilisk/locales/en-US/chrome/browser/aboutRobots.dtd delete mode 100644 application/palemoon/base/content/aboutRobots-icon.png delete mode 100644 application/palemoon/base/content/aboutRobots-widget-left.png delete mode 100644 application/palemoon/base/content/aboutRobots.xhtml delete mode 100644 application/palemoon/locales/en-US/chrome/browser/aboutRobots.dtd (limited to 'application') diff --git a/application/basilisk/base/content/aboutRobots-icon.png b/application/basilisk/base/content/aboutRobots-icon.png deleted file mode 100644 index 1c4899aaf..000000000 Binary files a/application/basilisk/base/content/aboutRobots-icon.png and /dev/null differ diff --git a/application/basilisk/base/content/aboutRobots-widget-left.png b/application/basilisk/base/content/aboutRobots-widget-left.png deleted file mode 100644 index 3a1e48d5f..000000000 Binary files a/application/basilisk/base/content/aboutRobots-widget-left.png and /dev/null differ diff --git a/application/basilisk/base/content/aboutRobots.xhtml b/application/basilisk/base/content/aboutRobots.xhtml deleted file mode 100644 index 23fe3ba17..000000000 --- a/application/basilisk/base/content/aboutRobots.xhtml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - %htmlDTD; - - %netErrorDTD; - - %globalDTD; - - %aboutrobotsDTD; -]> - - - - &robots.pagetitle; - - - - - - - - - - - -
- - -
-

&robots.errorTitleText;

-
- - -
- - -
-

&robots.errorShortDescText;

-
- - -
-
    -
  • &robots.errorLongDesc1;
    • -
  • &robots.errorLongDesc2;
    • -
  • &robots.errorLongDesc3;
    • -
  • &robots.errorLongDesc4;
    • -
-
- - -
-

&robots.errorTrailerDescText;

-
- -
- - - - - - -
- - - diff --git a/application/basilisk/base/jar.mn b/application/basilisk/base/jar.mn index ddfb0ffe8..3b51e9555 100644 --- a/application/basilisk/base/jar.mn +++ b/application/basilisk/base/jar.mn @@ -15,7 +15,6 @@ browser.jar: * content/browser/aboutDialog.xul (content/aboutDialog.xul) content/browser/aboutDialog.js (content/aboutDialog.js) content/browser/aboutDialog.css (content/aboutDialog.css) - content/browser/aboutRobots.xhtml (content/aboutRobots.xhtml) * content/browser/abouthome/aboutHome.xhtml (content/abouthome/aboutHome.xhtml) content/browser/abouthome/aboutHome.js (content/abouthome/aboutHome.js) * content/browser/abouthome/aboutHome.css (content/abouthome/aboutHome.css) @@ -59,8 +58,6 @@ browser.jar: content/browser/aboutaccounts/images/graphic_sync_intro@2x.png (content/aboutaccounts/images/graphic_sync_intro@2x.png) - content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) - content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) diff --git a/application/basilisk/components/about/AboutRedirector.cpp b/application/basilisk/components/about/AboutRedirector.cpp index b77949ea7..2b8608484 100644 --- a/application/basilisk/components/about/AboutRedirector.cpp +++ b/application/basilisk/components/about/AboutRedirector.cpp @@ -79,11 +79,6 @@ static RedirEntry kRedirMap[] = { nsIAboutModule::MAKE_LINKABLE | nsIAboutModule::ALLOW_SCRIPT }, - { - "robots", "chrome://browser/content/aboutRobots.xhtml", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT - }, { "searchreset", "chrome://browser/content/search/searchReset.xhtml", nsIAboutModule::ALLOW_SCRIPT | diff --git a/application/basilisk/components/build/nsModule.cpp b/application/basilisk/components/build/nsModule.cpp index 1baccd710..4e082ab6c 100644 --- a/application/basilisk/components/build/nsModule.cpp +++ b/application/basilisk/components/build/nsModule.cpp @@ -94,7 +94,6 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = { { NS_ABOUT_MODULE_CONTRACTID_PREFIX "feeds", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "privatebrowsing", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "rights", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "robots", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "searchreset", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "sessionrestore", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "welcomeback", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, diff --git a/application/basilisk/locales/en-US/chrome/browser/aboutRobots.dtd b/application/basilisk/locales/en-US/chrome/browser/aboutRobots.dtd deleted file mode 100644 index 23447add1..000000000 --- a/application/basilisk/locales/en-US/chrome/browser/aboutRobots.dtd +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/application/basilisk/locales/jar.mn b/application/basilisk/locales/jar.mn index dfa6d4e00..1a9b7f315 100644 --- a/application/basilisk/locales/jar.mn +++ b/application/basilisk/locales/jar.mn @@ -11,7 +11,6 @@ locale/browser/aboutDialog.dtd (%chrome/browser/aboutDialog.dtd) locale/browser/aboutPrivateBrowsing.dtd (%chrome/browser/aboutPrivateBrowsing.dtd) locale/browser/aboutPrivateBrowsing.properties (%chrome/browser/aboutPrivateBrowsing.properties) - locale/browser/aboutRobots.dtd (%chrome/browser/aboutRobots.dtd) locale/browser/aboutHome.dtd (%chrome/browser/aboutHome.dtd) locale/browser/accounts.properties (%chrome/browser/accounts.properties) #ifdef MOZ_SERVICES_HEALTHREPORT diff --git a/application/basilisk/modules/ProcessHangMonitor.jsm b/application/basilisk/modules/ProcessHangMonitor.jsm index e048f5b40..b1f6f2a97 100644 --- a/application/basilisk/modules/ProcessHangMonitor.jsm +++ b/application/basilisk/modules/ProcessHangMonitor.jsm @@ -316,7 +316,7 @@ var ProcessHangMonitor = { nb.appendNotification(bundle.getString("processHang.label"), "process-hang", - "chrome://browser/content/aboutRobots-icon.png", + "chrome://browser/skin/slowStartup-16.png", nb.PRIORITY_WARNING_HIGH, buttons); }, diff --git a/application/palemoon/base/content/aboutRobots-icon.png b/application/palemoon/base/content/aboutRobots-icon.png deleted file mode 100644 index 1c4899aaf..000000000 Binary files a/application/palemoon/base/content/aboutRobots-icon.png and /dev/null differ diff --git a/application/palemoon/base/content/aboutRobots-widget-left.png b/application/palemoon/base/content/aboutRobots-widget-left.png deleted file mode 100644 index 3a1e48d5f..000000000 Binary files a/application/palemoon/base/content/aboutRobots-widget-left.png and /dev/null differ diff --git a/application/palemoon/base/content/aboutRobots.xhtml b/application/palemoon/base/content/aboutRobots.xhtml deleted file mode 100644 index 23fe3ba17..000000000 --- a/application/palemoon/base/content/aboutRobots.xhtml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - %htmlDTD; - - %netErrorDTD; - - %globalDTD; - - %aboutrobotsDTD; -]> - - - - &robots.pagetitle; - - - - - - - - - - - -
- - -
-

&robots.errorTitleText;

-
- - -
- - -
-

&robots.errorShortDescText;

-
- - -
-
    -
  • &robots.errorLongDesc1;
    • -
  • &robots.errorLongDesc2;
    • -
  • &robots.errorLongDesc3;
    • -
  • &robots.errorLongDesc4;
    • -
-
- - -
-

&robots.errorTrailerDescText;

-
- -
- - - - - - -
- - - diff --git a/application/palemoon/base/jar.mn b/application/palemoon/base/jar.mn index 8931c0260..735b6d0cf 100644 --- a/application/palemoon/base/jar.mn +++ b/application/palemoon/base/jar.mn @@ -18,9 +18,6 @@ browser.jar: * content/browser/aboutDialog.xul (content/aboutDialog.xul) * content/browser/aboutDialog.js (content/aboutDialog.js) content/browser/aboutDialog.css (content/aboutDialog.css) - content/browser/aboutRobots.xhtml (content/aboutRobots.xhtml) - content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) - content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) content/browser/autorecovery.js (content/autorecovery.js) content/browser/autorecovery.xul (content/autorecovery.xul) * content/browser/browser.css (content/browser.css) diff --git a/application/palemoon/components/BrowserComponents.manifest b/application/palemoon/components/BrowserComponents.manifest index b7f054eab..0ff14d066 100644 --- a/application/palemoon/components/BrowserComponents.manifest +++ b/application/palemoon/components/BrowserComponents.manifest @@ -10,7 +10,6 @@ contract @mozilla.org/network/protocol/about;1?what=palemoon {8cc51368-6aa0-43e8 contract @mozilla.org/network/protocol/about;1?what=permissions {8cc51368-6aa0-43e8-b762-bde9b9fd828c} contract @mozilla.org/network/protocol/about;1?what=privatebrowsing {8cc51368-6aa0-43e8-b762-bde9b9fd828c} contract @mozilla.org/network/protocol/about;1?what=rights {8cc51368-6aa0-43e8-b762-bde9b9fd828c} -contract @mozilla.org/network/protocol/about;1?what=robots {8cc51368-6aa0-43e8-b762-bde9b9fd828c} contract @mozilla.org/network/protocol/about;1?what=sessionrestore {8cc51368-6aa0-43e8-b762-bde9b9fd828c} #ifdef MOZ_SERVICES_SYNC contract @mozilla.org/network/protocol/about;1?what=sync-progress {8cc51368-6aa0-43e8-b762-bde9b9fd828c} diff --git a/application/palemoon/components/nsAboutRedirector.js b/application/palemoon/components/nsAboutRedirector.js index 9c7d7953f..4d99a78f5 100644 --- a/application/palemoon/components/nsAboutRedirector.js +++ b/application/palemoon/components/nsAboutRedirector.js @@ -61,10 +61,6 @@ AboutRedirector.prototype = { url: "chrome://global/content/aboutRights.xhtml", flags: (URI_SAFE_FOR_UNTRUSTED_CONTENT | MAKE_LINKABLE | ALLOW_SCRIPT) }, - "robots": { - url: "chrome://browser/content/aboutRobots.xhtml", - flags: (URI_SAFE_FOR_UNTRUSTED_CONTENT | ALLOW_SCRIPT | HIDE_FROM_ABOUTABOUT) - }, "sessionrestore": { url: "chrome://browser/content/aboutSessionRestore.xhtml", flags: ALLOW_SCRIPT diff --git a/application/palemoon/locales/en-US/chrome/browser/aboutRobots.dtd b/application/palemoon/locales/en-US/chrome/browser/aboutRobots.dtd deleted file mode 100644 index 139603d8d..000000000 --- a/application/palemoon/locales/en-US/chrome/browser/aboutRobots.dtd +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/application/palemoon/locales/jar.mn b/application/palemoon/locales/jar.mn index 0fc7f2c9b..5fcee246e 100644 --- a/application/palemoon/locales/jar.mn +++ b/application/palemoon/locales/jar.mn @@ -9,7 +9,6 @@ locale/browser/aboutCertError.dtd (%chrome/browser/aboutCertError.dtd) locale/browser/aboutDialog.dtd (%chrome/browser/aboutDialog.dtd) locale/browser/aboutPrivateBrowsing.dtd (%chrome/browser/aboutPrivateBrowsing.dtd) - locale/browser/aboutRobots.dtd (%chrome/browser/aboutRobots.dtd) * locale/browser/aboutHome.dtd (%chrome/browser/aboutHome.dtd) locale/browser/aboutSessionRestore.dtd (%chrome/browser/aboutSessionRestore.dtd) #ifdef MOZ_SERVICES_SYNC -- cgit v1.2.3