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

Merge commit '6808e3bb35'

Browse source 
Conflicts:
	.gitmodules
	Makefile.dryice.js
	demo/demo.js
	demo/kitchen-sink/boot.js
	kitchen-sink.html
	lib/ace/commands/default_commands.js
	lib/ace/test/tests.html
	package.json
	support/pilot
This commit is contained in:
Fabian Jakobs 2011-11-02 13:25:32 +01:00
commit 62a3b4edf5
18 changed files with 704 additions and 808 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile.dryice.js
View file

@ -297,7 +297,7 @@ console.log('# ace worker ---------');
aceHome + "/lib/ace/worker/worker.js",
worker
],
filter: [ copy.filter.uglifyjs, filterTextPlugin ],
filter: [ filterTextPlugin, copy.filter.uglifyjs ],
dest: "build/src/worker-" + mode + ".js"
});
});
@ -349,7 +349,7 @@ function demo() {
source: [
copy.source.commonjs({
project: project,
require: [ "pilot/index", "ace/defaults", "demo/kitchen-sink/boot" ]
require: [ "demo/kitchen-sink/demo" ]
})
],
filter: [ copy.filter.moduleDefines ],