[tbb-commits] [torbutton/master] Bug 17767: Move 'JavaScript disabled' to top of Security Slider list

[gk at torproject.org]

commit fe6c10c893f3aed2d58e5b0c1b703543d7286f96
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date:   Fri Sep 9 11:28:41 2016 -0700

    Bug 17767: Move 'JavaScript disabled' to top of Security Slider list
---
 src/chrome/content/preferences.xul | 42 +++++++++++++++++++-------------------
 src/chrome/locale/en/torbutton.dtd |  2 +-
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
index 507efd0..8ea448c 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -78,14 +78,18 @@
                   &torbutton.prefs.sec_gen_desc;
                 </description>
                 <description class="slider-text-size"
-                  tooltiptext="&torbutton.prefs.sec_html5_tooltip;">
-                  &torbutton.prefs.sec_html5_desc;
+                  tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;">
+                  &torbutton.prefs.sec_all_js_desc;
                 </description>
                 <description class="slider-text-size"
                   tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip; &torbutton.prefs.sec_baseline_jit_desc_tooltip;">
                   &torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc;
                 </description>
                 <description class="slider-text-size"
+                  tooltiptext="&torbutton.prefs.sec_html5_tooltip;">
+                  &torbutton.prefs.sec_html5_desc;
+                </description>
+                <description class="slider-text-size"
                   tooltiptext="&torbutton.prefs.sec_jar_tooltip;">
                   &torbutton.prefs.sec_jar_desc;
                 </description>
@@ -98,10 +102,6 @@
                   &torbutton.prefs.sec_font_rend_desc;
                 </description>
                 <description class="slider-text-size"
-                  tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;">
-                  &torbutton.prefs.sec_all_js_desc;
-                </description>
-                <description class="slider-text-size"
                   tooltiptext="&torbutton.prefs.sec_svg_desc_tooltip;">
                   &torbutton.prefs.sec_svg_desc;
                 </description>
@@ -116,14 +116,18 @@
                   &torbutton.prefs.sec_gen_desc;
                 </description>
                 <description class="slider-text-size"
-                  tooltiptext="&torbutton.prefs.sec_html5_tooltip;">
-                  &torbutton.prefs.sec_html5_desc;
+                  tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;">
+                  &torbutton.prefs.sec_js_https_desc;
                 </description>
                 <description class="slider-text-size"
                   tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip; &torbutton.prefs.sec_baseline_jit_desc_tooltip;">
                   &torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc;
                 </description>
                 <description class="slider-text-size"
+                  tooltiptext="&torbutton.prefs.sec_html5_tooltip;">
+                  &torbutton.prefs.sec_html5_desc;
+                </description>
+                <description class="slider-text-size"
                   tooltiptext="&torbutton.prefs.sec_jar_tooltip;">
                   &torbutton.prefs.sec_jar_desc;
                 </description>
@@ -135,10 +139,6 @@
                   tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip;">
                   &torbutton.prefs.sec_font_rend_desc;
                 </description>
-                <description class="slider-text-size"
-                  tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;">
-                  &torbutton.prefs.sec_js_https_desc;
-                </description>
               </vbox>
              <vbox id="desc_medium_low" collapsed="true">
                 <description
@@ -146,14 +146,14 @@
                   &torbutton.prefs.sec_gen_desc;
                 </description>
                 <description class="slider-text-size"
-                  tooltiptext="&torbutton.prefs.sec_html5_tooltip;">
-                  &torbutton.prefs.sec_html5_desc;
-                </description>
-                <description class="slider-text-size"
                   tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip;">
                   &torbutton.prefs.sec_some_jit_desc; &torbutton.prefs.sec_jit_slower_desc;
                 </description>
                 <description class="slider-text-size"
+                  tooltiptext="&torbutton.prefs.sec_html5_tooltip;">
+                  &torbutton.prefs.sec_html5_desc;
+                </description>
+                <description class="slider-text-size"
                   tooltiptext="&torbutton.prefs.sec_jar_tooltip;">
                   &torbutton.prefs.sec_jar_desc;
                 </description>
@@ -188,12 +188,12 @@
      <html:b>&torbutton.prefs.sec_gen_desc;</html:b>
      <html:br></html:br>
      <html:br></html:br>
+     <html:div>&torbutton.prefs.sec_all_js_desc;</html:div>
+     <html:div>&torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div>
      <html:div>&torbutton.prefs.sec_html5_desc;</html:div>
-     <html:div>&torbutton.prefs.sec_some_jit_desc;</html:div>
      <html:div>&torbutton.prefs.sec_jar_desc;</html:div>
      <html:div>&torbutton.prefs.sec_mathml_desc;</html:div>
      <html:div>&torbutton.prefs.sec_font_rend_desc;</html:div>
-     <html:div>&torbutton.prefs.sec_all_js_desc;</html:div>
      <html:div>&torbutton.prefs.sec_svg_desc;</html:div>
      <html:div>&torbutton.prefs.sec_webfonts_desc;</html:div>
    </tooltip>
@@ -201,19 +201,19 @@
      <html:b>&torbutton.prefs.sec_gen_desc;</html:b>
      <html:br></html:br>
      <html:br></html:br>
+     <html:div>&torbutton.prefs.sec_js_https_desc;</html:div>
+     <html:div>&torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div>
      <html:div>&torbutton.prefs.sec_html5_desc;</html:div>
-     <html:div>&torbutton.prefs.sec_some_jit_desc;</html:div>
      <html:div>&torbutton.prefs.sec_jar_desc;</html:div>
      <html:div>&torbutton.prefs.sec_mathml_desc;</html:div>
      <html:div>&torbutton.prefs.sec_font_rend_desc;</html:div>
-     <html:div>&torbutton.prefs.sec_js_https_desc;</html:div>
    </tooltip>
    <tooltip id="ml_preview">
      <html:b>&torbutton.prefs.sec_gen_desc;</html:b>
      <html:br></html:br>
      <html:br></html:br>
+     <html:div>&torbutton.prefs.sec_some_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div>
      <html:div>&torbutton.prefs.sec_html5_desc;</html:div>
-     <html:div>&torbutton.prefs.sec_some_jit_desc;</html:div>
      <html:div>&torbutton.prefs.sec_jar_desc;</html:div>
      <html:div>&torbutton.prefs.sec_mathml_desc;</html:div>
    </tooltip>
diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd
index 0720208..4bca4c7 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/en/torbutton.dtd
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled.">
+<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
 <!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
 <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
 <!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">