* Show patterns buttons when adding Direct (no proxy) setting.

* Fixed some minor UI bugs when using Direct (no proxy).
foxyproxy · Oct 18, 2019 · d349179 · d349179
1 parent 16066b1
commit d349179
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 39 deletions.
diff --git a/src/about.html b/src/about.html
@@ -79,6 +79,7 @@ <h4>Version 7.4</h4>
          on pattern-related pages</div>
       </li>
       <li>Bug fixes when importing legacy foxyproxy.xml settings (FoxyProxy 4.x and earlier)</li>
+      <li>Show patterns buttons when adding Direct (no proxy) setting. Fixed some minor UI bugs when using Direct (no proxy).</li>
       </ul>      
       <h4>Version 7.3</h4>
       <ul>

diff --git a/src/proxy.html b/src/proxy.html
@@ -44,10 +44,23 @@
         display: none;
       }
 
-      #direct:checked ~ div button[data-i18n="saveEditPattern"] {
+      #http:checked ~ div .patternShortcuts,
+      #https:checked ~ div .patternShortcuts,
+      #socks4:checked ~ div .patternShortcuts,
+      #socks5:checked ~ div .patternShortcuts,
+      #direct:checked ~ div .patternShortcuts {
+        display: flex;
+      }
+
+      #pac:checked ~ div .patternShortcutsContainer,
+      #wpad:checked ~ div .patternShortcutsContainer,
+      #system:checked ~ div .patternShortcutsContainer {
         display: none;
       }
-
+
+      #direct:checked ~ div .patternShortcutsContainer {
+        display: block;
+      }      
     </style>
   </head>
   <body>
@@ -72,39 +85,13 @@
 
         <!-- left column -->
         <div>
-          <label data-i18n="title"></label>
-          <input id="proxyTitle" type="text" spellcheck="false" placeholder="title">
-
-          <label data-i18n="color"></label>
-          <input id="colorChooser" type="text" style="text-align: center;">
-
-          <label data-i18n="patternShortcuts" class="notForBasic notForEdit"></label>
-          <div class="prime warning notForBasic notForEdit">
-            <div class="flex onOff">
-              <label data-i18n="active"></label>
-              <div>
-                <input type="checkbox" class="switch" id="proxyActive" checked><label for="proxyActive"></label>
-              </div>
-            </div>
-
-            <div class="flex onOff">
-              <label><span data-i18n="addWhitelist"></span>
-              <div class="tooltip"><i class="fa fa-info-circle" style="font-size: 1.2em;"></i><span class="tooltiptext" data-i18n="addWhitelistTip"></span></div></label>
-              <div>
-                <input type="checkbox" class="switch" id="whiteAll"><label for="whiteAll"></label>
-              </div>
-            </div>
-
-            <div class="flex onOff">
-              <label><span data-i18n="noLocal"></span>
-              <div class="tooltip"><i class="fa fa-info-circle" style="font-size: 1.2em;"></i><span class="tooltiptext" data-i18n="addBlacklistTip"></span></div></label>
+          <div>
+            <label data-i18n="title"></label>
+            <input id="proxyTitle" type="text" spellcheck="false" placeholder="title">
 
-              <div>
-                <input type="checkbox" class="switch" id="blackAll"><label for="blackAll"></label>
-              </div>
-            </div>
+            <label data-i18n="color"></label>
+            <input id="colorChooser" type="text" style="text-align: center;">
           </div>
-
 
           <!-- SOCKS5 -->
           <div class="flex onOff dns">
@@ -113,10 +100,35 @@
               <input type="checkbox" class="switch" id="proxyDNS" checked><label for="proxyDNS"></label>
             </div>
           </div>
-
 
-
-
+          <div class="patternShortcutsContainer notForBasic notForEdit">
+            <label data-i18n="patternShortcuts" class="notForBasic notForEdit"></label>
+            <div class="prime warning">
+              <div class="patternShortcuts flex onOff">
+                <label data-i18n="active"></label>
+                <div>
+                  <input type="checkbox" class="switch" id="proxyActive" checked><label for="proxyActive"></label>
+                </div>
+              </div>
+
+              <div class="patternShortcuts onOff">
+                <label><span data-i18n="addWhitelist"></span>
+                <div class="tooltip"><i class="fa fa-info-circle"></i><span class="tooltiptext" data-i18n="addWhitelistTip"></span></div></label>
+                <div>
+                  <input type="checkbox" class="switch" id="whiteAll"><label for="whiteAll"></label>
+                </div>
+              </div>
+
+              <div class="patternShortcuts onOff">
+                <label><span data-i18n="noLocal"></span>
+                <div class="tooltip"><i class="fa fa-info-circle"></i><span class="tooltiptext" data-i18n="addBlacklistTip"></span></div></label>
+
+                <div>
+                  <input type="checkbox" class="switch" id="blackAll"><label for="blackAll"></label>
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
 
         <!-- right column -->

diff --git a/src/scripts/options.js b/src/scripts/options.js
@@ -224,7 +224,7 @@ function processOptions(pref) {
 
     div.id = id;
     node[0].style.backgroundColor = item.color;
-    node[1].textContent = item.title || `${item.address}:${item.port}`; // ellipsis is handled by CSS
+    node[1].textContent = Utils.getProxyTitle(item);
     node[2].textContent = item.address; // ellipsis is handled by CSS
     if (item.cc) {
       node[3].classList.remove('hide');

diff --git a/src/scripts/popup.js b/src/scripts/popup.js
@@ -46,7 +46,7 @@ function processOptions(pref) {
       li.classList.remove('template');
       li.id = id;
       li.style.color = item.color;
-      li.children[0].textContent = item.title || `${item.address}:${item.port}`;
+      li.children[0].textContent = Utils.getProxyTitle(item);
       li.children[1].textContent = '(' + chrome.i18n.getMessage('forAll') + ')';
 
       docfrag.appendChild(li);

diff --git a/src/scripts/utils.js b/src/scripts/utils.js
@@ -253,7 +253,15 @@ class Utils {
   }
 
   static getProxyTitle(proxySetting) {
-    return proxySetting.title || `${proxySetting.address}:${proxySetting.port}`;
+    if (proxySetting.title) {
+      return proxySetting.title;
+    }
+    else if (proxySetting.type === PROXY_TYPE_NONE) {
+      return 'Direct (no proxy)';
+    }
+    else {
+      return `${proxySetting.address}:${proxySetting.port}`;
+    }
   }
 
 /*