This commit is contained in:
Fabian Jakobs 2011-11-10 18:18:40 +01:00
commit 25caf6b3bf
7 changed files with 212 additions and 29 deletions

View file

@ -150,7 +150,14 @@ var lookup = function(parentId, moduleName) {
if (typeof module === 'function') {
var exports = {};
module(_require.bind(this, moduleName), exports, { id: moduleName, uri: '' });
var mod = {
id: moduleName,
uri: '',
exports: exports
}
var returnValue = module(_require.bind(this, moduleName), exports, mod);
exports = returnValue || mod.exports;
// cache the resulting module object for next time
define.modules[moduleName] = exports;
return exports;
@ -11064,6 +11071,22 @@ var CommandManager = function(commands) {
this._buildKeyHash(command);
}
};
function removeCommand(command) {
var name = (typeof command === 'string' ? command : command.name);
command = this.commands[name];
delete commands[name];
// exaustive search is a little bit brute force but since removeCommand is
// not a performance critical operation this should be OK
var ckb = this.commmandKeyBinding;
for (var hashId in ckb) {
for (var key in ckb[hashId]) {
if (ckb[hashId][key] == command)
delete ckb[hashId][key];
}
}
};
var platform = useragent.isMac ? "mac" : "win";
@ -11182,7 +11205,7 @@ var CursorLayer = require("./layer/cursor").Cursor;
var ScrollBar = require("./scrollbar").ScrollBar;
var RenderLoop = require("./renderloop").RenderLoop;
var EventEmitter = require("./lib/event_emitter").EventEmitter;
var editorCss = require("text!./css/editor.css");
var editorCss = require("text!ace/css/editor.css");
var VirtualRenderer = function(container, theme) {
this.container = container;
@ -11190,6 +11213,11 @@ var VirtualRenderer = function(container, theme) {
// Imports CSS once per DOM document ('ace_editor' serves as an identifier).
dom.importCssString(editorCss, "ace_editor", container.ownerDocument);
dom.addCssClass(this.container, "ace_editor");
// Chrome has some strange rendering issues if this is not done async
setTimeout(function() {
dom.addCssClass(this.container, "ace_editor");
}.bind(this), 0)
this.setTheme(theme);

File diff suppressed because one or more lines are too long

View file

@ -11,7 +11,7 @@
Ace
version 0.2.0
commit fa7ccc347335799124cd35910b6f0cba7f484506
commit 09861873002375a05d7ce6099ddc68ac3c90896f
-->

View file

@ -150,7 +150,14 @@ var lookup = function(parentId, moduleName) {
if (typeof module === 'function') {
var exports = {};
module(_require.bind(this, moduleName), exports, { id: moduleName, uri: '' });
var mod = {
id: moduleName,
uri: '',
exports: exports
}
var returnValue = module(_require.bind(this, moduleName), exports, mod);
exports = returnValue || mod.exports;
// cache the resulting module object for next time
define.modules[moduleName] = exports;
return exports;
@ -10520,6 +10527,22 @@ var CommandManager = function(commands) {
this._buildKeyHash(command);
}
};
function removeCommand(command) {
var name = (typeof command === 'string' ? command : command.name);
command = this.commands[name];
delete commands[name];
// exaustive search is a little bit brute force but since removeCommand is
// not a performance critical operation this should be OK
var ckb = this.commmandKeyBinding;
for (var hashId in ckb) {
for (var key in ckb[hashId]) {
if (ckb[hashId][key] == command)
delete ckb[hashId][key];
}
}
};
var platform = useragent.isMac ? "mac" : "win";
@ -10731,7 +10754,7 @@ var CursorLayer = require("./layer/cursor").Cursor;
var ScrollBar = require("./scrollbar").ScrollBar;
var RenderLoop = require("./renderloop").RenderLoop;
var EventEmitter = require("./lib/event_emitter").EventEmitter;
var editorCss = require("text!./css/editor.css");
var editorCss = require("text!ace/css/editor.css");
var VirtualRenderer = function(container, theme) {
this.container = container;
@ -10739,6 +10762,11 @@ var VirtualRenderer = function(container, theme) {
// Imports CSS once per DOM document ('ace_editor' serves as an identifier).
dom.importCssString(editorCss, "ace_editor", container.ownerDocument);
dom.addCssClass(this.container, "ace_editor");
// Chrome has some strange rendering issues if this is not done async
setTimeout(function() {
dom.addCssClass(this.container, "ace_editor");
}.bind(this), 0)
this.setTheme(theme);
@ -13215,7 +13243,7 @@ exports.cssText = ".ace-tm .ace_editor {\
*
* ***** END LICENSE BLOCK ***** */
define('pilot/index', ['require', 'exports', 'module' , 'pilot/browser_focus', 'pilot/dom', 'pilot/event', 'pilot/event_emitter', 'pilot/fixoldbrowsers', 'pilot/keys', 'pilot/lang', 'pilot/oop', 'pilot/useragent'], function(require, exports, module) {
define('pilot/index', ['require', 'exports', 'module' , 'pilot/browser_focus', 'pilot/dom', 'pilot/event', 'pilot/event_emitter', 'pilot/fixoldbrowsers', 'pilot/keys', 'pilot/lang', 'pilot/oop', 'pilot/useragent', 'pilot/canon'], function(require, exports, module) {
require("pilot/browser_focus");
require("pilot/dom");
require("pilot/event");
@ -13225,6 +13253,7 @@ define('pilot/index', ['require', 'exports', 'module' , 'pilot/browser_focus', '
require("pilot/lang");
require("pilot/oop");
require("pilot/useragent");
require("pilot/canon");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13266,7 +13295,7 @@ define('pilot/index', ['require', 'exports', 'module' , 'pilot/browser_focus', '
define('pilot/browser_focus', ['require', 'exports', 'module' , 'ace/lib/browser_focus'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/browser_focus' is deprecated. Use 'ace/lib/browser_focus' instead");
return require("ace/lib/browser_focus");
module.exports = require("ace/lib/browser_focus");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13308,7 +13337,7 @@ define('pilot/browser_focus', ['require', 'exports', 'module' , 'ace/lib/browser
define('pilot/dom', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/dom' is deprecated. Use 'ace/lib/dom' instead");
return require("ace/lib/dom");
module.exports = require("ace/lib/dom");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13350,7 +13379,7 @@ define('pilot/dom', ['require', 'exports', 'module' , 'ace/lib/dom'], function(r
define('pilot/event', ['require', 'exports', 'module' , 'ace/lib/event'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/event' is deprecated. Use 'ace/lib/event' instead");
return require("ace/lib/event");
module.exports = require("ace/lib/event");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13392,7 +13421,7 @@ define('pilot/event', ['require', 'exports', 'module' , 'ace/lib/event'], functi
define('pilot/event_emitter', ['require', 'exports', 'module' , 'ace/lib/event_emitter'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/event_emitter' is deprecated. Use 'ace/lib/event_emitter' instead");
return require("ace/lib/event_emitter");
module.exports = require("ace/lib/event_emitter");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13434,7 +13463,7 @@ define('pilot/event_emitter', ['require', 'exports', 'module' , 'ace/lib/event_e
define('pilot/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/fixoldbrowsers'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/fixoldbrowsers' is deprecated. Use 'ace/lib/fixoldbrowsers' instead");
return require("ace/lib/fixoldbrowsers");
module.exports = require("ace/lib/fixoldbrowsers");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13476,7 +13505,7 @@ define('pilot/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/fixold
define('pilot/keys', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/keys' is deprecated. Use 'ace/lib/keys' instead");
return require("ace/lib/keys");
module.exports = require("ace/lib/keys");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13518,7 +13547,7 @@ define('pilot/keys', ['require', 'exports', 'module' , 'ace/lib/keys'], function
define('pilot/lang', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/lang' is deprecated. Use 'ace/lib/lang' instead");
return require("ace/lib/lang");
module.exports = require("ace/lib/lang");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13560,7 +13589,7 @@ define('pilot/lang', ['require', 'exports', 'module' , 'ace/lib/lang'], function
define('pilot/oop', ['require', 'exports', 'module' , 'ace/lib/oop'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/oop' is deprecated. Use 'ace/lib/oop' instead");
return require("ace/lib/oop");
module.exports = require("ace/lib/oop");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13602,7 +13631,59 @@ define('pilot/oop', ['require', 'exports', 'module' , 'ace/lib/oop'], function(r
define('pilot/useragent', ['require', 'exports', 'module' , 'ace/lib/useragent'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/useragent' is deprecated. Use 'ace/lib/useragent' instead");
return require("ace/lib/useragent");
module.exports = require("ace/lib/useragent");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Ajax.org Code Editor (ACE).
*
* The Initial Developer of the Original Code is
* Ajax.org B.V.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Fabian Jakobs <fabian AT ajax DOT org>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
define('pilot/canon', ['require', 'exports', 'module' ], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/canon' is deprecated.");
//return require("ace/lib/dom");
exports.addCommand = function() {
console.warn("DEPRECATED: 'canon.addCommand()' is deprecated. Use 'editor.commands.addCommand(command)' instead.");
console.trace();
}
exports.removeCommand = function() {
console.warn("DEPRECATED: 'canon.removeCommand()' is deprecated. Use 'editor.commands.removeCommand(command)' instead.");
console.trace();
}
});
define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
"\n" +

File diff suppressed because one or more lines are too long

View file

@ -10489,6 +10489,22 @@ var CommandManager = function(commands) {
this._buildKeyHash(command);
}
};
function removeCommand(command) {
var name = (typeof command === 'string' ? command : command.name);
command = this.commands[name];
delete commands[name];
// exaustive search is a little bit brute force but since removeCommand is
// not a performance critical operation this should be OK
var ckb = this.commmandKeyBinding;
for (var hashId in ckb) {
for (var key in ckb[hashId]) {
if (ckb[hashId][key] == command)
delete ckb[hashId][key];
}
}
};
var platform = useragent.isMac ? "mac" : "win";
@ -10700,7 +10716,7 @@ var CursorLayer = require("./layer/cursor").Cursor;
var ScrollBar = require("./scrollbar").ScrollBar;
var RenderLoop = require("./renderloop").RenderLoop;
var EventEmitter = require("./lib/event_emitter").EventEmitter;
var editorCss = require("text!./css/editor.css");
var editorCss = require("text!ace/css/editor.css");
var VirtualRenderer = function(container, theme) {
this.container = container;
@ -10708,6 +10724,11 @@ var VirtualRenderer = function(container, theme) {
// Imports CSS once per DOM document ('ace_editor' serves as an identifier).
dom.importCssString(editorCss, "ace_editor", container.ownerDocument);
dom.addCssClass(this.container, "ace_editor");
// Chrome has some strange rendering issues if this is not done async
setTimeout(function() {
dom.addCssClass(this.container, "ace_editor");
}.bind(this), 0)
this.setTheme(theme);
@ -13184,7 +13205,7 @@ exports.cssText = ".ace-tm .ace_editor {\
*
* ***** END LICENSE BLOCK ***** */
__ace_shadowed__.define('pilot/index', ['require', 'exports', 'module' , 'pilot/browser_focus', 'pilot/dom', 'pilot/event', 'pilot/event_emitter', 'pilot/fixoldbrowsers', 'pilot/keys', 'pilot/lang', 'pilot/oop', 'pilot/useragent'], function(require, exports, module) {
__ace_shadowed__.define('pilot/index', ['require', 'exports', 'module' , 'pilot/browser_focus', 'pilot/dom', 'pilot/event', 'pilot/event_emitter', 'pilot/fixoldbrowsers', 'pilot/keys', 'pilot/lang', 'pilot/oop', 'pilot/useragent', 'pilot/canon'], function(require, exports, module) {
require("pilot/browser_focus");
require("pilot/dom");
require("pilot/event");
@ -13194,6 +13215,7 @@ __ace_shadowed__.define('pilot/index', ['require', 'exports', 'module' , 'pilot/
require("pilot/lang");
require("pilot/oop");
require("pilot/useragent");
require("pilot/canon");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13235,7 +13257,7 @@ __ace_shadowed__.define('pilot/index', ['require', 'exports', 'module' , 'pilot/
__ace_shadowed__.define('pilot/browser_focus', ['require', 'exports', 'module' , 'ace/lib/browser_focus'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/browser_focus' is deprecated. Use 'ace/lib/browser_focus' instead");
return require("ace/lib/browser_focus");
module.exports = require("ace/lib/browser_focus");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13277,7 +13299,7 @@ __ace_shadowed__.define('pilot/browser_focus', ['require', 'exports', 'module' ,
__ace_shadowed__.define('pilot/dom', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/dom' is deprecated. Use 'ace/lib/dom' instead");
return require("ace/lib/dom");
module.exports = require("ace/lib/dom");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13319,7 +13341,7 @@ __ace_shadowed__.define('pilot/dom', ['require', 'exports', 'module' , 'ace/lib/
__ace_shadowed__.define('pilot/event', ['require', 'exports', 'module' , 'ace/lib/event'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/event' is deprecated. Use 'ace/lib/event' instead");
return require("ace/lib/event");
module.exports = require("ace/lib/event");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13361,7 +13383,7 @@ __ace_shadowed__.define('pilot/event', ['require', 'exports', 'module' , 'ace/li
__ace_shadowed__.define('pilot/event_emitter', ['require', 'exports', 'module' , 'ace/lib/event_emitter'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/event_emitter' is deprecated. Use 'ace/lib/event_emitter' instead");
return require("ace/lib/event_emitter");
module.exports = require("ace/lib/event_emitter");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13403,7 +13425,7 @@ __ace_shadowed__.define('pilot/event_emitter', ['require', 'exports', 'module' ,
__ace_shadowed__.define('pilot/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/fixoldbrowsers'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/fixoldbrowsers' is deprecated. Use 'ace/lib/fixoldbrowsers' instead");
return require("ace/lib/fixoldbrowsers");
module.exports = require("ace/lib/fixoldbrowsers");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13445,7 +13467,7 @@ __ace_shadowed__.define('pilot/fixoldbrowsers', ['require', 'exports', 'module'
__ace_shadowed__.define('pilot/keys', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/keys' is deprecated. Use 'ace/lib/keys' instead");
return require("ace/lib/keys");
module.exports = require("ace/lib/keys");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13487,7 +13509,7 @@ __ace_shadowed__.define('pilot/keys', ['require', 'exports', 'module' , 'ace/lib
__ace_shadowed__.define('pilot/lang', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/lang' is deprecated. Use 'ace/lib/lang' instead");
return require("ace/lib/lang");
module.exports = require("ace/lib/lang");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13529,7 +13551,7 @@ __ace_shadowed__.define('pilot/lang', ['require', 'exports', 'module' , 'ace/lib
__ace_shadowed__.define('pilot/oop', ['require', 'exports', 'module' , 'ace/lib/oop'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/oop' is deprecated. Use 'ace/lib/oop' instead");
return require("ace/lib/oop");
module.exports = require("ace/lib/oop");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
@ -13571,7 +13593,59 @@ __ace_shadowed__.define('pilot/oop', ['require', 'exports', 'module' , 'ace/lib/
__ace_shadowed__.define('pilot/useragent', ['require', 'exports', 'module' , 'ace/lib/useragent'], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/useragent' is deprecated. Use 'ace/lib/useragent' instead");
return require("ace/lib/useragent");
module.exports = require("ace/lib/useragent");
});
/* vim:ts=4:sts=4:sw=4:
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Ajax.org Code Editor (ACE).
*
* The Initial Developer of the Original Code is
* Ajax.org B.V.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Fabian Jakobs <fabian AT ajax DOT org>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
__ace_shadowed__.define('pilot/canon', ['require', 'exports', 'module' ], function(require, exports, module) {
console.warn("DEPRECATED: 'pilot/canon' is deprecated.");
//return require("ace/lib/dom");
exports.addCommand = function() {
console.warn("DEPRECATED: 'canon.addCommand()' is deprecated. Use 'editor.commands.addCommand(command)' instead.");
console.trace();
}
exports.removeCommand = function() {
console.warn("DEPRECATED: 'canon.removeCommand()' is deprecated. Use 'editor.commands.removeCommand(command)' instead.");
console.trace();
}
});
__ace_shadowed__.define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
"\n" +

File diff suppressed because one or more lines are too long