Remove Social API leftovers

author: Gaming4JC <g4jc@hyperbola.info> 2019-05-12 11:09:12 -0400
committer: Gaming4JC <g4jc@hyperbola.info> 2019-05-12 11:09:12 -0400
commit: a1c5dc1fad10b93c5935ddf6ea2bdf26803755fb (patch)
tree: 6b62015b68c791ade2faa1e5d00c1538987129e6
parent: 817f134eb4434c19dd3cfc3f3502046de480d49a (diff)
download: iceweasel-uxp-a1c5dc1fad10b93c5935ddf6ea2bdf26803755fb.tar.gz
3 files changed, 0 insertions, 154 deletions
diff --git a/base/content/aboutSocialError.xhtml b/base/content/aboutSocialError.xhtml
deleted file mode 100644
index 94a4e3d..0000000
--- a/base/content/aboutSocialError.xhtml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!DOCTYPE html [
-  <!ENTITY % htmlDTD
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "DTD/xhtml1-strict.dtd">
-  %htmlDTD;
-  <!ENTITY % netErrorDTD SYSTEM "chrome://global/locale/netError.dtd">
-  %netErrorDTD;
-]>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>&loadError.label;</title>
-    <link rel="stylesheet" href="chrome://browser/skin/aboutNetError.css" type="text/css" media="all" />
-    <link rel="stylesheet" type="text/css" media="all" href="chrome://browser/skin/aboutSocialError.css"/>
-    <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning-16.png"/>
-  </head>
-
-  <body>
-    <div id="errorPageContainer">
-
-      <!-- Error Title -->
-      <div id="errorTitle">
-        <p id="errorShortDescText" >foo</p>
-      </div>
-
-    <div id="button-box">
-      <button id="btnTryAgain" onclick="tryAgainButton()"/>
-    </div>
-    </div>
-  </body>
-
-  <script type="text/javascript;version=1.8"><![CDATA[
-    const Cu = Components.utils;
-
-    Cu.import("resource://gre/modules/Services.jsm");
-    Cu.import("resource:///modules/Social.jsm");
-
-    let config = {
-      tryAgainCallback: reloadProvider
-    }
-
-    function parseQueryString() {
-      let searchParams = new URLSearchParams(document.documentURI.split("?")[1]);
-      let mode = searchParams.get("mode");
-      config.origin = searchParams.get("origin");
-      let encodedURL = searchParams.get("url");
-      let url = decodeURIComponent(encodedURL);
-      // directory does not have origin set, in that case use the url origin for
-      // the error message.
-      if (!config.origin) {
-        let URI = Services.io.newURI(url, null, null);
-        config.origin =
-          Services.scriptSecurityManager.createCodebasePrincipal(URI, {}).origin;
-      }
-
-      switch (mode) {
-        case "compactInfo":
-          document.getElementById("btnTryAgain").style.display = 'none';
-          break;
-        case "tryAgainOnly":
-          //intentional fall-through
-        case "tryAgain":
-          config.tryAgainCallback = loadQueryURL;
-          config.queryURL = url;
-          break;
-        default:
-          break;
-      }
-    }
-
-    function setUpStrings() {
-      let brandBundle = Services.strings.createBundle("chrome://branding/locale/brand.properties");
-      let browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
-
-      let productName = brandBundle.GetStringFromName("brandShortName");
-      let provider = Social._getProviderFromOrigin(config.origin);
-      let providerName = provider ? provider.name : config.origin;
-
-      // Sets up the error message
-      let msg = browserBundle.formatStringFromName("social.error.message", [productName, providerName], 2);
-      document.getElementById("errorShortDescText").textContent = msg;
-
-      // Sets up the buttons' labels and accesskeys
-      let btnTryAgain = document.getElementById("btnTryAgain");
-      btnTryAgain.textContent = browserBundle.GetStringFromName("social.error.tryAgain.label");
-      btnTryAgain.accessKey = browserBundle.GetStringFromName("social.error.tryAgain.accesskey");
-    }
-
-    function tryAgainButton() {
-      config.tryAgainCallback();
-    }
-
-    function loadQueryURL() {
-      window.location.href = config.queryURL;
-    }
-
-    function reloadProvider() {
-      let provider = Social._getProviderFromOrigin(config.origin);
-      provider.reload();
-    }
-
-    parseQueryString();
-    setUpStrings();
-  ]]></script>
-</html>
diff --git a/branding/iceweasel/pref/iceweasel-uxp-branding.js b/branding/iceweasel/pref/iceweasel-uxp-branding.js
index f8beac5..4d97887 100644
--- a/branding/iceweasel/pref/iceweasel-uxp-branding.js
+++ b/branding/iceweasel/pref/iceweasel-uxp-branding.js
@@ -165,13 +165,10 @@ pref("security.family_safety.mode", 0);
 // https://hg.mozilla.org/releases/mozilla-release/rev/d9659c22b3c5
 // https://bugzilla.mozilla.org/show_bug.cgi?id=1298883
 pref("security.enterprise_roots.enabled", false);
-pref("social.enabled", false);
-pref("social.remote-install.enabled", false);
 pref("datareporting.healthreport.uploadEnabled", false);
 pref("datareporting.healthreport.about.reportUrl", "127.0.0.1");
 pref("datareporting.healthreport.documentServerURI", "127.0.0.1");
 pref("healthreport.uploadEnabled", false);
-pref("social.toast-notifications.enabled", false);
 pref("datareporting.policy.dataSubmissionEnabled", false);
 pref("datareporting.healthreport.service.enabled", false);
 pref("browser.slowStartup.notificationDisabled", true);
diff --git a/themes/shared/aboutSocialError.css b/themes/shared/aboutSocialError.css
deleted file mode 100644
index f5a922f..0000000
--- a/themes/shared/aboutSocialError.css
+++ /dev/null
@@ -1,40 +0,0 @@
-@import url("chrome://global/skin/in-content/common.css");
-
-#errorPageContainer {
-  min-width: 50%;
-}
-
-#errorTitle {
-  background: url("chrome://global/skin/icons/info.svg") left 0 no-repeat;
-  background-size: 2em;
-  padding-inline-start: 3em;
-}
-
-#button-box {
-  text-align: center;
-  width: 75%;
-  margin: 0 auto;
-}
-
-button {
-  width: auto !important;
-  min-width: 150px;
-}
-
-@media all and (max-width: 300px) {
-  body {
-    padding: 0px 10px;
-  }
-  #errorPageContainer {
-    min-width: 100%;
-  }
-  #errorTitle {
-    background: none;
-    padding-inline-start: 0 !important;
-  }
-  button {
-    width: auto !important;
-    min-width: auto !important;
-  }
-}
-
author	Gaming4JC <g4jc@hyperbola.info>	2019-05-12 11:09:12 -0400
committer	Gaming4JC <g4jc@hyperbola.info>	2019-05-12 11:09:12 -0400
commit	a1c5dc1fad10b93c5935ddf6ea2bdf26803755fb (patch)
tree	6b62015b68c791ade2faa1e5d00c1538987129e6
parent	817f134eb4434c19dd3cfc3f3502046de480d49a (diff)
download	iceweasel-uxp-a1c5dc1fad10b93c5935ddf6ea2bdf26803755fb.tar.gz