Issue 3515 - Use fetch() API instead XMLHttpRequest (Platform)

options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 77 matching lines @@
       {
         NotificationStorage.toggleIgnoreCategory("*");
         return this.get();
       }
     });
   }
   else
     document.getElementById("shouldShowNotificationsContainer").hidden = true;
 
   ext.onMessage.addListener(onMessage);
+  ext.backgroundPage.sendMessage({
+    type: "app.listen",
+    filter: ["addSubscription"]
+  });
 
   // Load recommended subscriptions
   loadRecommendations();
 
   // Show user's filters
   reloadFilters();
 }
 $(loadOptions);
 
 function onMessage(msg)
 {
-  if (msg.type == "add-subscription")
-    startSubscriptionSelection(msg.title, msg.url);
+  if (msg.type == "app.listen")
+  {
+    if (msg.action == "addSubscription")
+    {
+      var subscription = msg.args[0];
+      startSubscriptionSelection(subscription.title, subscription.url);
+    }
+  }
   else if (msg.type == "focus-section")
   {
     var tabs = document.getElementsByClassName("ui-tabs-panel");
     for (var i = 0; i < tabs.length; i++)
     {
       var found = tabs[i].querySelector("[data-section='" + msg.section + "']");
       if (!found)
         continue;
 
       var previous = document.getElementsByClassName("focused");
@@ skipping 78 matching lines @@
       var matchCount = 0;
 
       var list = document.getElementById("subscriptionSelector");
       var doc = new DOMParser().parseFromString(text, "application/xml");
       var elements = doc.documentElement.getElementsByTagName("subscription");
 
       for (var i = 0; i < elements.length; i++)
       {
         var element = elements[i];
         var option = new Option();
-        option.text = element.getAttribute("title") + " (" + element.getAttribute("specialization") + ")";

[kzar, 2016/01/17 17:14:06]

Nit: Mind fixing the long lines here as well while at it?

[Sebastian Noack, 2016/01/19 14:58:10]

Done.

+        option.text = element.getAttribute("title") + " (" +
+                      element.getAttribute("specialization") + ")";
         option._data = {
           title: element.getAttribute("title"),
           url: element.getAttribute("url"),
           homepage: element.getAttribute("homepage")
         };
 
-        var prefix = Utils.checkLocalePrefixMatch(element.getAttribute("prefixes"));
+        var prefixes = element.getAttribute("prefixes");
+        var prefix = Utils.checkLocalePrefixMatch(prefixes);
         if (prefix)
         {
           option.style.fontWeight = "bold";
           option.style.backgroundColor = "#E0FFE0";
           option.style.color = "#000000";
           if (!selectedPrefix || selectedPrefix.length < prefix.length)
           {
             selectedIndex = i;
             selectedPrefix = prefix;
             matchCount = 1;
@@ skipping 10 matching lines @@
             {
               selectedIndex = i;
               selectedPrefix = prefix;
             }
           }
         }
         list.appendChild(option);
       }
 
       var option = new Option();
-      option.text = i18n.getMessage("filters_addSubscriptionOther_label") + "\u2026";
+      var label = i18n.getMessage("filters_addSubscriptionOther_label");
+      option.text = label + "\u2026";
       option._data = null;
       list.appendChild(option);
 
       list.selectedIndex = selectedIndex;
 
       if (delayedSubscriptionSelection)
         startSubscriptionSelection.apply(null, delayedSubscriptionSelection);
     });
 }
 
@@ skipping 428 matching lines @@
       links[i].href = arguments[i + 1];
       links[i].setAttribute("target", "_blank");
     }
     else if (typeof arguments[i + 1] == "function")
     {
       links[i].href = "javascript:void(0);";
       links[i].addEventListener("click", arguments[i + 1], false);
     }
   }
 }