From 4483361b05e94375f17ac7d5f1bdef08751396cb Mon Sep 17 00:00:00 2001
From: Albirew <rad1cal_edward@yahoo.fr>
Date: Mon, 22 Jun 2015 15:22:27 +0200
Subject: [PATCH] Removed yahoo and coral CDN

removed yahoo since it now uses bing and removed coral CDN since it's
down almost everytime
---
 README.md                           | 11 ++++++++---
 content/netError.xhtml              |  8 --------
 content/resurrect-select-mirror.xul |  8 --------
 content/resurrect.js                | 20 --------------------
 4 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index dcba4fd..0995001 100644
--- a/README.md
+++ b/README.md
@@ -30,13 +30,18 @@ Hit back and try another one!
    * With the keyboard: press `Ctrl-Shift-U`
    * Directly in the net error ("Firefox could not load this page...") page.
 
+# PLANNED
+ * sanitize remote content
+ * removeEventListener()
+ * repair gigablast
+   
 # Changelog
 
- * Version 2.1.1 (May xx, 2015)
+ * Version 2.1.1 (June 22, 2015)
    * Requests synchronous
    * Typo in some languages for Gigablast
-   * PLANNED: sanitize remote content
-   * PLANNED: removeEventListener()
+   * removed yahoo cache (yahoo uses bing cache now)
+   * removed coral CDN (almost alsways dead)
  * Version 2.1 (Sep 19, 2013)
    * Firefox 22+ compatibility
    * Added isup.me provider
diff --git a/content/netError.xhtml b/content/netError.xhtml
index 0ef6836..95451a2 100644
--- a/content/netError.xhtml
+++ b/content/netError.xhtml
@@ -15,10 +15,6 @@
         <img src='chrome://resurrect/skin/tb-icon-small.png' />
         &resurrect.thispage;
       </legend>
-      <xul:button
-        value='coralcdn' label=' &resurrect.coralcdn;'
-        image='chrome://resurrect/skin/cacheicons/coralcdn.png'
-      />
       <xul:button
         value='google' label=' &resurrect.google;'
         image='chrome://resurrect/skin/cacheicons/google.png'
@@ -27,10 +23,6 @@
         value='googletext' label=' &resurrect.google;&resurrect.textonly;'
         image='chrome://resurrect/skin/cacheicons/google.png'
       />
-      <xul:button
-        value='yahoo' label=' &resurrect.yahoo;'
-        image='chrome://resurrect/skin/cacheicons/yahoo.png'
-      />
       <xul:button
         value='archive' label=' &resurrect.archive;'
         image='chrome://resurrect/skin/cacheicons/archive.png'
diff --git a/content/resurrect-select-mirror.xul b/content/resurrect-select-mirror.xul
index a4332db..7736906 100644
--- a/content/resurrect-select-mirror.xul
+++ b/content/resurrect-select-mirror.xul
@@ -32,10 +32,6 @@ window.addEventListener('load', resurrect.loadTarget, false);
   <groupbox id='resurrect' onclick='resurrect.clickedXul(event);'>
     <caption label='&resurrect.fromMirror;' />
 
-    <xul:button
-      value='coralcdn' label=' &resurrect.coralcdn;'
-      image='chrome://resurrect/skin/cacheicons/coralcdn.png'
-    />
     <xul:button
       value='google' label=' &resurrect.google;'
       image='chrome://resurrect/skin/cacheicons/google.png'
@@ -44,10 +40,6 @@ window.addEventListener('load', resurrect.loadTarget, false);
       value='googletext' label=' &resurrect.google;&resurrect.textonly;'
       image='chrome://resurrect/skin/cacheicons/google.png'
     />
-    <xul:button
-      value='yahoo' label=' &resurrect.yahoo;'
-      image='chrome://resurrect/skin/cacheicons/yahoo.png'
-    />
     <xul:button
       value='archive' label=' &resurrect.archive;'
       image='chrome://resurrect/skin/cacheicons/archive.png'
diff --git a/content/resurrect.js b/content/resurrect.js
index 2aed836..596844c 100644
--- a/content/resurrect.js
+++ b/content/resurrect.js
@@ -154,10 +154,6 @@ var resurrect={
     var encUrl=encodeURIComponent(rawUrl);
 
     switch (mirror) {
-    case 'coralcdn':
-      gotoUrl=rawUrl.substring(0, 8)+
-          rawUrl.substring(8).replace(/\//, '.nyud.net/');
-      break;
     case 'google':
       gotoUrl='http://www.google.com/search?q=cache:'+encUrl;
       break;
@@ -166,22 +162,6 @@ var resurrect={
       break;
     case 'archive':
       gotoUrl='http://wayback.archive.org/web/*/'+rawUrl;
-      break;
-    case 'yahoo':
-      var xhr=new XMLHttpRequest();
-      xhr.open('GET',
-          'http://api.search.yahoo.com/WebSearchService/V1/'+
-          'webSearch?appid=firefox-resurrect&query='+encUrl+'&results=1',
-          true);
-      xhr.send(null);
-
-      try {
-        var c=xhr.responseXML.getElementsByTagName('Cache');
-        gotoUrl=c[0].firstChild.textContent;
-      } catch (e ) {
-        gotoUrl='http://search.yahoo.com/search?p='+encUrl;
-      }
-
       break;
     case 'bing':
       var xhr=new XMLHttpRequest();