75 Commits

Author SHA1 Message Date
nightwing
869de0d113 improve textarea plugin 2013-02-03 17:38:58 +04:00
nightwing
e14b6072fa do not mess with global require 2012-11-15 17:13:00 +04:00
Lennart Kats
8b971619b7 Add BSD license headers 2012-09-06 22:48:34 +02:00
Mostafa Eweda
e2b80ffb21 Revert "include ace/requirejs/text in build to not depend on require text plugin"
This reverts commit 42219c2379.

Conflicts:

	build_support/mini_require.js
2012-08-31 18:54:50 +02:00
nightwing
05a31aa7e5 fix mini_require.js
do not patch global require namespace if is used
   do not patch require if it is already patched
2012-08-12 17:21:44 +04:00
nightwing
42219c2379 include ace/requirejs/text in build to not depend on require text plugin
fixes issue #708
2012-08-05 15:00:20 +04:00
nightwing
cf23198610 fix textarea build
Conflicts:

	Makefile.dryice.js
2012-05-24 23:10:55 +04:00
nightwing
34f3cac4a8 reorganize build and demo
Conflicts:

	Makefile.dryice.js
2012-05-24 23:10:50 +04:00
nightwing
6398fcf539 move google font import out of core styles 2012-04-21 12:30:31 +04:00
Fabian Jakobs
dd986d45e5 package 2012-03-30 18:09:11 +02:00
Fabian Jakobs
d7c823de0f add define.packaged 2012-02-22 12:14:29 +01:00
Fabian Jakobs
483a7126e0 better integration with requirejs 2012-02-22 10:35:08 +01:00
Fabian Jakobs
fcaeafb07d use no conflict version of ace for the demo 2011-12-19 13:04:17 +01:00
Fabian Jakobs
9e35b31e2d use nicer script name for bookmarklet 2011-12-19 13:02:38 +01:00
Fabian Jakobs
47aa0d88c9 mark modules as packaged 2011-12-19 13:02:10 +01:00
Fabian Jakobs
a40c6a9211 Cleanup build system
* create no conflict packed version of ace
* move text area code into the normal code base
* remote special cased code for textarea
2011-12-16 16:32:07 +01:00
Fabian Jakobs
633fbfdb31 package 2011-12-05 18:53:44 +01:00
Fabian Jakobs
d90cf5a31e fix mini require for the bookmarklet 2011-12-05 18:53:37 +01:00
Fabian Jakobs
c97fc93a71 Merge branch 'haxesyntax'
Conflicts:
	demo/kitchen-sink/demo.js
2011-11-15 11:38:43 +01:00
Jason O'Neil
0c4c0f8529 Changes to Textarea also 2011-11-15 11:15:41 +01:00
Fabian Jakobs
32e90b2b8a Function.prototype.bind cannot be used in the loader
since ES5-shim is not there yet.
2011-11-14 18:12:15 +01:00
Fabian Jakobs
09a52b8165 allow modules to return a module 2011-11-10 18:17:53 +01:00
Fabian Jakobs
625f70206c package 2011-11-09 16:55:48 +01:00
Fabian Jakobs
b063b96230 move pilot code back into Ace
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
2011-11-02 18:18:51 +01:00
Fabian Jakobs
62a3b4edf5 Merge commit '6808e3bb3563504198794fcb7396eae2a2bccd8e'
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
2011-11-02 14:43:00 +01:00