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
nightwing
af09dc7f05
Merge remote-tracking branch 'remotes/origin/master'
2014-01-27 21:40:01 +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
Roger Gallion
e751389d38
Fixes #1783
2014-01-26 09:01:30 -06: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
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
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
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
142761d86f
fix regression in { pairing
2014-01-07 23:03:32 +04:00
Zef Hemel
b79cb61861
Update LogiQL highlighting: add alias_all storage type
2014-01-07 17:54:33 +01:00
rmsmith
c40bf3b172
dart_highlight_rules : add 'with' to keywordDeclaration
...
'with' clauses are used for mixin application in Dart, e.g:
`class ToggleButton extends Button with Toggleable { ... }`
2014-01-03 21:04:23 +02:00
Ruben Daniels
5733f006a8
Merge pull request #1740 from ajaxorg/c9
...
sync with cloud9
2014-01-02 11:01:42 -08:00
Derk-Jan Hartman
8f109ea371
Repair label of themes in themelist.
...
This was broken after c563f15e93
2014-01-02 13:04:24 +01:00
Derk-Jan Hartman
1240a04fff
Remove trailing comma's, which break scripts in IE7
2013-12-31 10:12:34 +01:00
DanyaPostfactum
0b1630d6fa
Refactor tooltip to separate class.
2013-12-30 20:13:00 +10:00
nightwing
425404ff29
fix #1737 reset padding only if previous theme had custom padding
2013-12-30 02:05:57 +04:00
nightwing
3cc3043951
update js highlighter test
2013-12-30 01:56:58 +04:00
nightwing
9a5bd3cd65
include error_marker addon in the build
2013-12-30 01:42:12 +04:00
John DeSoi
48cd7f55dc
Updated keywords and functions for PostgreSQL 9.3. Added sub-mode support for JavaScript and Json.
2013-12-29 14:16:38 -06:00
nightwing
714e1a592c
fix resize issues
2013-12-29 20:07:08 +04:00
nightwing
90b2a6cd77
fix multiselect mouse interaction issues
2013-12-29 20:05:23 +04:00
nightwing
37b3dc1efd
tweak modes
2013-12-29 20:03:08 +04:00
nightwing
b6a4a34fd2
togglecomment should not scroll if part of the selection is visible
2013-12-29 20:02:14 +04:00
nightwing
5b151a3db4
fix scrolling speed on firefox ux
2013-12-29 19:59:16 +04:00
nightwing
3f7f325777
return removed folds from removeFolds
2013-12-29 19:57:49 +04:00
nightwing
6e254f25a1
fix wrap option getter
2013-12-29 19:57:00 +04:00
nightwing
4c4ab09870
add goToNextError command
2013-12-29 19:56:29 +04:00
Lennart Kats
c612dac355
Merge pull request #1723 from ajaxorg/misc
...
fix several small bugs
2013-12-25 07:11:00 -08:00
Lennart Kats
890fd39c92
Merge pull request #1725 from ajaxorg/double_tap
...
Double tap regression
2013-12-25 02:09:58 -08:00
Lennart Kats
eda5eaba39
Merge pull request #1715 from ajaxorg/velocity_snippets
...
Support loading snippets for mixed modes
2013-12-25 02:04:31 -08:00
Lennart Kats
191a79245f
Merge pull request #1703 from ajaxorg/highlighting/mixed
...
Do not loose currentState if tokenizer uses combination of next and push
2013-12-25 02:03:04 -08:00
