jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

separation of rows and cli, more refactoring for new world, copying images from skywriter

Browse source
This commit is contained in:
Joe Walker 2010-12-12 17:01:45 +00:00
commit 15fddc071c
19 changed files with 334 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

39
plugins/pilot/lib/canon.js
View file

@ -160,7 +160,8 @@ function getCommandNames() {
* everything it needs to about the command params
* @param command Either a command, or the name of one
*/
function exec(command, args) {
function exec(command, args, typed) {
// TODO: Use requisition.toString rather than 'typed'
if (typeof command === 'string') {
command = commands[command];
}
@ -171,7 +172,12 @@ function exec(command, args) {
// TODO: Ugg. really?
env.selection = env.editor.getSelection();
var request = new Request();
var request = new Request({
command: command,
args: args,
typed: typed
});
command.exec(env, args || {}, request);
return true;
};
@ -216,21 +222,6 @@ var requests = [];
*/
var maxRequestLength = 100;
/**
* Called by Request instances when some output (or a cell to async() happens)
*/
function addRequestOutput(request) {
requests.push(request);
// This could probably be optimized with some maths, but 99.99% of the
// time we will only be off by one, and I'm feeling lazy.
while (requests.length > maxRequestLength) {
requests.shiftObject();
}
exports._dispatchEvent('output', { requests: requests });
};
exports.addRequestOutput = addRequestOutput;
/**
* To create an invocation, you need to do something like this (all the ctor
* args are optional):
@ -249,7 +240,6 @@ function Request(options) {
// Will be used in the keyboard case and the cli case
this.command = options.command;
this.commandExt = options.commandExt;
// Will be used only in the cli case
this.args = options.args;
@ -274,7 +264,14 @@ Request.prototype._beginOutput = function() {
this._begunOutput = true;
this.outputs = [];
exports.addRequestOutput(this);
requests.push(this);
// This could probably be optimized with some maths, but 99.99% of the
// time we will only be off by one, and I'm feeling lazy.
while (requests.length > maxRequestLength) {
requests.shiftObject();
}
exports._dispatchEvent('output', { requests: requests, request: this });
};
/**
@ -311,7 +308,7 @@ Request.prototype.output = function(content) {
}
this.outputs.push(content);
this._dispatchEvent('changed', {});
this._dispatchEvent('output', {});
return this;
};
@ -329,7 +326,7 @@ Request.prototype.done = function(content) {
this.output(content);
}
this._dispatchEvent('changed', {});
this._dispatchEvent('output', {});
};
exports.Request = Request;