[Pkg-mozext-commits] [greasemonkey] 08/24: Remove unused checkCoralCache.js.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository greasemonkey.

commit 27c407e136cbf5e6807474080d61de3379f3d96f
Author: Anthony Lieuallen <arantius at gmail.com>
Date:   Sat May 23 11:16:29 2015 -0400

    Remove unused checkCoralCache.js.
---
 defaults/preferences/greasemonkey.js |  1 -
 modules/script.js                    |  8 --------
 modules/util.js                      |  3 +--
 modules/util/checkCoralCache.js      | 37 ------------------------------------
 4 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/defaults/preferences/greasemonkey.js b/defaults/preferences/greasemonkey.js
index 24f8c04..d571e0d 100644
--- a/defaults/preferences/greasemonkey.js
+++ b/defaults/preferences/greasemonkey.js
@@ -1,5 +1,4 @@
 pref("extensions.{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.description", "chrome://greasemonkey/locale/greasemonkey.properties");
-pref("extensions.greasemonkey.coralCacheWorks", true);
 pref("extensions.greasemonkey.dataIsGreaseable", false);
 pref("extensions.greasemonkey.enableScriptRefreshing", true);
 pref("extensions.greasemonkey.fileIsGreaseable", false);
diff --git a/modules/script.js b/modules/script.js
index 7057a11..55811c2 100644
--- a/modules/script.js
+++ b/modules/script.js
@@ -821,14 +821,6 @@ Script.prototype.checkForRemoteUpdate = function(aCallback, aForced) {
 
   var uri = GM_util.uriFromUrl(this.updateURL).clone();
 
-  // TODO: Consider restoring Coral cache usage.  We used to only apply it to
-  // us.o; applying globally means it will be inserted for localhost/intranet/
-  // etc. URLs which won't ever work.
-//  GM_util.checkCoralCache();
-//  if (GM_prefRoot.getValue("coralCacheWorks")) {
-//    uri.host += '.nyud.net';
-//  }
-
   var usedMeta = false;
   if (this._updateMetaStatus != 'fail') {
     uri.path = uri.path.replace('.user.js', '.meta.js');
diff --git a/modules/util.js b/modules/util.js
index 61ca95e..4b87152 100644
--- a/modules/util.js
+++ b/modules/util.js
@@ -25,7 +25,6 @@ var GM_util = {};
 // Do not edit below this line.  Use `util.sh` to auto-populate.
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'alert', 'resource://greasemonkey/util/alert.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'anonWrap', 'resource://greasemonkey/util/anonWrap.js');
-XPCOMUtils.defineLazyModuleGetter(GM_util, 'checkCoralCache', 'resource://greasemonkey/util/checkCoralCache.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'compareFirefoxVersion', 'resource://greasemonkey/util/compareFirefoxVersion.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'emptyEl', 'resource://greasemonkey/util/emptyEl.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'enqueueRemoveFile', 'resource://greasemonkey/util/enqueueRemoveFile.js');
@@ -61,7 +60,7 @@ XPCOMUtils.defineLazyModuleGetter(GM_util, 'sniffGrants', 'resource://greasemonk
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'timeout', 'resource://greasemonkey/util/timeout.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'uriFromUrl', 'resource://greasemonkey/util/uriFromUrl.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'uuid', 'resource://greasemonkey/util/uuid.js');
-XPCOMUtils.defineLazyModuleGetter(GM_util, 'windowIdForEvent', 'resource://greasemonkey/util/windowIdForEvent.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'windowId', 'resource://greasemonkey/util/windowId.js');
+XPCOMUtils.defineLazyModuleGetter(GM_util, 'windowIdForEvent', 'resource://greasemonkey/util/windowIdForEvent.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'windowIsClosed', 'resource://greasemonkey/util/windowIsClosed.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'writeToFile', 'resource://greasemonkey/util/writeToFile.js');
diff --git a/modules/util/checkCoralCache.js b/modules/util/checkCoralCache.js
deleted file mode 100644
index db9c989..0000000
--- a/modules/util/checkCoralCache.js
+++ /dev/null
@@ -1,37 +0,0 @@
-Components.utils.import('resource://greasemonkey/prefmanager.js');
-Components.utils.import('resource://greasemonkey/util.js');
-
-const EXPORTED_SYMBOLS = ['checkCoralCache'];
-
-const XMLHttpRequest = Components.Constructor(
-    '@mozilla.org/xmlextras/xmlhttprequest;1');
-
-var gCheckIsRunning = false;
-
-function checkCoralCache() {
-  if (GM_prefRoot.getValue('coralCacheWorks')) return true;
-
-  if (gCheckIsRunning) return false;
-
-  gCheckIsRunning = true;
-  var req = new XMLHttpRequest();
-  req.onerror = GM_util.hitch(null, onError, req);
-  req.onload = GM_util.hitch(null, onLoad, req);
-  req.open('get', 'http://www.greasespot.net.nyud.net/');
-  req.send();
-
-  return false;
-}
-
-function onError(aReq, aEvent) {
-  GM_prefRoot.setValue('coralCacheWorks', false);
-  gCheckIsRunning = false;
-}
-
-function onLoad(aReq, aEvent) {
-  if (200 !== aReq.status) return onError();
-  if (-1 == aReq.responseText.indexOf('Greasemonkey')) return onError();
-
-  GM_prefRoot.setValue('coralCacheWorks', true);
-  gCheckIsRunning = false;
-}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/greasemonkey.git