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

move pilot code back into Ace

Browse source 
Conflicts:

	.gitmodules
	Makefile.dryice.js
	build_support/editor_textarea.html
	demo/demo.js
	kitchen-sink.html
	lib/ace/edit_session_test.js
	lib/ace/mode/coffee.js
	lib/ace/mode/coffee_highlight_rules.js
	lib/ace/mode/css.js
	lib/ace/mode/javascript.js
	lib/ace/model/window.js
	lib/ace/mouse/default_handlers.js
	lib/ace/theme/clouds.js
	lib/ace/theme/clouds_midnight.js
	lib/ace/theme/cobalt.js
	lib/ace/theme/crimson_editor.js
	lib/ace/theme/dawn.js
	lib/ace/theme/eclipse.js
	lib/ace/theme/idle_fingers.js
	lib/ace/theme/kr_theme.js
	lib/ace/theme/merbivore.js
	lib/ace/theme/merbivore_soft.js
	lib/ace/theme/mono_industrial.js
	lib/ace/theme/monokai.js
	lib/ace/theme/pastel_on_dark.js
	lib/ace/theme/solarized_dark.js
	lib/ace/theme/solarized_light.js
	lib/ace/theme/textmate.js
	lib/ace/theme/twilight.js
	lib/ace/theme/vibrant_ink.js
	lib/ace/view/measure_text.js
	lib/ace/virtual_renderer.js
	package.json
	support/paths.js
This commit is contained in:
Fabian Jakobs 2011-07-28 11:46:09 +02:00
commit b063b96230
110 changed files with 1532 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Makefile.dryice.js
View file

@ -89,7 +89,6 @@ var aceHome = __dirname;
console.log('# ace ---------');
var aceProject = [
aceHome + '/node_modules/pilot/lib',
aceHome + '/lib',
aceHome
];
@ -135,7 +134,7 @@ copy({
copy.source.commonjs({
project: project,
require: [
"pilot/fixoldbrowsers",
"ace/lib/fixoldbrowsers",
"ace/ace"
]
})
@ -274,7 +273,6 @@ console.log('# ace worker ---------');
console.log("worker for " + mode + " mode");
var worker = copy.createDataObject();
var workerProject = copy.createCommonJsProject([
aceHome + '/node_modules/pilot/lib',
aceHome + '/lib'
]);
copy({
@ -282,9 +280,9 @@ console.log('# ace worker ---------');
copy.source.commonjs({
project: workerProject,
require: [
'pilot/fixoldbrowsers',
'pilot/event_emitter',
'pilot/oop',
'ace/lib/fixoldbrowsers',
'ace/lib/event_emitter',
'ace/lib/oop',
'ace/mode/' + mode + '_worker'
]
})