[tbb-commits] [torbutton/master] Bug 9387: Unlock the slider if "custom" is set

[mikeperry at torproject.org]

commit dd28b7b49cfc775afcc0adf9b922193acded9a7f
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Feb 4 13:08:12 2015 +0000

    Bug 9387: Unlock the slider if "custom" is set
    
    If the custom mode is checked allow disabling it on the preference
    dialog directly by clicking on the description or dragging the thumb.
---
 src/chrome/content/preferences.js  |   29 +++++++++++++----------------
 src/chrome/content/preferences.xul |    1 -
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
index f67906c..1151176 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -189,12 +189,15 @@ function torbutton_prefs_init(doc) {
     let sec_custom = doc.getElementById('torbutton_sec_custom');
     let custom_values = o_torprefs.getBoolPref('security_custom');
     sec_slider.value = o_torprefs.getIntPref('security_slider');
-    sec_slider.disabled = custom_values;
-    // Setting |disabled| to |false| is not enough to have the element
-    // non-responding. We need to handle |movetoclick| as well.
-    sec_slider.setAttribute("movetoclick", !custom_values);
     sec_custom.checked = custom_values;
     sec_custom.disabled = !custom_values;
+    // If the custom checkbox is checked and the user is done with dragging
+    // uncheck the checkbox to allow setting the (newly) chosen security level.
+    sec_slider.dragStateChanged = function(isDragging) {
+        if (!isDragging && sec_custom.checked) {
+           sec_custom.checked = false;
+        }
+    }
 
     torbutton_prefs_set_field_attributes(doc);
 }
@@ -462,17 +465,11 @@ function torbutton_prefs_reset_defaults() {
 }
 
 function torbutton_toggle_slider(doc, pos) {
-    let slider = doc.getElementById("torbutton_sec_slider");
-    // onclick is active even if the element it belongs to is disabled.
-    if (pos && !slider.disabled) {
-        slider.value = pos;
-    } else {
-        if (doc.getElementById("torbutton_sec_custom").checked) {
-            slider.disabled = true;
-            slider.setAttribute("movetoclick", false);
-        } else {
-            slider.disabled = false;
-            slider.setAttribute("movetoclick", true);
-        }
+    doc.getElementById("torbutton_sec_slider").value = pos;
+    // Make sure the custom checkbox is unchecked as the user seems to want one
+    // of the defined security levels.
+    let sec_custom = doc.getElementById("torbutton_sec_custom");
+    if (sec_custom.checked) {
+        sec_custom.checked = false;
     }
 }
diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
index cb5f1ab..57b013a 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -188,7 +188,6 @@
           </hbox>
           <hbox>
             <checkbox id="torbutton_sec_custom" flex="1"
-                      oncommand="torbutton_toggle_slider(document, 0);"
                       label="&torbutton.prefs.sec_custom;"/>
           </hbox>
         </groupbox>