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-20 10:44:05 +01:00
commit e1601f653d
233 changed files with 4721 additions and 18642 deletions
Download patch file Download diff file Expand all files Collapse all files

7
demo/boot.js
View file

@ -46,8 +46,11 @@ var config = {
]
};
require(config, ["pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings",
"pilot/environment", "demo/startup"], function() {
var deps = [ "pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings",
"pilot/environment", "demo/startup" ];
require(config);
require(deps, function() {
var catalog = require("pilot/plugin_manager").catalog;
catalog.registerPlugins([ "pilot/index", "cockpit/index" ]).then(function() {
var env = require("pilot/environment").create();