Issue 2374 - Implemented Tweaks section in options page

messageResponder.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 16 matching lines @@
   var defaultMatcher = require("matcher").defaultMatcher;
   var CSSRules = require("cssRules").CSSRules;
   var NotificationStorage = require("notification").Notification;
 
   var filterClasses = require("filterClasses");
   var Filter = filterClasses.Filter;
   var BlockingFilter = filterClasses.BlockingFilter;
   var RegExpFilter = filterClasses.RegExpFilter;
   var Synchronizer = require("synchronizer").Synchronizer;
 
+  var info = require("info");
   var subscriptionClasses = require("subscriptionClasses");
   var Subscription = subscriptionClasses.Subscription;
   var DownloadableSubscription = subscriptionClasses.DownloadableSubscription;
   var SpecialSubscription = subscriptionClasses.SpecialSubscription;
 
   function convertObject(keys, obj)
   {
     var result = {};
     for (var i = 0; i < keys.length; i++)
       result[keys[i]] = obj[keys[i]];
@@ skipping 93 matching lines @@
         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");
+          var subscriptionInit = require("subscriptionInit");
           callback({
-            seenDataCorruption: "seenDataCorruption" in global ? global.seenDataCorruption : false,
-            filterlistsReinitialized: "filterlistsReinitialized" in global ? global.filterlistsReinitialized : false,
+            filterlistsReinitialized: subscriptionInit ? subscriptionInit.reinitialized : 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")
         {
           var bidiDir;
           if ("chromeRegistry" in Utils)
             bidiDir = Utils.chromeRegistry.isLocaleRTL("adblockplus") ? "rtl" : "ltr";
           else
             bidiDir = ext.i18n.getMessage("@@bidi_dir");
 
           callback({locale: Utils.appLocale, bidiDir: bidiDir});
         }
         else if (message.what == "addonVersion")
         {
-          callback(require("info").addonVersion);
+          callback(info.addonVersion);
         }
         else if (message.what == "features")

[saroyanm, 2016/03/11 14:55:58]

Why can't we have "safariContentBlocker" as what and return the boolean value ? 
Currently we call it features and request only 1 feature.

[Thomas Greiner, 2016/03/15 15:39:26]

I'd like to avoid creating values for similar information so even though we
currently only have one "feature" that's included in here, it allows us to reuse
this message for other information.

         {
           callback({
+            devToolsPanel: info.platform == "chromium",
             safariContentBlocker: "safari" in global
                 && "extension" in global.safari
                 && "setContentBlocker" in global.safari.extension
           });
         }
         else
           callback(null);
         break;
       case "app.listen":
         if (message.filter)
           listenerFilters.app = message.filter;
         else
           delete listenerFilters.app;
         break;
       case "app.open":
         if (message.what == "options")
           ext.showOptions();
         break;
       case "filters.add":
-        var filter = Filter.fromText(message.text);
         var result = require("filterValidation").parseFilter(message.text);
+        var errors = [];
         if (result.error)
-          sendMessage("app", "error", [result.error.toString()], sender.page);
+          errors.push(result.error.toString());
         else if (result.filter)
           FilterStorage.addFilter(result.filter);
+        callback(errors);
         break;
       case "filters.blocked":
-        var filter = defaultMatcher.matchesAny(message.url, message.requestType,
-          message.docDomain, message.thirdParty);
+        var filter = defaultMatcher.matchesAny(message.url,
+          RegExpFilter.typeMap[message.requestType], message.docDomain,
+          message.thirdParty);
         callback(filter instanceof BlockingFilter);
         break;
       case "filters.get":
         if (message.what == "cssproperties")
         {
           var filters = [];
           var checkWhitelisted = require("whitelisting").checkWhitelisted;
 
           if (!checkWhitelisted(sender.page, sender.frame,
                                 RegExpFilter.typeMap.DOCUMENT |
@@ skipping 25 matching lines @@
       case "filters.importRaw":
         var result = require("filterValidation").parseFilters(message.text);
         var errors = [];
         for (var i = 0; i < result.errors.length; i++)
         {
           var error = result.errors[i];
           if (error.type != "unexpected-filter-list-header")
             errors.push(error.toString());
         }
 
+        callback(errors);
         if (errors.length > 0)
-        {
-          sendMessage("app", "error", errors, sender.page);
           return;
-        }
 
         var seenFilter = Object.create(null);
         for (var i = 0; i < result.filters.length; i++)
         {
           var filter = result.filters[i];
           FilterStorage.addFilter(filter);
           seenFilter[filter.text] = null;
         }
 
         for (var i = 0; i < FilterStorage.subscriptions.length; i++)
@@ skipping 119 matching lines @@
           if (subscription instanceof DownloadableSubscription)
             Synchronizer.execute(subscription, true);
         }
         break;
       case "subscriptions.isDownloading":
         callback(Synchronizer.isExecuting(message.url));
         break;
     }
   });
 })(this);