Issue 1528 - Implemented backend for general tab of new options page

messageResponder.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 26 matching lines @@
   var SpecialSubscription = subscriptionClasses.SpecialSubscription;
 
   function convertObject(keys, obj)
   {
     var result = {};
     for (var i = 0; i < keys.length; i++)
       result[keys[i]] = obj[keys[i]];
     return result;
   }
 
-  var convertSubscription = convertObject.bind(null, ["disabled", "downloadStatus",
-    "homepage", "lastSuccess", "title", "url"]);
+  var convertSubscription = convertObject.bind(null, ["disabled",
+    "downloadStatus", "homepage", "lastSuccess", "title", "url"]);
   var convertFilter = convertObject.bind(null, ["text"]);
 
   var changeListeners = null;
   var messageTypes = {
     "app": "app.listen",
     "filter": "filters.listen",
     "subscription": "subscriptions.listen"
   };
 
   function onFilterChange(action)
@@ skipping 61 matching lines @@
         {
           listenerFilters = Object.create(null);
           changeListeners.set(sender.page, listenerFilters);
         }
         break;
     }
 
     switch (message.type)
     {
       case "add-subscription":
-        var subscription = Subscription.fromURL(message.url);
-        subscription.title = message.title;
-        onFilterChange("addSubscription", subscription);
+        ext.showOptions(function()
+        {
+          var subscription = Subscription.fromURL(message.url);
+          subscription.title = message.title;
+          onFilterChange("addSubscription", subscription);
+        });
         break;
       case "app.get":
         if (message.what == "issues")
         {
           var info = require("info");
           callback({
             seenDataCorruption: "seenDataCorruption" in global ? global.seenDataCorruption : false,
             filterlistsReinitialized: "filterlistsReinitialized" in global ? global.filterlistsReinitialized : false,
             legacySafariVersion: (info.platform == "safari" && (
                 Services.vc.compare(info.platformVersion, "6.0") < 0 ||   // beforeload breaks websites in Safari 5
                 Services.vc.compare(info.platformVersion, "6.1") == 0 ||  // extensions are broken in 6.1 and 7.0
                 Services.vc.compare(info.platformVersion, "7.0") == 0))
           });
         }
         else if (message.what == "doclink")
           callback(Utils.getDocLink(message.link));
         else if (message.what == "localeInfo")
         {
           callback({
             locale: Utils.appLocale,
             isRTL: Utils.chromeRegistry.isLocaleRTL("adblockplus")
           });
         }
+        else if (message.what == "addonVersion")
+        {
+          callback(require("info").addonVersion);
+        }
         else
           callback(null);
         break;
       case "app.listen":
         if (message.filter)
           listenerFilters.app = message.filter;
         else
           delete listenerFilters.app;
         break;
       case "app.open":
@@ skipping 91 matching lines @@
           subscription.title = message.title;
           subscription.homepage = message.homepage;
           FilterStorage.addSubscription(subscription);
           if (!subscription.lastDownload)
             Synchronizer.execute(subscription);
         }
         break;
     }
   });
 })(this);