Merge pull request #10 from cloudoptlab/feat/1.4.1/white-list-ads-feature

Feat/1.4.1/white list ads feature

Author: T-baby

js/cloudopt-adblock.js

@@ -28,15 +28,17 @@ cloudopt.adblock = (function(cloudopt) {
 
     function getConfig() {
         var cloudoptConfig = cloudopt.config.get();
+
         var configuration = {
             filters: [101],
-            whitelist: cloudoptConfig.whiteList.slice(),
+            whitelist: cloudoptConfig.whitelistAds.slice(),
             rules: cloudoptConfig.customRule,
             filtersMetadataUrl: 'https://cdn.cloudopt.net/filters/chromium/filters.json',
             filterRulesUrl: 'https://cdn.cloudopt.net/filters/chromium/{filter_id}.txt'
         };
 
         configuration.whitelist[configuration.whitelist.length] = "*.cloudopt.net";
+
         if (cloudoptConfig.safePrivacy) {
             configuration.filters[configuration.filters.length] = 3;
             //configuration.filters[configuration.filters.length] = 4;
@@ -150,8 +152,8 @@ cloudopt.adblock = (function(cloudopt) {
                     cloudopt.store.get("firstAutoAddWhiteList", function(value) {
                         if (value == undefined || value == null) {
                             cloudopt.store.set("firstAutoAddWhiteList", "true");
-                            cloudopt.config.autoAddWhiteList(function() {
-                                cloudopt.logger.debug('Add a white list.');
+                            cloudopt.config.autoAddWhiteListAds(function() {
+                                cloudopt.logger.debug('Add a whiteList-ads.');
                                 refreshConfig();
                             });
                         }

js/cloudopt-core.js

@@ -715,11 +715,11 @@ cloudopt.config = (function (cloudopt) {
     }
 
     /**
-     * Add whiteList for config
+     * Add whiteList-ads for config
      *
      * @param callback    callback when succeed
      */
-    function autoAddWhiteList(callback) {
+    function autoAddWhiteListAds(callback) {
         var fileName = "/whitelist/";
         switch (cloudopt.getLanguage()) {
             case "zh-CN":
@@ -730,15 +730,13 @@ cloudopt.config = (function (cloudopt) {
         $.getJSON(fileName, function (data) {
             var config = cloudopt.config.get();
             $.each(data, function (index, obj) {
-                config.whiteList[config.whiteList.length] = obj.host;
+                config.whiteListAds[config.whiteListAds.length] = obj.host;
             });
             cloudopt.config.set(config, function () {
                 cloudopt.message.send("refresh-config");
                 callback();
             });
         });
-
-
     }
 
     /**
@@ -802,7 +800,7 @@ cloudopt.config = (function (cloudopt) {
         set: set,
         refresh: refresh,
         activateEquipment: activateEquipment,
-        autoAddWhiteList: autoAddWhiteList,
+        autoAddWhiteListAds: autoAddWhiteListAds,
         fastAddWhiteList: fastAddWhiteList,
         fastAddWhiteListAds: fastAddWhiteListAds,
         fastAddBlackList: fastAddBlackList,
@@ -980,6 +978,9 @@ cloudopt.grade = (function (cloudopt) {
                     if (config.whiteList.indexOf(item.host) > -1 && item.safe < 0) {
                         item.safe = 0;
                     }
+                    if (config.whiteListAds.indexOf(item.host) > -1 && item.safe < 0) {
+                        item.safe = 0;
+                    }
                     /*if in black list*/
                     if (config.blackList.some(e => e === item.host)) {
                         item.safe = -1;
@@ -1010,6 +1011,9 @@ cloudopt.grade = (function (cloudopt) {
                     if (config.whiteList.indexOf(result.host) > -1 && result.safe == -1) {
                         result.safe = 0;
                     }
+                    if (config.whiteListAds.indexOf(result.host) > -1 && result.safe == -1) {
+                        result.safe = 0;
+                    }
                     if (data.result.host != "") {
                         result.date = new Date().getTime();
                         cloudopt.store.set(website, result);
@@ -1062,7 +1066,7 @@ cloudopt.init = (function (cloudopt) {
                 url = tabArray[tabArray.length - 1].url;
                 host = cloudopt.utils.getHost(url);
                 // cloudopt.browserIconChange.normal();
-                if (tabArray[tabArray.length - 1].url.indexOf("file://") == 0 || tabArray[tabArray.length - 1].url.indexOf("chrome-extension://") == 0 || tabArray[tabArray.length - 1].url.indexOf("chrome://") == 0 || cloudopt.config.get().whiteList.indexOf(host) > -1) {
+                if (tabArray[tabArray.length - 1].url.indexOf("file://") == 0 || tabArray[tabArray.length - 1].url.indexOf("chrome-extension://") == 0 || tabArray[tabArray.length - 1].url.indexOf("chrome://") == 0 || cloudopt.config.get().whiteList.indexOf(host) > -1 || cloudopt.config.get().whiteListAds.indexOf(host) > -1) {
                     cloudopt.browserIconChange.gray();
                     return;
                 }

js/cloudopt-option.js

@@ -143,7 +143,6 @@
       $("#whiteListAdsAdd").click(function() {
         const text = $("#whiteListAdsInput").val();
         const config = cloudopt.config.get();
-        console.log(config, 'config')
         cloudopt.config.fastAddWhiteListAds(cloudopt.utils.getHost(text))(type => {
             if (type === 'optionTipsDontDuplicate' || type === 'optionTipsInputUrlisNull' || type === 'optionTipsInputUrlisError') {
                 new Noty({