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

Allow specifying line numbers in 'editor'. Take advantage in <C-i> and view-source links.

Browse Source
This commit is contained in:
Kris Maglione
2010-12-09 21:37:21 -05:00
parent e339032fd2
commit c5a1291eac
4 changed files with 83 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
common/content/buffer.js
View File

@@ -964,33 +964,31 @@ const Buffer = Module("buffer", {
let doc = buffer.focusedFrame.document;
if (isArray(url)) {
let chrome = "chrome://global/content/viewSource.xul";
window.openDialog(chrome, "_blank", "all,dialog=no",
url[0], null, null, url[1]);
/* FIXME
let win = dactyl.open(chrome)[0];
while (win.document.documentURI != chrome)
util.threadYield(false, true);
win.arguments = [url[0], null, null, url[1]];
*/
return;
if (options.get("editor").has("l"))
this.viewSourceExternally(url[0] || doc, url[1]);
else {
let chrome = "chrome://global/content/viewSource.xul";
window.openDialog(chrome, "_blank", "all,dialog=no",
url[0], null, null, url[1]);
}
}
if (useExternalEditor)
this.viewSourceExternally(url || doc);
else {
url = url || doc.location.href;
const PREFIX = "view-source:";
if (url.indexOf(PREFIX) == 0)
url = url.substr(PREFIX.length);
else
url = PREFIX + url;
if (useExternalEditor)
this.viewSourceExternally(url || doc);
else {
url = url || doc.location.href;
const PREFIX = "view-source:";
if (url.indexOf(PREFIX) == 0)
url = url.substr(PREFIX.length);
else
url = PREFIX + url;
let sh = history.session;
if (sh[sh.index].URI.spec == url)
window.getWebNavigation().gotoIndex(sh.index);
else
dactyl.open(url, { hide: true });
let sh = history.session;
if (sh[sh.index].URI.spec == url)
window.getWebNavigation().gotoIndex(sh.index);
else
dactyl.open(url, { hide: true });
}
}
},
@@ -1011,8 +1009,8 @@ const Buffer = Module("buffer", {
viewSourceExternally: Class("viewSourceExternally",
XPCOM([Ci.nsIWebProgressListener, Ci.nsISupportsWeakReference]), {
init: function (doc, callback) {
this.callback = callback ||
function (file) editor.editFileExternally(file.path);
this.callback = callable(callback) ? callback :
function (file) editor.editFileExternally(file.path, callback);
let url = isString(doc) ? doc : doc.location.href;
let uri = util.newURI(url, charset);