jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5,265 commits 36 branches 26 tags 35 MiB
Commit graph

5,265 commits

This branch
This branch
All branches
Author SHA1 Message Date
Will Norris
b4418d2ffd update license of more files from RStudio to BSD 
It appears these were simply missed in the original license change
(ajaxorg/ace#1622).  Discussion on that pull request confirms that these
should have been included.
 2014-01-29 10:54:16 -08:00
Harutyun Amirjanyan
00b3beae30 Merge pull request #1780 from Cirru/master 
Add Cirru highlighting
 2014-01-28 11:22:05 -08:00
jiyinyiyong
ee5ac2a0f2 add license block 2014-01-28 10:14:02 +08:00
Abram Adams
33cf210180 Fixed regex to match beginning of tag name 2014-01-27 10:21:45 -08:00
nightwing
af09dc7f05 Merge remote-tracking branch 'remotes/origin/master' 2014-01-27 21:40:01 +04:00
nightwing
a206535596 cleanup user list 2014-01-27 21:38:54 +04:00
nightwing
300dc660e9 fix merge conflict 2014-01-27 21:22:49 +04:00
nightwing
f2da76daaf Merge remote-tracking branch 'remotes/pull/1758' 2014-01-27 21:15:16 +04:00
Harutyun Amirjanyan
58caaad6a5 Merge pull request #1784 from rgallion/Fix_Issue_1783 
Fixes #1783
 2014-01-26 10:48:21 -08:00
Roger Gallion
e751389d38 Fixes #1783 2014-01-26 09:01:30 -06:00
DanyaPostfactum
3d71b01022 Add worker to the html mode 
This adds syntax checking (not validating). Based on HTML5 @aredridel parser
 2014-01-26 02:40:26 +10:00
Abram Adams
142fc79c97 Fixed token name and added to self-closing tags list 2014-01-23 09:43:39 -08:00
jiyinyiyong
cd506ca7ad add Cirru syntax highlighting 2014-01-23 16:40:38 +08:00
Abram Adams
73fb35e63c Added cfml behaviour with smart auto closing tags 
This adds the behaviours for ColdFusion Markup Language (CFML) back in
with the addition of exceptions for auto-closing tags.
 2014-01-22 15:38:52 -08:00
Harutyun Amirjanyan
811d63039d Merge pull request #1778 from rmsmith/master 
Add missing `$id` to those Modes that are missing it.
 2014-01-22 13:57:07 -08:00
rmsmith
6e1aefff56 Add missing $id to those Modes that are missing it. 
I've found that the set of modes in this PR did not set their `$id`.
The side-effect of that is that when one of these modes is the current
mode of an EditSession, and one calls `session.getOption('mode')` the
returned value was incorrect.  It goes up the prototype chain so you'd
get something like 'ace/mode/text' or 'ace/mode/html' in most cases.

This fixes that so that if, for example, the mode is set to
'ace/mode/django', the value returned by the option will be
'ace/mode/django'
 2014-01-21 09:41:15 +02:00
Harutyun Amirjanyan
5abba7d32c Merge pull request #1772 from hartman/lua_self 
Lua uses self, not this
 2014-01-17 10:43:27 -08:00
Harutyun Amirjanyan
dc95d03bd6 Merge pull request #1738 from danyaPostfactum/refactor/datauri 
Optimize css images (reduce filesize)
 2014-01-17 10:37:33 -08:00
Derk-Jan Hartman
93c14b1b31 Update testcase for lua self 2014-01-17 11:56:15 +01:00
Derk-Jan Hartman
ab1b62fbb7 Lua uses self, not this 
There is no 'this' in lua. There is however 'self' a predefined parameter when using colon syntax for calling a function.

http://www.lua.org/pil/16.html
 2014-01-17 11:16:50 +01:00
nightwing
ff88d5aa8d Merge pull request #1761 from hartman:cors_worker 
Use shim blob with importScripts to use CORS for Worker
 2014-01-16 20:36:56 +04:00
nightwing
9e71e4a003 cleanup 2014-01-16 19:35:48 +04:00
nightwing
c8fca3053c Merge remote-tracking branch 'remotes/origin/master' 
Conflicts:
	lib/ace/line_widgets.js
 2014-01-16 00:14:34 +04:00
nightwing
8d57d8765f Merge pull request #1745 aldendaniels:master into v-1.2 
Refactor document delta handling
 2014-01-16 00:11:00 +04:00
DanyaPostfactum
90f3f32fb1 Optimize css images (reduce filesize) 2014-01-16 00:29:51 +10:00
Eric Arnold
66f615ba94 Merge branch 'master' of https://github.com/ajaxorg/ace into stationary_tooltip_option 2014-01-14 17:11:27 -08:00
Eric Arnold
be0d187a60 Review changes 2014-01-14 17:10:44 -08:00
Harutyun Amirjanyan
ac99690429 Merge pull request #1760 from adamjimenez/patch-21 
shift+mousewheel to horiz scroll
 2014-01-14 07:26:00 -08:00
Harutyun Amirjanyan
00f044d0cf Merge pull request #1764 from rgallion/Issue_1762_Add_Vim_unit_tests 
Add Vim keybinding unit test [Issue 1762]
 2014-01-14 06:45:20 -08:00
Harutyun Amirjanyan
177e0af9eb Merge pull request #1707 from danyaPostfactum/refactor/tooltip 
Refactor tooltip to separate class.
 2014-01-14 06:38:28 -08:00
Roger Gallion
0ab6574521 Add Vim keybinding unit test [Issue 1762] 2014-01-13 08:27:14 -06:00
Derk-Jan Hartman
f779c2e8c5 Use shim blob with importScripts to use CORS for Worker 2014-01-13 11:09:26 +01:00
Adam Jimenez
fb233da532 shift+mousewheel to horiz scroll 
Converts shift+mousewheel to horizontal scroll.
This is in accordance with Chrome which supports this shortcut on webpages and textareas.
 2014-01-13 09:46:53 +00:00
aldendaniels
7f1bc7af2f Break out Anchor.onChange helper functions 
This should be faster since we don't have to re-initialize the helper
functions each time Anchor.onChange is fired.
 2014-01-11 15:48:38 -06:00
aldendaniels
6b280bf6bb Code review fixes (mostly formatting) 
- Fix unconventional '{' formatting
- Reformat `UndoManager` changes
- Revert change from `insertInLine` to `insert` in text.js
 2014-01-11 15:23:20 -06:00
aldendaniels
35a27fd1ba Treat deltas with empty ranges as NOOPs 2014-01-11 14:45:08 -06:00
aldendaniels
ddd695ee3f Store single-line deltas as .text instead of .lines in undo history 
Stores single-line delta content as .text instead of .lines in undo
history. This is done without modifying the original delta object in
case the caller still retains a handle to the original.
 2014-01-11 14:43:47 -06:00
aldendaniels
f59708a5ba Add a doNotValidate param to applyDelta 
Set it to true in insertInLine/removeInLine.

Also sped up indent/dedent by using insertInLine and removeInLine.
 2014-01-11 12:00:10 -06:00
aldendaniels
ef0e8da522 Fix / complete validateDelta 
This uncovered the fact that until now delta.range had not always been a
Range object. This inconsistency has been resolved by my changes in
mirror.js.
 2014-01-11 11:20:34 -06:00
aldendaniels
08edcdfc98 Stop doing a line-by-line splicing in applyDelta 
Also brings back the functionality where large deltas are split into
smaller deltas so that .splice.apply() calls will work.
 2014-01-10 22:49:17 -06:00
Eric Arnold
e9434fc1df Added option for annotation tooltip to be floating (follows mouse, current functionality) or fixed (stationary per annotation). 2014-01-09 13:29:51 -08:00
nightwing
d226ea067b update site 2014-01-10 00:11:00 +04:00
aldendaniels
3a048cdf61 Bring back insertInLine 
Avoids an extra $split call.
 2014-01-08 22:51:39 -06:00
aldendaniels
f2a2e4e1a8 Rename the 'delete' delta action to 'remove' 
Matches previous naming convention.
 2014-01-08 22:18:05 -06:00
aldendaniels
6fe381f633 Rename insertText back to insert 2014-01-08 22:00:11 -06:00
aldendaniels
91df7cd663 Revert "Stop using splice.appy() in ace" 
This reverts commit 8624ab8dcb.
 2014-01-08 21:39:30 -06:00
nightwing
ce329df39b update the site v1.1.2 2014-01-08 03:14:35 +04:00
nightwing
142761d86f fix regression in { pairing 2014-01-07 23:03:32 +04:00
nightwing
30a4d12eb7 fix ascii filter in builder 2014-01-07 23:01:10 +04:00
Zef Hemel
b79cb61861 Update LogiQL highlighting: add alias_all storage type 2014-01-07 17:54:33 +01:00