[tor-commits] [tor-launcher/master] Bug #11772: Proxy Type menu not set correctly

[brade at torproject.org]

commit da9c9ad4b61ed0ce002b5e771f50991640bc9f43
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Tue May 6 09:53:06 2014 -0400

    Bug #11772: Proxy Type menu not set correctly
    
    Fixed problem where the Proxy Type menu was not restored to the
    configured value after restarting the browser.
---
 src/chrome/content/network-settings.js |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js
index 98028e2..c6b6cf2 100644
--- a/src/chrome/content/network-settings.js
+++ b/src/chrome/content/network-settings.js
@@ -1186,27 +1186,27 @@ function setElemValue(aID, aValue)
   var elem = document.getElementById(aID);
   if (elem)
   {
+    var val = aValue;
     switch (elem.tagName)
     {
       case "checkbox":
-        elem.checked = aValue;
+        elem.checked = val;
         toggleElemUI(elem);
         break;
       case "textbox":
-        var s = aValue;
         if (Array.isArray(aValue))
         {
-          s = "";
+          val = "";
           for (var i = 0; i < aValue.length; ++i)
           {
-            if (s.length > 0)
-              s += '\n';
-            s += aValue[i];
+            if (val.length > 0)
+              val += '\n';
+            val += aValue[i];
           }
         }
         // fallthru
       case "menulist":
-        elem.value = (s) ? s : "";
+        elem.value = (val) ? val : "";
         break;
     }
   }