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

Merge remote branch 'mozilla/master'

Browse source 
Conflicts:
	Makefile.dryice.js
	build_support/boot.js
	build_support/mini_require.js
	lib/ace/edit_session.js
	package.json
This commit is contained in:
Fabian Jakobs 2011-01-31 10:29:29 +01:00
commit 58dc601000
4 changed files with 208 additions and 1057 deletions
Download patch file Download diff file Expand all files Collapse all files

20
build_support/boot.js
View file

@ -35,21 +35,9 @@
*
* ***** END LICENSE BLOCK ***** */
// don't define it in a worker.
if (window.document) {
require("pilot/fixoldbrowsers");
require("pilot/settings");
var Event = require("pilot/event");
var Dom = require("pilot/dom");
var EditSession = require("ace/edit_session").EditSession;
var JavaScriptMode = require("ace/mode/javascript").Mode;
var UndoManager = require("ace/undomanager").UndoManager;
var Editor = require("ace/editor").Editor;
var Renderer = require("ace/virtual_renderer").VirtualRenderer;
var Theme = require("ace/theme/textmate");
var deps = [ "pilot/plugin_manager", "pilot/environment" ];
require(deps, function() {
var catalog = require("pilot/plugin_manager").catalog;
catalog.registerPlugins([ "pilot/index" ]);
@ -81,4 +69,4 @@ if (window.document) {
return editor;
}
};
}
}