Commit graph

5,221 commits

Author SHA1 Message Date
nightwing
1e46543b05 fix error marker column 2014-02-01 04:18:46 +04:00
nightwing
9cbcfb35d3 use _signal where possible 2014-02-01 04:11:56 +04:00
nightwing
750d38af6f Merge commit 'b54d268a72' 2014-02-01 04:06:57 +04:00
nightwing
b54d268a72 fix typo 2014-02-01 04:06:31 +04:00
Ruben Daniels
7dc4bddae9 Merge pull request #1793 from ajaxorg/misc
misc bugfix
2014-01-31 03:13:15 -08:00
nightwing
2246da0021 fix infinite loop when using ace with polymer 2014-01-30 22:55:40 +04:00
nightwing
3dc20b0824 update highlighter tests 2014-01-30 22:25:52 +04:00
nightwing
af16d9ca54 fix #1757 Merged undos don't decrement dirtyCounter correctly 2014-01-30 22:01:02 +04:00
nightwing
07ef6a115c fix #1776 c_cpp mode syntax highlighting 2014-01-30 21:49:24 +04:00
nightwing
abb1e4703b add showLineNumbers fixes #1755, #892 2014-01-30 21:44:36 +04:00
nightwing
f6983739e9 fix bug with scrollMargin and maxLines 2014-01-30 21:44:36 +04:00
nightwing
36c6fcc9d4 fix scrolling error widget into view 2014-01-30 21:44:36 +04:00
nightwing
f3af20aa15 fix #1775 Horizontal scrollbar is not resizing when typing 2014-01-30 21:44:17 +04:00
nightwing
eafe6a7997 fix gutter is too short when hor scrollbar is visible 2014-01-30 21:43:53 +04:00
nightwing
048d9589c7 remove slow cursor[style*] css rule 2014-01-30 21:24:04 +04:00
nightwing
5e2c5f4e0a fix two way mapping of keys 2014-01-30 21:24:04 +04:00
nightwing
21bd4a15fa fix diagonal resizing 2014-01-30 21:24:04 +04:00
nightwing
4ed6afc829 convert autoScrollEditorIntoView into preoper option 2014-01-30 21:24:04 +04:00
nightwing
cd12b25ea6 cleanup 2014-01-30 21:23:48 +04:00
nightwing
9253fffb9f allow modifying pasted text from paste event 2014-01-30 20:54:41 +04:00
nightwing
54ad13847a fix ejs highlighting 2014-01-30 20:51:30 +04:00
nightwing
7a92c174eb fix findall 2014-01-30 20:50:56 +04:00
nightwing
0c03302a6d allow textinput to work with hosts not supporting textcomposition 2014-01-30 20:50:37 +04:00
nightwing
75e41746e6 alllow functions as argument to addKeyboardHandler 2014-01-30 20:49:38 +04:00
nightwing
baa0c28e69 remove color from ace_editor class 2014-01-30 20:48:37 +04:00
nightwing
ca41480c72 add scrollIntoView to all commands 2014-01-30 20:46:47 +04:00
Harutyun Amirjanyan
625173182d Merge pull request #1791 from willnorris/license
update license of more files from RStudio to BSD
2014-01-29 11:04:55 -08:00
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
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
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