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

Support marks on frameset pages.

Browse Source
This commit is contained in:
Kris Maglione
2010-10-03 14:20:28 -04:00
parent c577b15ea6
commit 5c81791183
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/content/buffer.js
View File

@@ -1107,7 +1107,11 @@ const Buffer = Module("buffer", {
}, },
findScrollableWindow: function findScrollableWindow() { findScrollableWindow: function findScrollableWindow() {
let win = window.document.commandDispatcher.focusedWindow; let win = buffer.focusedFrame;
if (win && (win.scrollMaxX > 0 || win.scrollMaxY > 0))
return win;
win = window.document.commandDispatcher.focusedWindow;
if (win && (win.scrollMaxX > 0 || win.scrollMaxY > 0)) if (win && (win.scrollMaxX > 0 || win.scrollMaxY > 0))
return win; return win;

12
common/content/marks.js
View File

@@ -36,8 +36,7 @@ const Marks = Module("marks", {
return lmarks.concat(umarks).sort(function (a, b) String.localeCompare(a[0], b[0])); return lmarks.concat(umarks).sort(function (a, b) String.localeCompare(a[0], b[0]));
}, },
// FIXME: Frameset get localURI() buffer.focusedFrame.document.documentURI,
get localURI() window.content.document.documentURI,
/** /**
* Add a named mark for the current buffer, at its current position. * Add a named mark for the current buffer, at its current position.
@@ -49,17 +48,10 @@ const Marks = Module("marks", {
* @param {string} mark The mark name. * @param {string} mark The mark name.
* @param {boolean} silent Whether to output error messages. * @param {boolean} silent Whether to output error messages.
*/ */
// TODO: add support for frameset pages
add: function (mark, silent) { add: function (mark, silent) {
let win = window.content; let win = buffer.focusedFrame;
let doc = win.document; let doc = win.document;
if (doc.body && doc.body instanceof HTMLFrameSetElement) {
if (!silent)
dactyl.echoerr("Marks support for frameset pages not implemented yet");
return;
}
let x = win.scrollMaxX ? win.pageXOffset / win.scrollMaxX : 0; let x = win.scrollMaxX ? win.pageXOffset / win.scrollMaxX : 0;
let y = win.scrollMaxY ? win.pageYOffset / win.scrollMaxY : 0; let y = win.scrollMaxY ? win.pageYOffset / win.scrollMaxY : 0;
let position = { x: x, y: y }; let position = { x: x, y: y };