gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-20 07:17:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix issue with smooth-scroll.js

Browse Source
This commit is contained in:
Kris Maglione
2011-06-05 18:56:33 -04:00
parent 0ed9dc335b
commit 0195b4f1c9
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/content/buffer.js
View File

@@ -1225,10 +1225,11 @@ var Buffer = Module("buffer", {
else else
throw Error(); throw Error();
dactyl.assert(number < 0 ? elem.scrollLeft > 0 : elem.scrollLeft < elem.scrollWidth - elem.clientWidth);
let left = elem.dactylScrollDestX !== undefined ? elem.dactylScrollDestX : elem.scrollLeft; let left = elem.dactylScrollDestX !== undefined ? elem.dactylScrollDestX : elem.scrollLeft;
elem.dactylScrollDestX = undefined; elem.dactylScrollDestX = undefined;
dactyl.assert(number < 0 ? left > 0 : left < elem.scrollWidth - elem.clientWidth);
Buffer.scrollTo(elem, left + number * increment, null); Buffer.scrollTo(elem, left + number * increment, null);
}, },
@@ -1253,10 +1254,11 @@ var Buffer = Module("buffer", {
else else
throw Error(); throw Error();
dactyl.assert(number < 0 ? elem.scrollTop > 0 : elem.scrollTop < elem.scrollHeight - elem.clientHeight);
let top = elem.dactylScrollDestY !== undefined ? elem.dactylScrollDestY : elem.scrollTop; let top = elem.dactylScrollDestY !== undefined ? elem.dactylScrollDestY : elem.scrollTop;
elem.dactylScrollDestY = undefined; elem.dactylScrollDestY = undefined;
dactyl.assert(number < 0 ? top > 0 : top < elem.scrollHeight - elem.clientHeight);
Buffer.scrollTo(elem, null, top + number * increment); Buffer.scrollTo(elem, null, top + number * increment);
}, },

2
common/content/disable-acr.jsm
View File

@@ -57,7 +57,7 @@ function checkDocument(doc, disable, force) {
} }
function chromeDocuments() { function chromeDocuments() {
let windows = services.windowMediator.getXULWindowEnumerator(null); let windows = Services.wm.getXULWindowEnumerator(null);
while (windows.hasMoreElements()) { while (windows.hasMoreElements()) {
let window = windows.getNext().QueryInterface(Ci.nsIXULWindow); let window = windows.getNext().QueryInterface(Ci.nsIXULWindow);
for each (let type in ["typeChrome", "typeContent"]) { for each (let type in ["typeChrome", "typeContent"]) {

3
common/content/mappings.js
View File

@@ -477,7 +477,8 @@ var Mappings = Module("mappings", {
return; return;
} }
if (args[1] && !args["-count"] && !args["-ex"] && !args["-javascript"]) if (args[1] && !/^<nop>$/i.test(args[1])
&& !args["-count"] && !args["-ex"] && !args["-javascript"])
args[1] = "<count>" + args[1]; args[1] = "<count>" + args[1];
let [lhs, rhs] = args; let [lhs, rhs] = args;