Skip to content

Commit 6c235fe

Browse files
committed
release 1.1.3
1 parent 86e7a49 commit 6c235fe

5 files changed

Lines changed: 18 additions & 8 deletions

File tree

ChangeLog.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2014.03.08 Version 1.1.3
2+
3+
* New Features
4+
- Allow syntax checkers to be loaded from CDN (Derk-Jan Hartman)
5+
- Add ColdFusion behavior (Abram Adams)
6+
- add showLineNumbers option
7+
- Add html syntax checker (danyaPostfactum)
8+
9+
* new language modes
10+
- Gherkin (Patrick Nevels)
11+
- Smarty
12+
113
2013.12.02 Version 1.1.2
214

315
* New Features
@@ -11,7 +23,6 @@
1123
- add support for autocompletion and snippets (gjtorikyan danyaPostfactum and others)
1224
- add option to merge similar changes in undo history
1325
- add scrollPastEnd option
14-
- 6a87d97 Merge pull request #1494 from danyaPostfactum/snippetcompleter
1526
- use html5 dragndrop for text dragging (danyaPostfactum)
1627

1728
* API Changes

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Ace is a standalone code editor written in JavaScript. Our goal is to create a b
88
Features
99
--------
1010

11-
* Syntax highlighting for over 40 languages (TextMate/Sublime/_.tmlanguage_ files can be imported)
11+
* Syntax highlighting for over 110 languages (TextMate/Sublime/_.tmlanguage_ files can be imported)
1212
* Over 20 themes (TextMate/Sublime/_.tmtheme_ files can be imported)
1313
* Automatic indent and outdent
1414
* An optional command line

build

Submodule build updated 513 files

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ <h1>Built for Code</h1>
8787
</p>
8888
<h2>Features</h2>
8989
<ul class="content-list">
90-
<li><a href="http://pcwalton.blogspot.com/2010/11/syntax-highlighting-specification.html">Syntax highlighting</a> for over 60 languages (TextMate/Sublime Text<em>.tmlanguage</em> files can be imported)</li>
90+
<li><a href="http://pcwalton.blogspot.com/2010/11/syntax-highlighting-specification.html">Syntax highlighting</a> for over 110 languages (TextMate/Sublime Text<em>.tmlanguage</em> files can be imported)</li>
9191
<li>Over 20 themes (TextMate/Sublime Text <em>.tmtheme</em> files can be imported)</li>
9292
<li>Automatic indent and outdent</li>
9393
<li>An optional command line</li>

lib/ace/editor.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,11 +455,10 @@ var Editor = function(renderer, session) {
455455
/**
456456
* {:VirtualRenderer.setTheme}
457457
* @param {String} theme The path to a theme
458-
*
459-
*
458+
* @param {Function} cb optional callback called when theme is loaded
460459
**/
461-
this.setTheme = function(theme) {
462-
this.renderer.setTheme(theme);
460+
this.setTheme = function(theme, cb) {
461+
this.renderer.setTheme(theme, cb);
463462
};
464463

465464
/**

0 commit comments

Comments
 (0)