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

More lazy instantiation. Look out for breakage.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-03 09:04:23 -05:00
parent 346cf2531a
commit 4a09c97eb1
10 changed files with 66 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/content/buffer.js
View File

@@ -1640,9 +1640,9 @@ var Buffer = Module("buffer", {
}; };
}, },
events: function () { events: function () {
events.addSessionListener(config.browser, "DOMContentLoaded", this.closure.onDOMContentLoaded, true); events.addSessionListener(config.browser, "DOMContentLoaded", buffer.closure.onDOMContentLoaded, true);
events.addSessionListener(config.browser, "load", this.closure.onPageLoad, true); events.addSessionListener(config.browser, "load", buffer.closure.onPageLoad, true);
events.addSessionListener(config.browser, "scroll", this.closure._updateBufferPosition, false); events.addSessionListener(config.browser, "scroll", buffer.closure._updateBufferPosition, false);
}, },
mappings: function () { mappings: function () {
var myModes = config.browserModes; var myModes = config.browserModes;

36
common/content/commands.js
View File

@@ -468,7 +468,7 @@ var Commands = Module("commands", {
_addCommand: function (args, replace) { _addCommand: function (args, replace) {
if (!args[3]) if (!args[3])
args[3] = {}; args[3] = {};
args[3].definedAt = commands.getCaller(Components.stack.caller.caller); args[3].definedAt = Commands.getCaller(Components.stack.caller.caller);
let names = array.flatten(Command.parseSpecs(args[0])); let names = array.flatten(Command.parseSpecs(args[0]));
args.parsedSpecs = names; args.parsedSpecs = names;
@@ -659,23 +659,6 @@ var Commands = Module("commands", {
return this._exCommands.filter(function (cmd) cmd.user); return this._exCommands.filter(function (cmd) cmd.user);
}, },
/**
* Returns a frame object describing the currently executing
* command, if applicable, otherwise returns the passed frame.
*
* @param {nsIStackFrame} frame
*/
getCaller: function (frame) {
if (io.sourcing)
return {
__proto__: frame,
filename: io.sourcing.file[0] == "[" ? io.sourcing.file :
services.io.newFileURI(File(io.sourcing.file)).spec,
lineNumber: io.sourcing.line
};
return frame;
},
/** /**
* Returns true if a command invocation contains a URL referring to the * Returns true if a command invocation contains a URL referring to the
* domain *host*. * domain *host*.
@@ -1179,6 +1162,23 @@ var Commands = Module("commands", {
delete this._exMap[name]; delete this._exMap[name];
} }
}, { }, {
/**
* Returns a frame object describing the currently executing
* command, if applicable, otherwise returns the passed frame.
*
* @param {nsIStackFrame} frame
*/
getCaller: function (frame) {
if (io.sourcing)
return {
__proto__: frame,
filename: io.sourcing.file[0] == "[" ? io.sourcing.file :
services.io.newFileURI(File(io.sourcing.file)).spec,
lineNumber: io.sourcing.line
};
return frame;
},
// returns [count, parsed_argument] // returns [count, parsed_argument]
parseArg: function parseArg(str, sep, keepQuotes) { parseArg: function parseArg(str, sep, keepQuotes) {
let arg = ""; let arg = "";

6
common/content/mappings.js
View File

@@ -172,7 +172,7 @@ var MapHive = Class("MapHive", {
extra = extra || {}; extra = extra || {};
let map = Map(modes, keys, description, action, extra); let map = Map(modes, keys, description, action, extra);
map.definedAt = commands.getCaller(Components.stack.caller); map.definedAt = Commands.getCaller(Components.stack.caller);
map.hive = this; map.hive = this;
if (this.name !== "builtin") if (this.name !== "builtin")
@@ -344,7 +344,7 @@ var Mappings = Module("mappings", {
*/ */
add: function () { add: function () {
let map = this.builtin.add.apply(this.builtin, arguments); let map = this.builtin.add.apply(this.builtin, arguments);
map.definedAt = commands.getCaller(Components.stack.caller); map.definedAt = Commands.getCaller(Components.stack.caller);
return map; return map;
}, },
@@ -361,7 +361,7 @@ var Mappings = Module("mappings", {
*/ */
addUserMap: function () { addUserMap: function () {
let map = this.user.add.apply(this.user, arguments); let map = this.user.add.apply(this.user, arguments);
map.definedAt = commands.getCaller(Components.stack.caller); map.definedAt = Commands.getCaller(Components.stack.caller);
return map; return map;
}, },

2
common/content/marks.js
View File

@@ -208,7 +208,7 @@ var Marks = Module("marks", {
events: function () { events: function () {
let appContent = document.getElementById("appcontent"); let appContent = document.getElementById("appcontent");
if (appContent) if (appContent)
events.addSessionListener(appContent, "load", this.closure._onPageLoad, true); events.addSessionListener(appContent, "load", marks.closure._onPageLoad, true);
}, },
mappings: function () { mappings: function () {
var myModes = config.browserModes; var myModes = config.browserModes;

4
common/content/options.js
View File

@@ -660,7 +660,7 @@ var Options = Module("options", {
if (!extraInfo) if (!extraInfo)
extraInfo = {}; extraInfo = {};
extraInfo.definedAt = commands.getCaller(Components.stack.caller); extraInfo.definedAt = Commands.getCaller(Components.stack.caller);
let name = names[0]; let name = names[0];
if (name in this._optionMap) { if (name in this._optionMap) {
@@ -973,7 +973,7 @@ var Options = Module("options", {
} }
if (res) if (res)
dactyl.echoerr(res); dactyl.echoerr(res);
option.setFrom = commands.getCaller(null); option.setFrom = Commands.getCaller(null);
} }
} }
flushList(); flushList();

2
common/content/tabs.js
View File

@@ -875,7 +875,7 @@ var Tabs = Module("tabs", {
} }
for (let event in values(["TabMove", "TabOpen", "TabClose"])) for (let event in values(["TabMove", "TabOpen", "TabClose"]))
events.addSessionListener(tabContainer, event, callback, false); events.addSessionListener(tabContainer, event, callback, false);
events.addSessionListener(tabContainer, "TabSelect", this.closure._onTabSelect, false); events.addSessionListener(tabContainer, "TabSelect", tabs.closure._onTabSelect, false);
}, },
mappings: function () { mappings: function () {
mappings.add([modes.NORMAL], ["g0", "g^"], mappings.add([modes.NORMAL], ["g0", "g^"],

3
common/modules/base.jsm
View File

@@ -147,6 +147,9 @@ defineModule.modules = [];
defineModule.times = { all: 0 }; defineModule.times = { all: 0 };
defineModule.time = function time(major, minor, func, self) { defineModule.time = function time(major, minor, func, self) {
let time = Date.now(); let time = Date.now();
if (typeof func !== "function")
func = self[func];
try { try {
var res = func.apply(self, Array.slice(arguments, 4)); var res = func.apply(self, Array.slice(arguments, 4));
} }

2
common/modules/completion.jsm
View File

@@ -844,7 +844,7 @@ var Completion = Module("completion", {
get setFunctionCompleter() JavaScript.setCompleter, // Backward compatibility get setFunctionCompleter() JavaScript.setCompleter, // Backward compatibility
Local: function (dactyl, modules, window) ({ Local: function (dactyl, modules, window) ({
options: modules.options, get options() modules.options,
// FIXME // FIXME
_runCompleter: function _runCompleter(name, filter, maxItems) { _runCompleter: function _runCompleter(name, filter, maxItems) {

2
common/modules/finder.jsm
View File

@@ -162,7 +162,7 @@ var RangeFinder = Module("rangefinder", {
}, { }, {
}, { }, {
modes: function (dactyl, modules, window) { modes: function (dactyl, modules, window) {
const { commandline, modes } = modules; const { modes } = modules;
modes.addMode("FIND", { modes.addMode("FIND", {
extended: true, extended: true,
description: "Find mode, active when typing search input", description: "Find mode, active when typing search input",

40
common/modules/overlay.jsm
View File

@@ -246,9 +246,11 @@ var Overlay = Module("Overlay", {
defineModule.loadLog.push(" from: " + util.fixURI(frame.filename) + ":" + frame.lineNumber); defineModule.loadLog.push(" from: " + util.fixURI(frame.filename) + ":" + frame.lineNumber);
delete modules[module.className]; delete modules[module.className];
// util.dump("INIT: " + module.className);
modules[module.className] = defineModule.time(module.className, "init", module); modules[module.className] = defineModule.time(module.className, "init", module);
frob(module.className);
init(modules[module.className]); // init(modules[module.className]);
} }
catch (e) { catch (e) {
util.dump("Loading " + (module && module.className) + ":"); util.dump("Loading " + (module && module.className) + ":");
@@ -257,16 +259,38 @@ var Overlay = Module("Overlay", {
return modules[module.className]; return modules[module.className];
} }
for each (let module in defineModule.modules) Module.list.forEach(function (mod) {
if (module.INIT.init) Object.keys(mod.prototype.INIT).forEach(function (name) {
defineModule.time(module.constructor.className, "init", deferredInit[name] = deferredInit[name] || [];
module.INIT.init, module, deferredInit[name].push(function () {
// util.dump("INIT: " + mod.className + ":" + name);
defineModule.time(mod.className, name,
name, mod.prototype.INIT,
modules.dactyl, modules, window); modules.dactyl, modules, window);
});
});
});
defineModule.modules.forEach(function (mod) {
Object.keys(mod.INIT).forEach(function (name) {
deferredInit[name] = deferredInit[name] || [];
deferredInit[name].push(function () {
// util.dump("INIT: " + mod.constructor.className + ":" + name);
defineModule.time(mod.constructor.className, name,
mod.INIT[name], mod,
modules.dactyl, modules, window);
});
});
});
defineModule.modules.map(init); function frob(name) {
(deferredInit[name] || []).forEach(call);
}
Module.list.forEach(load); frob("init");
deferredInit["load"].forEach(call); defineModule.modules.forEach(function (mod) { frob(mod.className); });
// Module.list.forEach(load);
frob("load");
modules.times = update({}, defineModule.times); modules.times = update({}, defineModule.times);
defineModule.loadLog.push("Loaded in " + (Date.now() - start) + "ms"); defineModule.loadLog.push("Loaded in " + (Date.now() - start) + "ms");