From 88cb7a65b5a72dc09d54a4698bced7eacfbdbddb Mon Sep 17 00:00:00 2001 From: "cst%andrew.cmu.edu" Date: Mon, 17 Oct 2005 00:07:57 +0000 Subject: [PATCH] Bug 310380 middlemouse autoscroll should default off for UNIX/Linux (X) environment Patch by Hogarth r=me sr=neil --- xpfe/bootstrap/browser-prefs.js | 3 +++ xpfe/communicator/resources/content/utilityOverlay.js | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/xpfe/bootstrap/browser-prefs.js b/xpfe/bootstrap/browser-prefs.js index f446b94c46a4..66c55481d80d 100644 --- a/xpfe/bootstrap/browser-prefs.js +++ b/xpfe/bootstrap/browser-prefs.js @@ -55,6 +55,7 @@ pref("general.open_location.last_url", ""); pref("general.open_location.last_window_choice", 0); pref("general.smoothScroll", false); +pref("general.autoScroll", true); #expand pref("general.useragent.extra.__MOZ_APP_NAME__", "__MOZ_APP_DISPLAYNAME__/__MOZ_APP_VERSION__"); @@ -251,6 +252,8 @@ pref("browser.urlbar.clickSelectsAll", false); // 1 act like pgup // 2 and other values, nothing pref("browser.backspace_action", 1); + +pref("general.autoScroll", false); #endif #endif diff --git a/xpfe/communicator/resources/content/utilityOverlay.js b/xpfe/communicator/resources/content/utilityOverlay.js index c67e2d60ad5a..833b912dc745 100644 --- a/xpfe/communicator/resources/content/utilityOverlay.js +++ b/xpfe/communicator/resources/content/utilityOverlay.js @@ -581,9 +581,15 @@ var gAutoScrollPopup = null; function startScrolling(event) { + var pref = Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefBranch); + if (gScrollingView || event.button != 1) return; + if (!pref.getBoolPref("general.autoScroll")) + return; + if (event.originalTarget instanceof XULElement && ((event.originalTarget.localName == "thumb") || (event.originalTarget.localName == "slider")