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

Merge remote branch 'upstream/master' into requirejs

Browse source 
Conflicts:
	demo/boot.js
	package.json
This commit is contained in:
Irakli Gozalishvili 2011-01-27 17:41:57 +01:00
commit cb67070b67
75 changed files with 9644 additions and 514 deletions
Download patch file Download diff file Expand all files Collapse all files

4
demo/boot.js
View file

@ -49,10 +49,12 @@ var config = {
var deps = [ "pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings",
"pilot/environment", "demo/startup" ];
var plugins = [ "pilot/index", "cockpit/index", "ace/defaults" ];
require(config);
require(deps, function() {
var catalog = require("pilot/plugin_manager").catalog;
catalog.registerPlugins([ "pilot/index", "cockpit/index" ]).then(function() {
catalog.registerPlugins(plugins).then(function() {
var env = require("pilot/environment").create();
catalog.startupPlugins({ env: env }).then(function() {
require("demo/startup").launch(env);