Commit graph

168 commits

Author SHA1 Message Date
Fabian Jakobs
103255f4d2 Merge remote-tracking branch 'mozilla/master'
Conflicts:
	lib/ace/edit_session.js
	lib/ace/layer/text.js
2011-04-26 19:14:16 +02:00
Fabian Jakobs
f275f4ade4 minor cleanup 2011-04-26 09:43:29 +02:00
Joe Walker
34bc1cf6ea catchup with changes in gcli 2011-04-21 15:08:42 +01:00
Joe Walker
45a7be6b43 rename cockpit -> gcli 2011-04-07 14:19:09 +01:00
Joe Walker
ab3ac17533 import gcli properly 2011-04-07 06:16:12 +01:00
Joe Walker
4fc695fb67 move key binding system into ace from gcli 2011-04-06 18:48:12 +01:00
Joe Walker
b6e3f52faf fix keybinding in a slightly less kludgy way 2011-04-06 13:34:42 +01:00
Joe Walker
2d43ddd047 change command format to move request to being an implementation detail 2011-04-06 01:23:35 +01:00
Joe Walker
d80f0fe66e Merge branch 'master' of https://github.com/ajaxorg/ace
Conflicts:
	lib/ace/commands/default_commands.js
	lib/ace/edit_session.js
2011-03-30 12:06:18 +01:00
Joe Walker
9530383e41 reverting to older boot sequence now that commands are properly registered 2011-03-30 09:19:34 +01:00
Joe Walker
953cc3b240 changes resulting from resource moves from pilot to cockpit 2011-03-30 09:19:03 +01:00
Joe Walker
1e24a23ca5 moving files from pilot to ace where they more properly belong 2011-03-29 17:59:53 +01:00
Julian Viereck
63d7ba4439 Add 'softTab' option to demo 2011-03-19 14:14:06 +01:00
Joe Walker
4900fa2f9f a ton of fixes to make cockpit look good in ace, or at least not totally borked 2011-03-17 21:50:03 +00:00
Joe Walker
667b11e013 post merge fixes to straighten paths and fix mini_require 2011-03-17 13:07:27 +00:00
Fabian Jakobs
0a00b8aea6 Merge remote branch 'jviereck/kb'
Conflicts:
	lib/ace/keyboard/keybinding/default_mac.js
	lib/ace/keyboard/keybinding/default_win.js
	support/pilot
2011-03-07 20:00:51 +01:00
Fabian Jakobs
493373f564 Add svg mode with support for embedded JavaScript 2011-03-07 19:55:24 +01:00
Fabian Jakobs
7a607ba621 fix demo for the textile mode 2011-02-23 13:59:19 +01:00
Rob Conery
b1737bcfe2 Added CSharp language thinger 2011-02-21 12:31:14 -10:00
Julian Viereck
c428908211 Add examples for new command.bindKey to demo.js, update Pilot & Cockpit 2011-02-20 17:13:15 +01:00
Fabian Jakobs
e89045d9bb fix demo 2011-02-17 11:15:06 +01:00
Joe Cheng
9e162f91b9 Add "Persistent Horizontal Scroll" setting to editor demo 2011-02-17 17:46:20 +08:00
Panagiotis Astithas
2d1dda867a Add a Perl syntax highlighting mode. 2011-02-15 21:06:01 +08:00
Mihai Sucan
be0d9a2be7 More fixes for issue 57.
- move the selection highlight code to the Text mode.
- store $selectionOccurrences in the editor session.
- add option to toggle selection highlighting. In demo page as well.
2011-02-14 20:43:54 +02:00
Fabian Jakobs
f3174a29b3 Revert "add anchor demo"
This reverts commit 5589c44225.

Conflicts:

	demo/demo.js
2011-02-11 11:59:26 +01:00
Fabian Jakobs
8683abd9af Merge branch 'anchor' 2011-02-11 11:57:23 +01:00
Fabian Jakobs
44f2e923b4 cleanups 2011-02-11 11:34:35 +01:00
Joe Cheng
9226825600 Remove redundant setWrapLimit method 2011-02-11 16:50:10 +08:00
Joe Cheng
c2cd67105d Add free text wrapping with constraints 2011-02-11 16:50:10 +08:00
Fabian Jakobs
5589c44225 add anchor demo 2011-02-10 18:20:57 +01:00
satyr
589418a83e CoffeeScript mode 2011-02-08 16:03:45 +08:00
Gastón Kleiman
ba42042013 add C/C++ syntax highlighting 2011-02-04 14:28:25 +08:00
Fabian Jakobs
89963dedac Merge branch 'master' of github.com:ajaxorg/ace
Conflicts:
	demo/demo.js
	editor.html
2011-02-03 10:13:18 +01:00
Fabian Jakobs
c181ecfe23 merge ruby mode 2011-02-02 18:27:13 +01:00
Tom Tasche
33642f84cc Merge branch 'master' of https://github.com/ajaxorg/ace 2011-02-02 14:00:37 +01:00
Heigh Tech LLC
b23ff177cd fixed extra square-bracket 2011-02-01 20:30:20 +01:00
Heigh Tech LLC
0e7bd9aaa8 add ruby to demo/startup.js 2011-02-01 17:58:07 +01:00
Fabian Jakobs
d2f0bebf42 moving the textarea into view broke rendering 2011-02-01 09:09:40 +01:00
Tom Tasche
53a4f1eacb inspired by SunboX s PHP support and Fabian Jakobs - thanks! 2011-01-31 18:23:41 +01:00
Fabian Jakobs
db5569499a rename startup to demo 2011-01-31 16:52:08 +01:00
Julian Viereck
be2e78616e Fix various issues with display competition and asian characters + testcases 2011-01-28 23:37:20 +08:00
Julian Viereck
3a7769ef47 Fix setting fontSize style on editor 2011-01-28 23:37:17 +08:00
Julian Viereck
e6e01a3ed1 Add editor.html dropdown Soft Wrap 2011-01-28 20:01:22 +08:00
Julian Viereck
fa7bfdeb10 Add editor.html Font-Size selection 2011-01-28 20:01:21 +08:00
Julian Viereck
8010ca3e4a Bind editor.html's keyBinding 2011-01-28 20:01:21 +08:00
Fabian Jakobs
f6f6e2d28e cleanup demo 2011-01-28 09:14:54 +01:00
Fabian Jakobs
9290595750 Merge branch 'master' of github.com:ajaxorg/ace
Conflicts:
	editor.html
	lib/ace/virtual_renderer.js
2011-01-28 09:12:13 +01:00
Fabian Jakobs
56a6f985d5 extend demo 2011-01-27 19:41:08 +01:00
Fabian Jakobs
27db482e8e cleanup demo 2011-01-27 18:39:50 +01:00
nightwing
6b0087c234 add toggle gutter to demo 2011-01-27 18:11:06 +08:00