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

Merge branch 'master' of https://github.com/ajaxorg/ace

Browse source 
Conflicts:
	plugins/cockpit/cli.js
	plugins/cockpit/lib/ui/plain.js
	plugins/cockpit/ui/plain.css
	plugins/cockpit/ui/plain.js
	plugins/pilot/canon.js
	plugins/pilot/lib/commands/history.js
This commit is contained in:
Joe Walker 2010-12-15 19:46:40 +00:00
commit 0f505962d0
126 changed files with 3375 additions and 3518 deletions
Download patch file Download diff file Expand all files Collapse all files

5
demo/boot.js
View file

@ -96,7 +96,8 @@ var setupPlugins = function(config, callback) {
for (i = 0; i < packages.length; i++) {
location.push({
name: packages[i],
main: "index"
main: "index",
lib: "."
});
knownPlugins.push(packages[i]);
}
@ -113,7 +114,7 @@ var setupPlugins = function(config, callback) {
packagePaths: pluginPackageInfo,
paths: paths
});
require(["pilot/plugin_manager", "pilot/settings"], function() {
require(["pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings"], function() {
var pluginsModule = require("pilot/plugin_manager");
var settings = require("pilot/settings").settings;
var catalog = pluginsModule.catalog;