add auto detect mode

henices · Nov 25, 2013 · fe642a1 · fe642a1
1 parent 6406ee6
commit fe642a1
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 24 deletions.
diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
@@ -1,81 +1,81 @@
 {
     "appName": {
-        "message": "代理助手"
+        "message" : "代理助手"
     },
     "appDesc": {
-        "message": "为Google Chrome 浏览器设置代理"
+        "message" : "为Google Chrome 浏览器设置代理"
     },
     "title" : {
-        "message": "代理助手"
+        "message" : "代理助手"
     },
     "proxy_helper_options" : {
-        "message": "代理助手选项"
+        "message" : "代理助手选项"
     },
     "proxy_information" : {
-        "message": "浏览器代理设置"
+        "message" : "浏览器代理设置"
     },
     "config_auto": {
-        "message": "自动设置代理"
+        "message" : "自动设置代理"
     },
     "config_manual": {
-        "message": "手动设置代理"
+        "message" : "手动设置代理"
     },
     "show_adv" : {
-        "message": "显示高级设置"
+        "message" : "显示高级设置"
     },
     "advanced_settings" : {
-        "message": "高级设置"
+        "message" : "高级设置"
     },
     "download" : {
         "message" : "下载"
     },
     "pac_url": {
-        "message": "在线PAC网址:"
+        "message" : "在线PAC网址:"
     },
     "online_pac_script" : {
-        "message": "使用在线PAC脚本"
+        "message" : "使用在线PAC脚本"
     },
     "save" : {
-        "message": "保存"
+        "message" : "保存"
     },
     "edit" : {
-        "message": "编辑"
+        "message" : "编辑"
     },
     "cancel" : {
-        "message": "取消"
+        "message" : "取消"
     },
     "proxy": {
-        "message": "代理"
+        "message" : "代理"
     },
     "pac_script" : {
-        "message": "PAC 脚本"
+        "message" : "PAC 脚本"
     },
     "http_proxy" : {
-        "message": "HTTP 代理:"
+        "message" : "HTTP 代理:"
     },
     "https_proxy" : {
-        "message": "HTTPS代理:"
+        "message" : "HTTPS代理:"
     },
     "socks_proxy" : {
-        "message": "SOCKS代理:"
+        "message" : "SOCKS代理:"
     },
     "system_proxy" : {
-        "message": "系统代理"
+        "message" : "系统代理"
     },
     "direct_proxy" : {
-        "message": "直接连接"
+        "message" : "直接连接"
     },
     "port" : {
-        "message": "端口:"
+        "message" : "端口:"
     },
     "pac_path" : {
-        "message": "PAC文件路径:"
+        "message" : "PAC文件路径:"
     },
     "edit_pac_data" : {
         "message" : "编辑PAC脚本"
     },
     "bypass_list" : {
-        "message": "BYPASS列表"
+        "message" : "BYPASS列表"
     },
     "proxy_rules" : {
         "message" : "PROXY规则 :"
@@ -115,6 +115,9 @@
     },
     "https_proxy_set" : {
         "message" : "HTTPS代理"
+    },
+    "auto_detect_set" : {
+        "message" : "自动检测"
     }
 }
 
diff --git a/javascripts/popup.js b/javascripts/popup.js
@@ -271,6 +271,25 @@ function sysProxy() {
     proxySelected('system')
 }
 
+/**
+ * set auto detect proxy
+ *
+ */
+function autoProxy() {
+
+    var config = {
+        mode: 'auto_detect',
+    };
+
+    chrome.proxy.settings.set(
+            {value: config, scope: 'regular'},
+            function() {});
+
+    iconSet('on');
+    proxySelected('auto')
+}
+
+
 chrome.proxy.onProxyError.addListener(function(details) {
     console.log(details.error);
 });
@@ -283,6 +302,7 @@ document.addEventListener('DOMContentLoaded', function () {
     document.querySelector('#https-proxy').addEventListener('click', httpsProxy);
     document.querySelector('#sys-proxy').addEventListener('click', sysProxy);
     document.querySelector('#direct-proxy').addEventListener('click', directProxy);
+    document.querySelector('#auto-detect').addEventListener('click', autoProxy);
 
     $('[data-i18n-content]').each(function() {
         var message = chrome.i18n.getMessage(this.getAttribute('data-i18n-content'));

diff --git a/popup.html b/popup.html
@@ -27,6 +27,11 @@
                     <span id="https" class="text" data-i18n-content="https_proxy_set">HTTPS PROXY</span>
                 </div>
             </li>
+            <li id="auto-detect">
+                <div class="menu">
+                    <span id="auto" class="text" data-i18n-content="auto_detect_set">AUTO DETECT</span>
+                </div>
+            </li>
             <li id="sys-proxy" title="Use system's proxy settings">
                 <div class="menu">
                     <span id="system" class="text" data-i18n-content="system_proxy">SYSTEM</span>