diff --git a/ChangeLog.txt b/ChangeLog.txt
index 81168b8f..4b48f911 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,4 +1,5 @@
-
+2013.12.02 Version 1.1.2
+
* New Features
- Accessibility Theme for Ace (Peter Xiao)
- use snipetManager for expanding emmet snippets
@@ -21,9 +22,8 @@
- Protobuf (Zef Hemel)
- Soy
- Handlebars
- -
-2013.06.04 Version 1.1.01
+2013.06.04 Version 1.1.1
- Improved emacs keybindings (Robert Krahn)
- Added markClean, isClean methods to UndoManager (Joonsoo Jeon)
diff --git a/build b/build
index 45d3068a..b2f8bf1e 160000
--- a/build
+++ b/build
@@ -1 +1 @@
-Subproject commit 45d3068aa7190f08396bcfe134e505fe144c1ccb
+Subproject commit b2f8bf1e745250596afea5b39c70b94421af906d
diff --git a/doc/site/js/main.js b/doc/site/js/main.js
index 4762bab6..db3c1bcd 100644
--- a/doc/site/js/main.js
+++ b/doc/site/js/main.js
@@ -6,23 +6,21 @@ $(function() {
editor.container.style.opacity = "";
embedded_editor = ace.edit("embedded_ace_code");
embedded_editor.container.style.opacity = "";
- editor.session.setMode("ace/mode/javascript");
embedded_editor.session.setMode("ace/mode/html");
+ embedded_editor.setAutoScrollEditorIntoView(true);
+ embedded_editor.setOption("maxLines", 40);
editor.setOptions({
- maxLines: 30
- })
+ maxLines: 30,
+ mode: "ace/mode/javascript",
+ autoScrollEditorIntoView: true
+ });
ace.config.loadModule("ace/ext/emmet", function() {
ace.require("ace/lib/net").loadScript("http://nightwing.github.io/emmet-core/emmet.js", function() {
embedded_editor.setOption("enableEmmet", true);
editor.setOption("enableEmmet", true);
});
-
- embedded_editor.setOptions({
- enableSnippets: true,
- enableBasicAutocompletion: true
- });
});
ace.config.loadModule("ace/ext/language_tools", function() {
@@ -34,10 +32,7 @@ $(function() {
enableSnippets: true,
enableBasicAutocompletion: true
});
- });
-
- embedded_editor.setAutoScrollEditorIntoView(true);
- editor.setAutoScrollEditorIntoView(true);
+ });
$("ul.menu-list li").click(function(e) {
if (e.target.tagName === "LI") {
diff --git a/index.html b/index.html
index 9c1b03c9..cd18d94f 100644
--- a/index.html
+++ b/index.html
@@ -173,16 +173,14 @@ console.log(addResult);
common operations, such as setting a different language mode or
getting the contents from the editor.
- Loading Ace from a Local URL
- The above code is all you need to embed Ace in your site (including setting language modes
- and themes). Plus it's super fast because it's on Amazon's distributed content network.
-
- But, if you want to clone host Ace locally you can
+
Loading Ace from a Local URL
+ If you want to clone and host Ace locally you can
use one of the pre-packaged versions. Just copy
one of src* subdirectories somewhere into your project, or use RequireJS to load the
- contents of lib/ace as ace:
+ contents of lib/ace folder as ace:
+
+ The packaged version can also be loaded from CDN's such as jsDelivr or cdnjs.
- var ace = require("lib/ace");
+ 
Code Combat