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

pass in the env to canon.execute to allow multiple editors

Browse source
This commit is contained in:
Fabian Jakobs 2010-12-14 11:36:21 +01:00
commit 5e0695b588
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ace/keybinding.js
View file

@ -56,7 +56,7 @@ var KeyBinding = function(element, editor, config) {
var commandName = (_self.config.reverse[hashId] || {})[(key var commandName = (_self.config.reverse[hashId] || {})[(key
|| String.fromCharCode(e.keyCode)).toLowerCase()]; || String.fromCharCode(e.keyCode)).toLowerCase()];
var success = canon.exec(commandName); var success = canon.exec(commandName, {editor: editor});
if (success) { if (success) {
return event.stopEvent(e); return event.stopEvent(e);
} }

8
plugins/cockpit/cli.js
View file

@ -244,8 +244,10 @@ exports.Assignment = Assignment;
* class * class
* @constructor * @constructor
*/ */
function Requisition() { function Requisition(env) {
this.env = env;
} }
Requisition.prototype = { Requisition.prototype = {
/** /**
* The command that we are about to execute. * The command that we are about to execute.
@ -377,7 +379,9 @@ exports.Requisition = Requisition;
* if not specified. * if not specified.
* @constructor * @constructor
*/ */
function CliRequisition(options) { function CliRequisition(env, options) {
Requisition.call(this, env);
if (options && options.flags) { if (options && options.flags) {
/** /**
* TODO: We were using a default of keyboard.buildFlags({ }); * TODO: We were using a default of keyboard.buildFlags({ });

6
plugins/pilot/canon.js
View file

@ -37,7 +37,6 @@
define(function(require, exports, module) { define(function(require, exports, module) {
var console = require('pilot/console'); var console = require('pilot/console');
var Trace = require('pilot/stacktrace').Trace; var Trace = require('pilot/stacktrace').Trace;
var oop = require('pilot/oop').oop; var oop = require('pilot/oop').oop;
@ -70,11 +69,8 @@ var commandExtensionSpec = {
indexOn: 'name' indexOn: 'name'
}; };
var env;
exports.startup = function(data, reason) { exports.startup = function(data, reason) {
// TODO: this is probably all kinds of evil, but we need something working // TODO: this is probably all kinds of evil, but we need something working
env = data.env;
catalog.addExtensionSpec(commandExtensionSpec); catalog.addExtensionSpec(commandExtensionSpec);
}; };
@ -160,7 +156,7 @@ exports.getCommandNames = function() {
* everything it needs to about the command params * everything it needs to about the command params
* @param command Either a command, or the name of one * @param command Either a command, or the name of one
*/ */
exports.exec = function(command, args) { exports.exec = function(command, env, args) {
if (typeof command === 'string') { if (typeof command === 'string') {
command = commands[command]; command = commands[command];
} }