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

Pass proper objects to -js autocommands rather than stringified imitations.

Browse Source
This commit is contained in:
Kris Maglione
2010-12-17 13:21:55 -05:00
parent 9fb3febe95
commit 556c5b1903
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/content/buffer.js
View File

@@ -160,15 +160,19 @@ const Buffer = Module("buffer", {
.replace(RegExp("(\\." + ext + ")?$"), "." + ext), title]);
},
_triggerLoadAutocmd: function _triggerLoadAutocmd(name, doc) {
_triggerLoadAutocmd: function _triggerLoadAutocmd(name, doc, uri) {
uri = uri || util.newURI(doc.location.href);
let args = {
url: doc.location.href,
url: { toString: function () uri.spec, valueOf: function () uri },
title: doc.title
};
if (dactyl.has("tabs")) {
args.tab = tabs.getContentIndex(doc) + 1;
args.doc = "tabs.getTab(" + (args.tab - 1) + ").linkedBrowser.contentDocument";
args.doc = {
valueOf: function () doc,
toString: function () "tabs.getTab(" + (args.tab - 1) + ").linkedBrowser.contentDocument"
};
}
autocommands.trigger(name, args);
@@ -243,7 +247,7 @@ const Buffer = Module("buffer", {
webProgress.DOMWindow.document.pageIsFullyLoaded = 0;
statusline.updateProgress(0);
autocommands.trigger("PageLoadPre", { url: buffer.URL });
buffer._triggerLoadAutocmd("PageLoadPre", webProgress.DOMWindow.document);
// don't reset mode if a frame of the frameset gets reloaded which
// is not the focused frame
@@ -295,7 +299,7 @@ const Buffer = Module("buffer", {
uri && uri.scheme === "dactyl" && webProgress.isLoadingDocument;
util.timeout(function () {
autocommands.trigger("LocationChange", { url: buffer.URL });
buffer._triggerLoadAutocmd("LocationChange", webProgress.DOMWindow ? webProgress.DOMWindow.document : content.document, uri);
});
// if this is not delayed we get the position of the old buffer