Issue 2801 - Create 'Whitelisted websites' screen and add link to 'Ad blocking' screen

adblockplus/Api.jsm

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 178 matching lines @@
   {
     let whitelistedWebsites = [];
     for (let i = 0; i < FilterStorage.subscriptions.length; i++)
     {
       let subscription = FilterStorage.subscriptions[i];
       if (subscription.url && subscription.url.startsWith("~user~") && subscription.filters)
       {
         for (let j = 0; j < subscription.filters.length; j++)
         {
           let filter = subscription.filters[j];
-          let whitelistMatch = filter.text ? filter.text.match(/@@\|\|(.*)\^\$document/) : null;

[Thomas Greiner, 2017/09/15 15:08:06]

We're using a slightly different regular expression for the extension's options
page (see https://hg.adblockplus.org/adblockpluschrome/file/tip/options.js#l75)
so I'd recommend using that one instead to avoid any issues and to ensure
consistent behavior.

[diegocarloslima, 2017/09/18 14:16:36]

Acknowledged.

+          let whitelistMatch = filter.text ? filter.text.match(/^@@\|\|([^/:]+)\^\$document$/) : null;
           if(whitelistMatch)
           {
             whitelistedWebsites.push({"url": whitelistMatch[1]})
           }
         }
       }
     }
     return whitelistedWebsites;
   },
   isWebsiteWhitelisted: function(url, host)
@@ skipping 97 matching lines @@
           {
             this.whitelistWebsite(data["url"], data["host"], data["whitelisted"]);
             return {"success": true};
           }
           break;
       }
       return {"success": false, "error": "malformed request"};
     }).bind(this), "AdblockPlus:Api");
   }
 };