v0.4🍉

允许设置是否显示右键菜单、将默认语言设置为英文。 Merge branch 'developer'
jinliming2 · Jul 1, 2017 · c8ba673 · c8ba673 · jinliming2 · Jul 1, 2017
2 parents 2b3ddbb + 422ed3e
commit c8ba673
Show file tree

Hide file tree

Showing 9 changed files with 153 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -20,6 +20,10 @@ A Google Chrome extension used to modify the page default encoding for Google Ch
 [Google Chrome Web Store](https://chrome.google.com/webstore/detail/oenllhgkiiljibhfagbfogdbchhdchml)
 
 ## History
+### v0.4(2017/7/1)
+1. 新增设置选项：允许设置是否显示右键菜单（GitHub Issue：[#1](https://github.com/jinliming2/Chrome-Charset/issues/1)）
+2. 将默认语言设置为英文en，中文浏览器、英文浏览器不受影响，其他语言浏览器默认显示英文。（Chrome商店反馈）
+
 ### v0.3.1(2017/5/7)
 1. 【修复】file协议下修改html文档编码失败的Bug。
 

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -19,9 +19,13 @@
         "description": "Reset default charset"
     },
     "tipCurrent": {
-        "message": "Current：",
+        "message": "Current: ",
         "description": "The encoding used for the current page"
     },
+    "settingMenu": {
+        "message": "ContextMenu: ",
+        "description": "Show Menu or Not"
+    },
     "default": {
         "message": "Default"
     },

diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
@@ -22,6 +22,10 @@
         "message": "当前：",
         "description": "The encoding used for the current page"
     },
+    "settingMenu": {
+        "message": "显示右键菜单：",
+        "description": "Show Menu or Not"
+    },
     "default": {
         "message": "默认"
     },

