From a2ba3f56b7b7a39b9f14af007f2fc349a705f1ea Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Tue, 21 May 2013 14:34:56 -0700 Subject: [PATCH] Fix absolute scrolling in newer Firefoxen. --- common/modules/addons.jsm | 4 ++-- common/modules/buffer.jsm | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/common/modules/addons.jsm b/common/modules/addons.jsm index 2e52a9aa..9ff13af9 100644 --- a/common/modules/addons.jsm +++ b/common/modules/addons.jsm @@ -390,9 +390,9 @@ var Addons = Module("addons", { } if (!file.exists()) - AddonManager.getInstallForURL(url, install, "application/x-xpinstall"); + AddonManager.getInstallForURL(url, install, "application/x-xpinstall"); else if (file.isReadable() && file.isFile()) - AddonManager.getInstallForFile(file, install, "application/x-xpinstall"); + AddonManager.getInstallForFile(file.file, install, "application/x-xpinstall"); else if (file.isDirectory()) dactyl.echoerr(_("addon.cantInstallDir", file.path.quote())); else diff --git a/common/modules/buffer.jsm b/common/modules/buffer.jsm index 94a8e8f3..a7bf5a54 100644 --- a/common/modules/buffer.jsm +++ b/common/modules/buffer.jsm @@ -1471,8 +1471,13 @@ var Buffer = Module("Buffer", { return elem[pos] > 0; let max = pos + "Max"; - if (max in elem && dir > 0) - return elem[pos] < elem[max]; + if (max in elem) { + if (elem[pos] < elem[max]) + return true; + if (dir > 0) + return false; + return elem[pos] > 0; + } let style = DOM(elem).style; let borderSize = Math.round(parseFloat(style[border1]) + parseFloat(style[border2]));