Commit graph

4,472 commits

Author SHA1 Message Date
Jason O'Neil
aac5a0e83a Added mode and highlight rules for haxe, based on C# 2011-11-03 13:05:11 +08:00
Sergi Mansilla
e02b43d9c0 Merge branch 'master' of http://github.com/ajaxorg/ace 2011-11-03 00:12:20 +01:00
Sergi Mansilla
12d125814b Fixed global variable 2011-11-03 00:09:51 +01:00
Fabian Jakobs
caac348e10 fix remove left 2011-11-02 18:26:52 +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
c12cfb4788 package 2011-11-02 14:44:01 +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
Fabian Jakobs
22274e4d4c Merge branch 'master' of github.com:ajaxorg/ace 2011-11-02 13:15:17 +01:00
Fabian Jakobs
2ecef49e39 move deps into node_modules and make better use
of npm
2011-11-02 13:15:04 +01:00
Fabian Jakobs
253d1621e0 package 2011-11-02 13:12:09 +01:00
Fabian Jakobs
45f351e819 Merge pull request #490 from ajaxorg/issues/489
Issues/489
2011-11-02 04:34:39 -07:00
Jan Jongboom
b9955714f1 new rule on behavior when doing keyboard navigation + tests 2011-11-02 11:23:09 +00:00
Jan Jongboom
125d9bfbfd Issue 489 2011-11-02 10:14:59 +00:00
Jan Jongboom
3451ab1b8f Issue 489 Initial 2011-11-02 10:14:52 +00:00
Jan Jongboom
7eb76db726 Revert "Issue 489"
This reverts commit bc599176e0.
2011-11-02 10:08:00 +00:00
Jan Jongboom
b74321928c Revert "Issue 489 Initial"
This reverts commit 271e24aba2.
2011-11-02 10:07:30 +00:00
Jan Jongboom
bc599176e0 Issue 489 2011-11-02 10:03:04 +00:00
Jan Jongboom
271e24aba2 Issue 489 Initial 2011-11-02 09:59:28 +00:00
dgeorge
ae26fe31a0 More unit tests. Clearer comments. Better variable names. 2011-11-01 17:09:43 -07:00
dgeorge
81411db28a Merge remote branch 'upstream/master' 2011-10-31 16:10:40 -07:00
dgeorge
017d6dc96e Added more unit tests. Changed the unit test code to be formatted with leading spaces instead of tabs. 2011-10-31 16:08:21 -07:00
dgeorge
5030abba97 Changed leading white space to use spaces instead of tabs (no actual code changes, just reformatting the code) 2011-10-31 16:05:52 -07:00
Fabian Jakobs
e89b18fcc3 Merge pull request #484 from nightwing/pullreq
fix infinite loop in $computeWrapSplits
2011-10-31 04:02:49 -07:00
nightwing
7ad4734e24 fix infinite loop in computeWrapSplits 2011-10-30 22:49:02 +04:00
dgeorge
bcabfcb2e2 Added unit tests for TokenIterator 2011-10-28 16:58:45 -07:00
dgeorge
16060483ac Merge remote branch 'origin/master' 2011-10-28 14:43:47 -07:00
dgeorge
dc84eac595 Merge remote branch 'upstream/master' 2011-10-28 14:38:30 -07:00
dgeorge
62a788c391 Merge remote branch 'upstream/master' 2011-10-28 14:27:16 -07:00
dgeorge
e0048b4967 EditSession.findMatchingBracket now uses tokens instead of a simple text search. Moved the bracket-matching code to a separate file edit_session/bracket_match.js. Added a TokenIterator helper class, which walks forward or backward through all tokens in the document. 2011-10-28 14:23:55 -07:00
Fabian Jakobs
e8914acd7b Merge pull request #479 from nightwing/pullreq
make wrapping friendlier to code:
2011-10-26 00:39:13 -07:00
Fabian Jakobs
933b4f9386 Merge pull request #480 from kernel1983/master
fix vim mode hjkl keys problem
2011-10-26 00:37:46 -07:00
Fabian Jakobs
2ad5f9a3a0 highlight "no" keyword in coffeescript. fixes #481 2011-10-26 10:30:11 +03:00
KJ
6b84933232 fix vim mode (h|left) and (l|right) key 2011-10-26 14:16:17 +08:00
nightwing
b8e934b1bf make wrapping friendlier to code:
- allow wrapping text at punctuation as well as space
 - do not search for wrap point too far away from the line end
2011-10-25 19:04:18 +05:00
Fabian Jakobs
b8d2d96387 Merge pull request #478 from rstudio/bugfix/no-paste-event-on-indent
Bugfix/no paste event on indent
2011-10-25 06:26:55 -07:00
Joe Cheng
e46d4201fe Don't emit Paste event on indent 2011-10-24 10:47:41 -07:00
Fabian Jakobs
cf4773176c Merge pull request #475 from nightwing/pullreq
double click with highlightAll on crashes browser
2011-10-24 03:41:40 -07:00
Fabian Jakobs
b139819575 add rubymonk. closes #477 2011-10-24 13:34:52 +03:00
nightwing
93237bd694 fix some more out of date tests 2011-10-21 21:32:09 +05:00
nightwing
e3000ae39d fix in browser tests 2011-10-21 20:59:41 +05:00
nightwing
245b27a4f7 using moveCursorTo in search.js isn't safe (triggers events) 2011-10-21 20:48:26 +05:00
Fabian Jakobs
18f5ca584f Merge pull request #423 from probablycorey/master
Search's FindAll has issues when cursor is in the middle of the line.
2011-10-21 02:43:12 -07:00
Fabian Jakobs
43df77ec80 Merge pull request #471 from paulb777/patch-2
Adding AppLaud Cloud - a toolset for developing mobile apps with PhoneGap
2011-10-21 02:02:18 -07:00
Fabian Jakobs
2715ec90a3 Merge pull request #472 from nightwing/pullreq
more bugfix, add togglefold to default commands
2011-10-21 01:23:51 -07:00
nightwing
7ade415f25 toggleFold must fold strings and comments as well 2011-10-21 11:09:10 +05:00
nightwing
92a3369bdb add togglefold to the list of default commands 2011-10-21 09:07:13 +05:00
nightwing
1a462d53de range.containsRange was returning result for "intersects" 2011-10-21 09:07:12 +05:00
nightwing
c5a53431e8 dragging when ctrl/alt is pressed must copy selection 2011-10-21 09:07:12 +05:00
nightwing
8a9488090d don't stop iteration if behaviour returns undefined 2011-10-21 09:07:12 +05:00
nightwing
70201ad6a7 small optimization + namechange for getNextFold->getNextFoldLine 2011-10-21 09:07:12 +05:00