diff --git a/c/popup.css b/c/popup.css
@@ -28,3 +28,67 @@ button:hover {
 button:active {
     opacity: 1;
 }
+
+.setting {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+input[type=checkbox] {
+    visibility: hidden;
+}
+
+.switch {
+    flex-shrink: 0;
+    display: inline-block;
+    width: 120px;
+    height: 30px;
+    background: #f57c00;
+    -webkit-border-radius: 15px;
+    border-radius: 15px;
+    position: relative;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+.switch:before {
+    content: 'On';
+    position: absolute;
+    top: 4px;
+    left: 13px;
+    height: 2px;
+    color: #fff;
+    font-size: 16px;
+}
+
+.switch:after {
+    content: 'Off';
+    position: absolute;
+    top: 4px;
+    left: 84px;
+    height: 2px;
+    color: #888;
+    font-size: 16px;
+}
+
+.switch label {
+    display: block;
+    width: 52px;
+    height: 18px;
+    cursor: pointer;
+    position: absolute;
+    top: 6px;
+    z-index: 1;
+    left: 12px;
+    background: #888;
+    -webkit-border-radius: 11px;
+    border-radius: 11px;
+    -webkit-transition: all 0.5s ease;
+    transition: all 0.5s ease;
+}
+
+.switch input[type=checkbox]:checked + label {
+    left: 60px;
+    background: #fff;
+}
diff --git a/j/background.js b/j/background.js
@@ -2,7 +2,10 @@
  * Created by Liming on 2017/2/14.
  */
 "use strict";
+const config = localStorage.getItem('config_menu');
 localStorage.clear();
+localStorage.setItem('config_menu', config);
+
 const charsetPattern = /; ?charset=([^;]+)/;
 const html_special_chars = (html) => html.replace(/&/g, '&gt;')
     .replace(/</g, '&lt;')

diff --git a/j/menu.js b/j/menu.js
@@ -3,36 +3,39 @@
  */
 "use strict";
 (() => {
+    let _menu = false;
+    const menuList = {};
     //CreateMenu
-    let menuList = {};
-    menuList['default'] = chrome.contextMenus.create({
-        type: "radio",
-        title: chrome.i18n.getMessage('default'),
-        checked: true,
-        onclick: (info, tab) => {
-            if(!info.wasChecked) {
-                resetEncoding(tab.id);
-            }
-        }
-    });
-    for(let encoding of ENCODINGS) {
-        if(encoding.length === 1) {
-            continue;
-        }
-        menuList[encoding[0].toUpperCase()] = chrome.contextMenus.create({
+    const createMenu = () => {
+        menuList['default'] = chrome.contextMenus.create({
             type: "radio",
-            title: `${encoding[1]}（${encoding[0]}）`,
-            checked: false,
+            title: chrome.i18n.getMessage('default'),
+            checked: true,
             onclick: (info, tab) => {
                 if(!info.wasChecked) {
-                    setEncoding(tab.id, encoding[0]);
+                    resetEncoding(tab.id);
                 }
             }
         });
-    }
-
+        for(let encoding of ENCODINGS) {
+            if(encoding.length === 1) {
+                continue;
+            }
+            menuList[encoding[0].toUpperCase()] = chrome.contextMenus.create({
+                type: "radio",
+                title: `${encoding[1]}（${encoding[0]}）`,
+                checked: false,
+                onclick: (info, tab) => {
+                    if(!info.wasChecked) {
+                        setEncoding(tab.id, encoding[0]);
+                    }
+                }
+            });
+        }
+        _menu = true;
+    };
     //UpdateMenu
-    let updateMenu = (tabId) => {
+    const updateMenu = tabId => {
         let charset = getEncoding(tabId);
         charset = charset ? menuList[charset.toUpperCase()] : menuList['default'];
         for(let menu in menuList) {
@@ -45,17 +48,43 @@
         });
     };
     chrome.tabs.onActivated.addListener((activeInfo) => {
+        if (!_menu) {
+            return;
+        }
         updateMenu(activeInfo.tabId);
     });
     chrome.tabs.onUpdated.addListener((tabId) => {
+        if (!_menu) {
+            return;
+        }
         updateMenu(tabId);
     });
     chrome.windows.onFocusChanged.addListener(() => {
+        if (!_menu) {
+            return;
+        }
         chrome.tabs.query({active: true, currentWindow: true}, (tabs) => {
             if(tabs.length === 0) {
                 return;
             }
             updateMenu(tabs[0].id);
         });
     });
+
+    chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
+        switch(message.action) {
+            case 'ShowMenu':
+                createMenu();
+                break;
+            case 'HideMenu':
+                _menu = false;
+                chrome.contextMenus.removeAll();
+                break;
+        }
+    });
+    const config = localStorage.getItem('config_menu');
+    if(config === 'false') {
+        return;
+    }
+    createMenu();
 })();
diff --git a/j/popup.js b/j/popup.js
@@ -34,6 +34,7 @@
         //I18N
         document.getElementById('reset').innerHTML = chrome.i18n.getMessage('btnReset');
         document.getElementById('tip_current').innerHTML = chrome.i18n.getMessage('tipCurrent');
+        document.getElementById('context_menu').innerHTML = chrome.i18n.getMessage('settingMenu');
         //Reset
         document.getElementById('reset').addEventListener('click', () => {
             resetEncoding(tabs[0].id, () => {
@@ -58,5 +59,14 @@
             });
             list.appendChild(button);
         }
+        //Settings
+        const setting_Menu = document.getElementById('menu');
+        setting_Menu.checked = localStorage.getItem('config_menu') !== 'false';
+        setting_Menu.addEventListener('change', _ => {
+            localStorage.setItem('config_menu', setting_Menu.checked);
+            chrome.runtime.sendMessage({
+                action: setting_Menu.checked ? 'ShowMenu' : 'HideMenu'
+            });
+        });
     });
 })();
diff --git a/manifest.json b/manifest.json
@@ -1,8 +1,8 @@
 {
     "manifest_version": 2,
     "name": "__MSG_appName__",
-    "version": "0.3.1",
-    "default_locale": "zh_CN",
+    "version": "0.4",
+    "default_locale": "en",
     "description": "__MSG_appDescription__",
     "icons": {
         "128": "i/128.png",
@@ -30,7 +30,7 @@
     },
     "content_scripts": [
         {
-            "matches": ["*://*/*", "file://*/*"],
+            "matches": ["<all_urls>"],
             "js": ["j/content.js"],
             "run_at": "document_start"
         }

diff --git a/popup.html b/popup.html
@@ -8,11 +8,19 @@
 </head>
 <body>
 <div>
-<span id="tip_current"></span><span id="current"></span>
+    <span id="tip_current"></span><span id="current"></span>
 </div>
 <button type="button" id="reset"></button>
 <hr>
 <div id="list"></div>
+<hr>
+<div class="setting">
+    <label id="context_menu"></label>
+    <div class="switch">
+        <input id="menu" type="checkbox">
+        <label for="menu"></label>
+    </div>
+</div>
 <script src="./j/encoding.js"></script>
 <script src="./j/popup.js"></script>
 </body>