Merge branch 'ext-work'

1 files changed, 0 insertions, 72 deletions

diff --git a/toolkit/mozapps/extensions/content/blocklist.js b/toolkit/mozapps/extensions/content/blocklist.js
deleted file mode 100644
index 6d524e6ee..000000000
--- a/toolkit/mozapps/extensions/content/blocklist.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
-
-/* 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/. */
-
-"use strict";
-
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-var gArgs;
-
-function init() {
-  var hasHardBlocks = false;
-  var hasSoftBlocks = false;
-  gArgs = window.arguments[0].wrappedJSObject;
-
-  // NOTE: We use strings from the "updates.properties" bundleset to change the
-  // text on the "Cancel" button to "Restart Later". (bug 523784)
-  let bundle = Services.strings.
-              createBundle("chrome://mozapps/locale/update/updates.properties");
-  let cancelButton = document.documentElement.getButton("cancel");
-  cancelButton.setAttribute("label", bundle.GetStringFromName("restartLaterButton"));
-  cancelButton.setAttribute("accesskey",
-                            bundle.GetStringFromName("restartLaterButton.accesskey"));
-
-  var richlist = document.getElementById("addonList");
-  var list = gArgs.list;
-  list.sort(function(a, b) { return String.localeCompare(a.name, b.name); });
-  for (let listItem of list) {
-    let item = document.createElement("richlistitem");
-    item.setAttribute("name", listItem.name);
-    item.setAttribute("version", listItem.version);
-    item.setAttribute("icon", listItem.icon);
-    if (listItem.blocked) {
-      item.setAttribute("class", "hardBlockedAddon");
-      hasHardBlocks = true;
-    }
-    else {
-      item.setAttribute("class", "softBlockedAddon");
-      hasSoftBlocks = true;
-    }
-    richlist.appendChild(item);
-  }
-
-  if (hasHardBlocks && hasSoftBlocks)
-    document.getElementById("bothMessage").hidden = false;
-  else if (hasHardBlocks)
-    document.getElementById("hardBlockMessage").hidden = false;
-  else
-    document.getElementById("softBlockMessage").hidden = false;
-
-  var link = document.getElementById("moreInfo");
-  if (list.length == 1 && list[0].url) {
-    link.setAttribute("href", list[0].url);
-  }
-  else {
-    var url = Services.urlFormatter.formatURLPref("extensions.blocklist.detailsURL");
-    link.setAttribute("href", url);
-  }
-}
-
-function finish(shouldRestartNow) {
-  gArgs.restart = shouldRestartNow;
-  var list = gArgs.list;
-  var items = document.getElementById("addonList").childNodes;
-  for (let i = 0; i < list.length; i++) {
-    if (!list[i].blocked)
-      list[i].disable = items[i].checked;
-  }
-  return true;
-}