Commit graph

67 commits

Author SHA1 Message Date
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 '6808e3bb35'
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
Josh Ellithorpe
c96b26e260 Swapped order of element.innerHTML and element.value so it fixes IE whitespace stripping issues. 2011-09-29 19:47:27 -07:00
Fabian Jakobs
9e8191df68 package 2011-08-19 15:36:05 +02:00
Fabian Jakobs
5af05772eb better IE9 handling 2011-08-18 17:36:55 +02:00
Fabian Jakobs
41c625aca8 fix IE detection for IE9 2011-08-18 17:28:32 +02:00
Fabian Jakobs
1e8a366cd5 resolve collision with existing requireJS on the page 2011-08-18 14:10:51 +02:00
Fabian Jakobs
2a70958609 sync themes and modes 2011-08-03 14:58:53 +02:00
bolste
f818318ecc Cleaned global scope from "option" var 2011-06-28 06:16:15 -07:00
Fabian Jakobs
de438858a9 revert: No need to fallback to existing requireJS. 2011-06-20 09:09:34 +00:00
Fabian Jakobs
86ce859335 detect global object 2011-06-20 08:27:32 +00:00
Andreas Madsen
ec61fe5b0f Added SCSS (SASS) syntax highlighting 2011-06-07 11:12:05 +02:00
Julian Viereck
e3f71e22c2 Use compressed Ace version in bookmarklet build 2011-05-24 15:16:40 +02:00
Julian Viereck
e0cec5a073 Style the Ace Bookmarklet Build page 2011-05-23 11:11:47 +02:00
Julian Viereck
14faa36a51 Update build_support for the bm build 2011-05-23 11:11:31 +02:00
Fabian Jakobs
72383f0e75 No need to fallback to existing requireJS. Fix issue #198 2011-05-16 13:41:01 +00:00
Fabian Jakobs
bacc29278a update packaged ace 2011-05-01 09:33:16 +00:00
Joe Cheng
8f52764dbc Define statement 'deps' argument should be optional 2011-02-28 16:48:23 +08:00
Fabian Jakobs
8c06c538ee use proper AMD style 2011-02-21 12:41:48 +01:00
Gastón Kleiman
666f01179c Add 'Use Soft Tabs' option to bookmarklet settings.
This is needed to edit Python code and Makefiles.
2011-02-19 16:34:22 +08:00
Gastón Kleiman
a04cee8dcc Fix alignment in setupSettingPanel. 2011-02-19 16:34:21 +08:00
Gastón Kleiman
eb35995ea4 Change Bespin to Ace and reformat some comments. 2011-02-19 16:34:20 +08:00
Julian Viereck
7ed9cb2f57 Fix env.editor to point to the right object and add editor.env = env such that you can access env from the returned editor object 2011-02-18 13:55:36 +08:00
Julian Viereck
c23c5713e1 Add link to Ace Bookmarklet Builder and add some notes on how to use the bookmarklet 2011-02-16 01:49:15 +08:00
Julian Viereck
e4d1d3fedc Make bookmarklet more IE compatible, but not working yet 2011-02-16 01:49:15 +08:00
Julian Viereck
376d8d2ebe Add fontSize '11px' to textarea 2011-02-15 21:01:02 +08:00
Julian Viereck
48e37e1c85 Make the init process in editor_textarea.html more robust in cases where the ace.js isn't loaded in 300ms 2011-02-15 21:01:01 +08:00
Julian Viereck
f425e49b58 Use non compressed ace.js version of bookmarklet 2011-02-15 21:01:01 +08:00
Julian Viereck
36a3d23623 Add 'Soft Wrap' and 'Show Print Margin' option to bookmarklet settings 2011-02-15 21:01:00 +08:00
Fabian Jakobs
5a5b955a74 fix link to github 2011-02-15 09:51:36 +01:00
Fabian Jakobs
6c3538e7c4 hotlink to github 2011-02-15 09:44:29 +01:00
Julian Viereck
73e94d3f97 Add bookmarklet/textarea build 2011-02-15 16:26:41 +08:00
Fabian Jakobs
9ac8dc2ef2 small change to the demo document 2011-02-07 11:56:40 +01:00
Fabian Jakobs
88e1e43cb7 let mini_require play nice with requireJS 2011-02-03 16:09:27 +01:00
Fabian Jakobs
525443c875 use compressed ace 2011-02-03 14:57:10 +01:00