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

Fix some quirks in new scrolling code.

Browse Source
This commit is contained in:
Kris Maglione
2009-10-08 15:39:48 -04:00
parent ff8bd7467e
commit 9235500752
2 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
common/content/buffer.js
View File

@@ -81,19 +81,29 @@ function Buffer() //{{{
return win; return win;
} }
function findScrollable(dir, horiz) function findScrollable(dir, horizontal)
{ {
let pos = "scrollTop", size = "clientHeight", max = "scrollHeight"; let pos = "scrollTop", size = "clientHeight", max = "scrollHeight", overflow = "overflowX",
if (horiz) border1 = "borderTopWidth", border2 = "borderBottomWidth";
pos = "scrollLeft", size = "clientWidth", max = "scrollWidth"; if (horizontal)
pos = "scrollLeft", size = "clientWidth", max = "scrollWidth", overflow = "overflowX",
border1 = "borderLeftWidth", border2 = "borderRightWidth";
function find(elem) function find(elem)
{ {
for (; elem && elem.parentNode instanceof Element; elem = elem.parentNode) for (; elem && elem.parentNode instanceof Element; elem = elem.parentNode)
if (dir < 0 && elem[pos] > 0 || dir > 0 && elem[pos] + elem[size] < elem[max]) {
let size = elem[size];
let style = util.computedStyle(elem);
// Stupid Gecko eccentricities. May fail for quirks mode documents.
if (style[overflow] == "hidden")
size += parseInt(style[border1]) + style[border2];
if (dir < 0 && elem[pos] > 0 || dir > 0 && elem[pos] + size < elem[max])
break; break;
}
return elem; return elem;
} }
if (content.getSelection().rangeCount) if (content.getSelection().rangeCount)
var elem = find(content.getSelection().getRangeAt(0).startContainer); var elem = find(content.getSelection().getRangeAt(0).startContainer);
if (!(elem instanceof Element)) if (!(elem instanceof Element))
@@ -106,36 +116,36 @@ function Buffer() //{{{
return elem; return elem;
} }
function scrollVert(elem, type, num) function scrollVertical(elem, increment, number)
{ {
elem = elem || findScrollable(num, false); elem = elem || findScrollable(number, false);
let fontSize = parseInt(util.computedStyle(elem).fontSize); let fontSize = parseInt(util.computedStyle(elem).fontSize);
let increment; let increment;
if (type == "lines") if (increment == "lines")
increment = fontSize; increment = fontSize;
else if (type == "pages") else if (increment == "pages")
increment = elem.clientHeight - fontSize; increment = elem.clientHeight - fontSize;
else else
throw Error() throw Error()
elem.scrollTop += num * increment; elem.scrollTop += number * increment;
} }
function scrollHoriz(elem, type, num) function scrollHorizontal(elem, increment, number)
{ {
elem = elem || findScrollable(num, true); elem = elem || findScrollable(number, true);
let fontSize = parseInt(util.computedStyle(elem).fontSize); let fontSize = parseInt(util.computedStyle(elem).fontSize);
let increment; let increment;
if (type == "columns") if (increment == "columns")
increment = fontSize; // Good enough, I suppose. increment = fontSize; // Good enough, I suppose.
else if (type == "pages") else if (increment == "pages")
increment = elem.clientWidth - fontSize; increment = elem.clientWidth - fontSize;
else else
throw Error() throw Error()
elem.scrollLeft += num * increment; elem.scrollLeft += number * increment;
} }
function scrollElemToPercentiles(elem, horizontal, vertical) function scrollElemToPercent(elem, horizontal, vertical)
{ {
elem = elem || findScrollable(); elem = elem || findScrollable();
marks.add("'", true); marks.add("'", true);
@@ -147,7 +157,7 @@ function Buffer() //{{{
elem.scrollTop = (elem.scrollHeight - elem.clientHeight) * (vertical / 100); elem.scrollTop = (elem.scrollHeight - elem.clientHeight) * (vertical / 100);
} }
function scrollToPercentiles(horizontal, vertical) function scrollToPercent(horizontal, vertical)
{ {
let win = findScrollableWindow(); let win = findScrollableWindow();
let h, v; let h, v;
@@ -293,12 +303,12 @@ function Buffer() //{{{
mappings.add(myModes, ["gg", "<Home>"], mappings.add(myModes, ["gg", "<Home>"],
"Go to the top of the document", "Go to the top of the document",
function (count) { buffer.scrollToPercentiles(buffer.scrollXPercent, Math.max(count, 0)); }, function (count) { buffer.scrollToPercent(buffer.scrollXPercent, Math.max(count, 0)); },
{ count: true }); { count: true });
mappings.add(myModes, ["G", "<End>"], mappings.add(myModes, ["G", "<End>"],
"Go to the end of the document", "Go to the end of the document",
function (count) { buffer.scrollToPercentiles(buffer.scrollXPercent, count >= 0 ? count : 100); }, function (count) { buffer.scrollToPercent(buffer.scrollXPercent, count >= 0 ? count : 100); },
{ count: true }); { count: true });
mappings.add(myModes, ["%"], mappings.add(myModes, ["%"],
@@ -306,7 +316,7 @@ function Buffer() //{{{
function (count) function (count)
{ {
if (count > 0 && count <= 100) if (count > 0 && count <= 100)
buffer.scrollToPercentiles(buffer.scrollXPercent, count); buffer.scrollToPercent(buffer.scrollXPercent, count);
else else
liberator.beep(); liberator.beep();
}, },
@@ -1324,7 +1334,7 @@ function Buffer() //{{{
*/ */
scrollBottom: function () scrollBottom: function ()
{ {
scrollToPercentiles(null, 100); scrollToPercent(null, 100);
}, },
/** /**
@@ -1335,7 +1345,7 @@ function Buffer() //{{{
*/ */
scrollColumns: function (cols) scrollColumns: function (cols)
{ {
scrollHoriz(null, "columns", cols); scrollHorizontal(null, "columns", cols);
}, },
/** /**
@@ -1343,7 +1353,7 @@ function Buffer() //{{{
*/ */
scrollEnd: function () scrollEnd: function ()
{ {
scrollToPercentiles(100, null); scrollToPercent(100, null);
}, },
/** /**
@@ -1354,7 +1364,7 @@ function Buffer() //{{{
*/ */
scrollLines: function (lines) scrollLines: function (lines)
{ {
scrollVert(null, "lines", lines); scrollVertical(null, "lines", lines);
}, },
/** /**
@@ -1365,7 +1375,7 @@ function Buffer() //{{{
*/ */
scrollPages: function (pages) scrollPages: function (pages)
{ {
scrollVert(null, "pages", pages); scrollVertical(null, "pages", pages);
}, },
/** /**
@@ -1396,9 +1406,9 @@ function Buffer() //{{{
* @param {number} x The horizontal page percentile. * @param {number} x The horizontal page percentile.
* @param {number} y The vertical page percentile. * @param {number} y The vertical page percentile.
*/ */
scrollToPercentiles: function (x, y) scrollToPercent: function (x, y)
{ {
scrollToPercentiles(x, y); scrollToPercent(x, y);
}, },
/** /**
@@ -1418,7 +1428,7 @@ function Buffer() //{{{
*/ */
scrollStart: function () scrollStart: function ()
{ {
scrollToPercentiles(0, null); scrollToPercent(0, null);
}, },
/** /**
@@ -1426,7 +1436,7 @@ function Buffer() //{{{
*/ */
scrollTop: function () scrollTop: function ()
{ {
scrollToPercentiles(null, 0); scrollToPercent(null, 0);
}, },
// TODO: allow callback for filtering out unwanted frames? User defined? // TODO: allow callback for filtering out unwanted frames? User defined?
@@ -1661,7 +1671,7 @@ function Marks() //{{{
{ {
if (win && win.location.href == mark.location) if (win && win.location.href == mark.location)
{ {
buffer.scrollToPercentiles(mark.position.x * 100, mark.position.y * 100); buffer.scrollToPercent(mark.position.x * 100, mark.position.y * 100);
pendingJumps.splice(i, 1); pendingJumps.splice(i, 1);
return; return;
} }
@@ -1970,7 +1980,7 @@ function Marks() //{{{
return; return;
} }
liberator.log("Jumping to URL mark: " + markToString(mark, slice), 5); liberator.log("Jumping to URL mark: " + markToString(mark, slice), 5);
buffer.scrollToPercentiles(slice.position.x * 100, slice.position.y * 100); buffer.scrollToPercent(slice.position.x * 100, slice.position.y * 100);
ok = true; ok = true;
} }
} }
@@ -1985,7 +1995,7 @@ function Marks() //{{{
if (win.location.href == lmark.location) if (win.location.href == lmark.location)
{ {
liberator.log("Jumping to local mark: " + markToString(mark, lmark), 5); liberator.log("Jumping to local mark: " + markToString(mark, lmark), 5);
buffer.scrollToPercentiles(lmark.position.x * 100, lmark.position.y * 100); buffer.scrollToPercent(lmark.position.x * 100, lmark.position.y * 100);
ok = true; ok = true;
break; break;
} }

5
common/content/liberator.js
View File

@@ -1075,10 +1075,13 @@ const liberator = (function () //{{{
* *
* @param {string|Object} msg The message to print. * @param {string|Object} msg The message to print.
*/ */
dump: function (msg) dump: function ()
{ {
let msg = Array.map(arguments, function (msg) {
if (typeof msg == "object") if (typeof msg == "object")
msg = util.objectToString(msg); msg = util.objectToString(msg);
return msg;
}).join(", ");
msg = String.replace(msg, /\n?$/, "\n"); msg = String.replace(msg, /\n?$/, "\n");
window.dump(msg.replace(/^./gm, ("config" in modules && config.name.toLowerCase()) + ": $&")); window.dump(msg.replace(/^./gm, ("config" in modules && config.name.toLowerCase()) + ": $&"));
}, },