Commit graph

18 commits

Author SHA1 Message Date
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
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
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
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
Andreas Madsen
ec61fe5b0f Added SCSS (SASS) syntax highlighting 2011-06-07 11:12:05 +02:00
Julian Viereck
14faa36a51 Update build_support for the bm build 2011-05-23 11:11:31 +02: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
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
36a3d23623 Add 'Soft Wrap' and 'Show Print Margin' option to bookmarklet settings 2011-02-15 21:01:00 +08:00
Julian Viereck
73e94d3f97 Add bookmarklet/textarea build 2011-02-15 16:26:41 +08:00