jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update the site

Browse source
This commit is contained in:
nightwing 2014-01-08 03:14:35 +04:00
commit ce329df39b
4 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog.txt
View file

@ -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)

2
build

@ -1 +1 @@
Subproject commit 45d3068aa7190f08396bcfe134e505fe144c1ccb
Subproject commit b2f8bf1e745250596afea5b39c70b94421af906d

19
doc/site/js/main.js
View file

@ -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") {

16
index.html
View file

@ -173,16 +173,14 @@ console.log(addResult);
common operations, such as setting a different language mode or
getting the contents from the editor.
</p>
<h2>Loading Ace from a Local URL</h2>
<p>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.
</p>
<p>But, if you want to clone host Ace locally you can
<h2>Loading Ace from a Local URL</h2>
<p>If you want to clone and host Ace locally you can
use one of the <a href="https://github.com/ajaxorg/ace-builds/">pre-packaged versions</a>. Just copy
one of <code>src*</code> subdirectories somewhere into your project, or use RequireJS to load the
contents of <a href="https://github.com/ajaxorg/ace/tree/master/lib/ace">lib/ace</a> as <code>ace</code>:
contents of <a href="https://github.com/ajaxorg/ace/tree/master/lib/ace">lib/ace</a> folder as <code>ace</code>:
</p>
<p>The packaged version can also be loaded from CDN's such as <a href="http://www.jsdelivr.com/#!ace">jsDelivr</a> or <a href="http://cdnjs.com/libraries/ace/">cdnjs</a>.
</p>
<pre><code class="javascript">var ace = require("lib/ace");</code></pre>
</div>
<div class="tab-pane fade" id="howto">
<h1>Working with Ace</h1>
@ -1117,7 +1115,7 @@ if (match) {
<a href="http://bakemycss.mypathforpython.appspot.com/">BakeMyCss</a>
</li>
<li style="width: 248px;">
<img src="http://codecombat.com/images/logo.png" style="left: 48px; top: 10px;">
<img src="http://codecombat.com/images/pages/base/logo.png" style="left: 48px; top: 10px;">
<a href="http://codecombat.com">Code Combat</a>
</li>
<li>
@ -1178,7 +1176,7 @@ if (match) {
</li>
<li id="add_your_site">
<p>+</p>
<a href="mailto:ace@c9.io?subject=Put%20me%20on%20the%20Ace%20site!&body= adfadf asdf">Your Site Here</a>
<a href="mailto:ace@c9.io?subject=Put%20me%20on%20the%20Ace%20site!">Your Site Here</a>
</li>
</ul>
</div>