Merge pull request #50 from cloudoptlab/fix/2.1.0/fix-batch-of-issues

Fix/2.1.0/fix batch of issues

Author: T-baby

_locales/en/messages.json

@@ -427,6 +427,9 @@
     "popupManualSubtitle": {
         "message": "Click to open manual blocker"
     },
+    "popupNoNeedManual": {
+        "message": "No ads to be blocked in this page"
+    },
     "popupMoreTitle": {
         "message": "More setting options"
     },

_locales/ko/messages.json

@@ -427,6 +427,9 @@
     "popupManualSubtitle": {
         "message": "수동 차단기를 열려면 클릭하십시오"
     },
+    "popupNoNeedManual": {
+        "message": "이 페이지에서 차단할 광고가 없습니다"
+    },
     "popupMoreTitle": {
         "message": "추가 설정 옵션"
     },

_locales/zh_CN/messages.json

@@ -427,6 +427,9 @@
     "popupManualSubtitle": {
         "message": "点击打开手动拦截器"
     },
+    "popupNoNeedManual": {
+        "message": "此页面不需要拦截广告"
+    },
     "popupMoreTitle": {
         "message": "更多设置选项"
     },

_locales/zh_TW/messages.json

@@ -427,6 +427,9 @@
     "popupManualSubtitle": {
         "message": "点击打开手动拦截器"
     },
+    "popupNoNeedManual": {
+        "message": "此頁面不需要攔截廣告"
+    },
     "popupMoreTitle": {
         "message": "更多设置选项"
     },

manifest.json

@@ -6,7 +6,6 @@
     "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
     "description": "__MSG_infoDescription__",
     "default_locale": "en",
-    "update_url": "https://cdn.cloudopt.net/extensions/update/updates.xml",
     "icons": {
         "64": "image/icon/default/icon64.png",
         "128": "image/icon/default/icon128.png",

src/guide/common/switchInfo/index.ts

@@ -8,7 +8,7 @@ import rtpl from 'art-template/lib/template-web.js'
 export interface ISwitchInfo {
     icon: string;
     title: string;
-    content: string;
+    content?: string;
     key: string;
     on: boolean;
     i18n?: string;
@@ -30,7 +30,7 @@ export class SwitchInfo {
                 {{ /if }}
                 <div class="description">
                     <span class="title">{{ title }}</span>
-                    <span class="content" i18n="{{ i18n }}">{{ content }}</span>
+                    <span class="content" {{ if i18n }} i18n="{{ i18n }}" {{ /if }}>{{ content || ' ' }}</span>
                 </div>
             </div>
             <div class="right" key="{{ key }}">

src/guide/guide.ts

@@ -198,7 +198,6 @@ export class GuideManager {
         const switchElement = createSwitchInfoDom({
             icon: '',
             title: i18n.get('guideDataCollectionSwitchTitle'),
-            content: ' ',
             i18n: 'guideDataCollectionSwitchContent',
             key: 'dataCollection',
             on: config.dataCollection

src/option/common/switchInfo/index.ts

@@ -8,9 +8,10 @@ import rtpl from 'art-template/lib/template-web.js'
 export interface ISwitchInfo {
     icon: string;
     title: string;
-    content: string;
+    content?: string;
     key: string;
     on: boolean;
+    i18n?: string;
 }
 
 export class SwitchInfo {
@@ -29,7 +30,7 @@ export class SwitchInfo {
             {{ /if }}
                 <div class="description">
                     <span class="title">{{ title }}</span>
-                    <span class="content">{{ content }}</span>
+                    <span class="content" {{ if i18n }} i18n="{{ i18n }}" {{ /if }}>{{ content || ' ' }}</span>
                 </div>
             </div>
             <div class="right" key="{{ key }}">

src/option/component/adBlock/index.scss

@@ -96,6 +96,9 @@
                             width: 15px;
                             height: 15px;
                             padding: 4px;
+                            &.disabled {
+                                background-color: #becad6;
+                            }
                         }
                     }
                 }

src/option/component/adBlock/index.ts

@@ -76,7 +76,10 @@ export default class AdBlockPages implements IBaseHTMLPages {
             `
             <li>
                 <div class="left" for="${rule}">
-                    <img class="rule-icon" src="${config.disabledCustomSubs.inArray(rule) ? this.getIconPath('icons-unchecked_thick') : this.getIconPath('icons-checked_thick')}">
+                    <img class="rule-icon ${config.disabledCustomSubs.inArray(rule) && "disabled"}" 
+                        src="${config.disabledCustomSubs.inArray(rule) ? 
+                            this.getIconPath('icons-unchecked_thick') : 
+                            this.getIconPath('icons-checked_thick')}">
                     <span>${rule}</span>
                 </div>
                 <div class="right" for="${rule}">