update options javascript, more friendly

henices · Dec 20, 2018 · d129e72 · d129e72
1 parent 265fe29
commit d129e72
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 18 deletions.
diff --git a/javascripts/options.js b/javascripts/options.js
@@ -17,6 +17,7 @@ function loadProxyData() {
       $('#https-port').val(proxySetting['https_port'] || "");
       $('#pac-type').val(proxySetting['pac_type'] || "file://");
       $('#bypasslist').val(proxySetting['bypasslist'] || "");
+      $('#rules-mode').val(proxySetting['rules_mode'] || "Whitelist");
       $('#proxy-rule').val(proxySetting['proxy_rule'] || "singleProxy");
       $('#username').val(proxySetting['auth']['user'] || "");
       $('#password').val(proxySetting['auth']['pass'] || "");
@@ -38,6 +39,20 @@ function loadProxyData() {
           $('#use-china-list').attr('checked', true);
       }
 
+      if (proxySetting['rules_mode'] == 'Whitelist') {
+          $('#bypasslist').prop('disabled', false);
+          $('#proxylist').prop('disabled', true);
+          $('#china-list').prop('disabled', false);
+          $('#blacklist').hide();
+          $('#whitelist').show();
+      } else {
+          $('#bypasslist').prop('disabled', true);
+          $('#proxylist').prop('disabled', false);
+          $('#china-list').prop('disabled', true);
+          $('#blacklist').show();
+          $('#whitelist').hide();
+      }
+
   });
 
 }
@@ -320,6 +335,7 @@ function save() {
   proxySetting['pac_type'] = $('#pac-type').val() || "";
   proxySetting['bypasslist'] = $('#bypasslist').val() || "";
   proxySetting['proxy_rule'] = $('#proxy-rule').val() || "";
+  proxySetting['rules_mode'] = $('#rules-mode').val() || "";
   proxySetting['auth']['user'] = $('#username').val() || "";
   proxySetting['auth']['pass'] = $('#password').val() || "";
 
@@ -446,13 +462,9 @@ function getPac() {
 
 document.addEventListener('DOMContentLoaded', function () {
 
-    $('#btn-save').click(function() {
-        save();
-    });
+    $('#btn-save').click(function() { save(); });
 
-    $('#btn-cancel').click(function() {
-        location.reload();
-    });
+    $('#btn-cancel').click(function() { location.reload(); });
 
     $('#socks4').change(function() {
         $('#socks5').attr('checked', false);
@@ -466,14 +478,13 @@ document.addEventListener('DOMContentLoaded', function () {
         chrome.tabs.create({url: 'chrome://net-internals/#proxy'});
     });
 
-    $('input').change(
-        function() { save(); });
+    $('input').change(function() { save(); });
+
+    $('textarea').change(function() { save(); });
 
-    $('textarea').change(
-        function() { save(); });
+    $('#proxy-rule').change(function() { save(); });
 
-    $('#proxy-rule').change(
-        function() { save(); });
+    $('#rules-mode').change(function() { save(); });
 
     var proxySetting = JSON.parse(localStorage.proxySetting);
     $('#pac-type').change(function() {

diff --git a/options.html b/options.html
@@ -118,16 +118,16 @@ <h3 data-i18n-content="advanced_settings">Advanced settings</h3>
             <div class="content">
                 <section>
                     <h3 data-i18n-content="rules_mode">Rules Mode</h3>
-                    <select>
+                    <select id='rules-mode'>
                         <option data-i18n-content="Whitelist" value="Whitelist">Whitelist</option>
                         <option data-i18n-content="Blacklist" value="Blacklist">Blacklist</option>
                     </select>
                 </section>
-                <section>
+                <section id='whitelist'>
                     <h3 data-i18n-content="config_bypasslist">Bypass List</h3>
                     <p data-i18n-content="domain_in_bypasslist">Domains in bypass list will Never use a proxy</p>
                     <div class="section">
-                        <textarea id="bypasslist" cols="50" rows="10" placeholder="192.168.1.1/16,*.foobar.com,*foobar.com:99,https://x.*.y.com:99"></textarea>
+                        <textarea id="bypasslist" cols="40" rows="10" placeholder="192.168.1.1/16,*.foobar.com,*foobar.com:99,https://x.*.y.com:99"></textarea>
                         <a href='#' class='tooltip'>
                             <img src="images/help.gif">
                             <span>
@@ -141,15 +141,15 @@ <h3 data-i18n-content="config_bypasslist">Bypass List</h3>
                     </div>
                     <h4 data-i18n-content="use_predefine_list">Use internal proxy bypass list</h3>
                     <div class="checkbox">
-                        <input type="checkbox" id="use-china-list"/>
+                        <input id='china-list' type="checkbox" id="use-china-list"/>
                         <span data-i18n-content="china_list">China List</span>
                     </div>
                 </section>
-                <section>
+                <section id='blacklist'>
                     <h3 data-i18n-content="config_proxylist">Proxy List</h3>
                     <p data-i18n-content="domain_in_proxy">Domains in list will use a proxy</p>
                     <div class="section">
-                        <textarea id="proxylist" cols="50" rows="10" placeholder=""></textarea>
+                        <textarea id="proxylist" cols="40" rows="10" placeholder=""></textarea>
                     </div>
                 </section>
             </div>