commit 9c4a20bec5d1f3fc38a103b4f47c1039f48119dd
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Wed Feb 1 10:45:36 2017 -0500
Bug 21330: Non-usable scrollbar appears in tor browser security settings
Wait until after the security settings window has finished loading
before enabling the description box's scrollbar.
---
src/chrome/content/preferences.js | 5 +++++
src/chrome/content/preferences.xul | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
index 1f94dbb..1e47cad 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -41,6 +41,11 @@ function torbutton_init_security_ui() {
torbutton_set_slider(prefSettingToSliderPosition(
getIntPref("extensions.torbutton.security_slider")));
torbutton_set_custom(getBoolPref("extensions.torbutton.security_custom"));
+
+ // Show a scrollbar for the description text if one is needed.
+ // To avoid bug 21330, we set the overflow=auto style here instead
+ // of directly in the XUL.
+ document.getElementById("descBox").style.overflow = "auto";
};
// Write the two prefs from the current settings.
diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
index bb6e31f..554312c 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -57,7 +57,7 @@
</vbox>
</hbox>
</vbox>
- <vbox flex="1" width="400" style="overflow: auto;">
+ <vbox id="descBox" flex="1" width="400" style="overflow: hidden;">
<vbox id="desc_high" collapsed="true">
<description
class="slider-text-size, slider-text-weight">
