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

Feat/1.4.1/white list ads feature

Author: T-baby

_locales/en/messages.json

@@ -34,6 +34,9 @@
   "popupAddBlackList": {
     "message": "Add to cloud security blacklist"
   },
+  "popupAddWhiteListAds": {
+    "message": "Add to whitelist-ads"
+  },
   "popupCleanCache": {
     "message": "Clean up cache"
   },

_locales/ko/messages.json

@@ -37,6 +37,9 @@
   "popupAddBlackList": {
     "message": "구름블랙리스트에 추가"
   },
+  "popupAddWhiteListAds": {
+    "message": "요격 광고에 추가"
+  },
   "popupCleanCache": {
     "message": "캐시를 지우"
   },

_locales/zh_CN/messages.json

@@ -37,6 +37,9 @@
   "popupAddBlackList": {
     "message": "添加到云安全黑名单"
   },
+  "popupAddWhiteListAds": {
+    "message": "添加到广告拦截白名单"
+  },
   "popupCleanCache": {
     "message": "清理缓存"
   },

_locales/zh_TW/messages.json

@@ -37,6 +37,9 @@
   "popupAddBlackList": {
     "message": "添加到雲安全黑名單"
   },
+  "popupAddWhiteListAds": {
+    "message": "添加到廣告攔截白名單"
+  },
   "popupCleanCache": {
     "message": "清理緩存"
   },

js/cloudopt-option.js

@@ -130,9 +130,12 @@
                       theme: "mint",
                       timeout: 1000
                   }).show();
-                  refresh();
-                  cloudopt.message.send("refresh-config");
-                  $("#whiteListInput").val("");
+                  var config = cloudopt.config.get();
+                  cloudopt.config.set(config, function () {
+                      refresh();
+                      cloudopt.message.send("refresh-config");
+                      $("#whiteListInput").val("");   
+                  });
               }
           })
       });
@@ -156,9 +159,12 @@
                     theme: "mint",
                     timeout: 1000
                 }).show();
-                refresh();
-                cloudopt.message.send("refresh-config");
-                $("#whiteListAdsInput").val("");
+                var config = cloudopt.config.get();
+                cloudopt.config.set(config, function () {
+                    refresh();
+                    cloudopt.message.send("refresh-config");
+                    $("#whiteListAdsInput").val("");
+                });
             }
         })
     });
@@ -181,9 +187,12 @@
                       theme: "mint",
                       timeout: 1000
                   }).show();
-                  refresh();
-                  cloudopt.message.send("refresh-config");
-                  $("#blackListInput").val("");
+                  var config = cloudopt.config.get();
+                  cloudopt.config.set(config, function () {
+                      refresh();
+                      cloudopt.message.send("refresh-config");
+                      $("#blackListInput").val("");
+                  });
               }
           })
       });

js/cloudopt-popup.js

@@ -153,4 +153,19 @@ cloudopt.onFinish(function() {
         });
     })
 
+    $("#addWhiteListAds").click(function () {
+        chrome.tabs.query({ active: true, currentWindow: true }, function (tabs) {
+            const currentTab = tabs[0];
+            cloudopt.config.fastAddWhiteListAds(currentTab.url)(type => {
+                if (type === 'optionTipsDontDuplicate') {
+                    cloudopt.notification.info(cloudopt.i18n.get(type))
+                } else if (type === 'optionTipsAddWhiteListAdsSuccess') {
+                    cloudopt.notification.success(cloudopt.i18n.get(type))
+                } else if (type === 'optionTipsInputUrlisNull' || type === 'optionTipsInputUrlisError') {
+                    cloudopt.notification.error(cloudopt.i18n.get(type))
+                }
+            })
+        });
+    })
+
 });

option.html

@@ -394,7 +394,7 @@ <h2 class="mdl-card__title-text" i18n="optionCustomRule">自定义规则列表</
                     </div>
                 </div>
 
-                <div class="mdl-card mdl-shadow--2dp" id="white-lis">
+                <div class="mdl-card mdl-shadow--2dp" id="white-list">
                         <div class="mdl-card__title">
                         <h2 class="mdl-card__title-text" i18n="optionClassifyWhiteList">云安全白名单</h2>
                     </div>

popup.html

@@ -35,6 +35,7 @@
                         <ul class="mdl-menu mdl-menu--bottom-right mdl-js-menu mdl-js-ripple-effect" for="more">
                             <li class="mdl-menu__item" i18n="popupAddWhiteList" id="addWhiteList">添加到云安全白名单</li>
                             <li class="mdl-menu__item" i18n="popupAddBlackList" id="addBlackList">添加到云安全黑名单</li>
+                            <li class="mdl-menu__item" i18n="popupAddWhiteListAds" id="addWhiteListAds">添加到广告拦截白名单</li>
                             <li class="mdl-menu__item" id="cleanCache" i18n="popupCleanCache">清理缓存</li>
                             <li class="mdl-menu__item" id="report" i18n="popupReport">举报</li>
                             <li class="mdl-menu__item" id="evaluation" i18n="popupEvaluation">评价扩展</li>