Skip to content

Commit cbfb690

Browse files
nightwingnightwing
committed
Merge remote-tracking branch 'remotes/origin/master' into worker
Conflicts: lib/ace/css/editor.css
2 parents 4b199d5 + d68cc38 commit cbfb690

170 files changed

Lines changed: 8587 additions & 4178 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ChangeLog.txt‎

Lines changed: 49 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,47 @@
1+
2012.09.17, Version 0.1.0
2+
3+
* New Features
4+
- Multiple cursors and selections (https://c9.io/site/blog/2012/08/be-an-armenian-warrior-with-block-selection-on-steroids/)
5+
- Fold buttons displayed in the gutter
6+
- Indent Guides
7+
- Completely reworked vim mode (Sergi Mansilla)
8+
- Improved emacs keybindings
9+
- Autoclosing of html tags (danyaPostfactum)
10+
11+
* 20 New language modes
12+
- Coldfusion (Russ)
13+
- Diff
14+
- GLSL (Ed Mackey)
15+
- Go (Davide Saurino)
16+
- Haxe (Jason O'Neil)
17+
- Jade (Garen Torikian)
18+
- jsx (Syu Kato)
19+
- LaTeX (James Allen)
20+
- Less (John Roepke)
21+
- Liquid (Bernie Telles)
22+
- Lua (Lee Gao)
23+
- LuaPage (Choonster)
24+
- Markdown (Chris Spencer)
25+
- PostgreSQL (John DeSoi)
26+
- Powershell (John Kane)
27+
- Sh (Richo Healey)
28+
- SQL (Jonathan Camile)
29+
- Tcl (Cristoph Hochreiner)
30+
- XQuery (William Candillion)
31+
- Yaml (Meg Sharkey)
32+
33+
* Live syntax checks
34+
- for XQuery and JSON
35+
36+
* New Themes
37+
- Ambiance (Irakli Gozalishvili)
38+
- Dreamweaver (Adam Jimenez)
39+
- Github (bootstraponline)
40+
- Tommorrow themes (https://github.com/chriskempson/tomorrow-theme)
41+
- XCode
42+
43+
* Many Small Enhancements and Bugfixes
44+
145
2011.08.02, Version 0.2.0
246

347
* Split view (Julian Viereck)
@@ -27,15 +71,14 @@
2771
- SCAD (Jacob Hansson)
2872

2973
* Live syntax checks
30-
- Lint for Css using CSS Lint <http://csslint.net/>
74+
- Lint for CSS using CSS Lint <http://csslint.net/>
3175
- CoffeeScript
3276

3377
* New Themes
3478
- Crimson Editor (iebuggy)
3579
- Merbivore (Michael Schwartz)
3680
- Merbivore soft (Michael Schwartz)
37-
- Solarized dark/light <http://ethanschoonover.com/solarized> (David Alan
38-
Hjelle)
81+
- Solarized dark/light <http://ethanschoonover.com/solarized> (David Alan Hjelle)
3982
- Vibrant Ink (Michael Schwartz)
4083

4184
* Small Features/Enhancements
@@ -48,19 +91,16 @@
4891
highlight are not affected (Irakli Gozalishvili)
4992
- Added setFontSize method
5093
- Improved vi keybindings (Trent Ogren)
51-
- When unfocused make cursor transparent instead of removing it (Harutyun
52-
Amirjanyan)
53-
- Support for matching groups in tokenizer with arrays of tokens (Chris
54-
Spencer)
94+
- When unfocused make cursor transparent instead of removing it (Harutyun Amirjanyan)
95+
- Support for matching groups in tokenizer with arrays of tokens (Chris Spencer)
5596

5697
* Bug fixes
5798
- Add support for the new OSX scroll bars
5899
- Properly highlight JavaScript regexp literals
59100
- Proper handling of unicode characters in JavaScript identifiers
60101
- Fix remove lines command on last line (Harutyun Amirjanyan)
61102
- Fix scroll wheel sluggishness in Safari
62-
- Make keyboard infrastructure route keys like []^$ the right way (Julian
63-
Viereck)
103+
- Make keyboard infrastructure route keys like []^$ the right way (Julian Viereck)
64104

65105
2011.02.14, Version 0.1.6
66106

‎Readme.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Ace (Ajax.org Cloud9 Editor)
22
============================
33

4+
_Note_: The new site at http://ace.ajax.org contains all the info below along with an embedding guide and all the other resources you need to get started with Ace.
5+
46
Ace is a standalone code editor written in JavaScript. Our goal is to create a browser based editor that matches and extends the features, usability and performance of existing native editors such as TextMate, Vim or Eclipse. It can be easily embedded in any web page or JavaScript application. Ace is developed as the primary editor for [Cloud9 IDE](http://www.cloud9ide.com/) and the successor of the Mozilla Skywriter (Bespin) Project.
57

68
Features

‎api/ace.html‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
1-
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
2-
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
3-
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
4-
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]--><html xmlns="http://www.w3.org/1999/xhtml"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><title>Ace - Ace API</title><meta name="generator" content="c9-doc-build"><meta name="description" content="Ace API documentation for the online code editor."><meta name="author" content="Garen J. Torikian"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./resources/csses/bootstrap.min.css"><link rel="stylesheet" href="./resources/csses/prettify.css"><link rel="stylesheet" href="./resources/csses/ace_api.css"><link href="./resources/images/favicon.ico" rel="icon" type="image/x-icon"><script src="./resources/javascripts/jquery.js"></script><script src="./resources/javascripts/clicker.js"></script><script src="./resources/javascripts/jquery.collapse.js"></script><script src="./resources/javascripts/jquery.cookie.js"></script><script src="./resources/javascripts/bootstrap-dropdown.js"></script><script src="./resources/javascripts/jquery-scrollspy.js"></script><script script src="./resources/javascripts/prettify-extension.js"></script></head><body><div class="navbar navbar-fixed-top"><div class="navbar-inner"><div id="topSection" class="container"><span class="brand"></span><ul class="nav topLinks"><li id="ace_site"><a href="../index.html">Ace</a></li><li id="ace_api" class="active"><a href="index.html">Ace API Reference</a></li></ul><form id="searchbox" action="" class="navbar-search pull-right"> <input name="query" type="text" placeholder="Search the API" title="Search across all the documentation" class="search-query span3"></form></div></div></div><div id="nonFooter"><div id="wrapper"><div class="content"><div class="row centerpiece"><div id="sidebarContainer" class="span3"><div id="sidebar"><div id="well"><h3>Ace Reference</h3><div class="swirl_divider"> </div><ul class="menu"><li><div class="menu-item"><a href="ace.html" class="menuLink namespace">Ace</a></div></li><li><div class="menu-item"><a href="anchor.html" class="menuLink namespace">Anchor</a></div></li><li><div class="menu-item"><a href="background_tokenizer.html" class="menuLink namespace">BackgroundTokenizer </a></div></li><li><div class="menu-item"><a href="document.html" class="menuLink namespace">Document </a></div></li><li><div class="menu-item"><a href="edit_session.html" class="menuLink namespace">EditSession </a></div></li><li><div class="menu-item"><a href="editor.html" class="menuLink namespace">Editor</a></div></li><li><div class="menu-item"><a href="range.html" class="menuLink namespace">Range</a></div></li><li><div class="menu-item"><a href="scrollbar.html" class="menuLink namespace">Scrollbar</a></div></li><li><div class="menu-item"><a href="search.html" class="menuLink namespace">Search </a></div></li><li><div class="menu-item"><a href="selection.html" class="menuLink namespace">Selection </a></div></li><li><div class="menu-item"><a href="token_iterator.html" class="menuLink namespace">TokenIterator</a></div></li><li><div class="menu-item"><a href="tokenizer.html" class="menuLink namespace">Tokenizer</a></div></li><li><div class="menu-item"><a href="undomanager.html" class="menuLink namespace">UndoManager</a></div></li><li><div class="menu-item"><a href="virtual_renderer.html" class="menuLink namespace">VirtualRenderer</a></div></li></ul></div></div></div><div id="mainContent" class="span9"><div id="documentation"><div class="classContent"><div class="membersBackground"></div><div class=" members pos0"><div class=" membersContent pos0"><h1 class="memberHeader"><span class="name">Ace<span class="editInC9"> <a href='http://c9.io/open/git/?url=git%3A%2F%2Fgithub.com%2Fajaxorg%2Face.git' title='Edit in Cloud9 IDE'>[edit]</a></span></span></h1><ul data-tabs="tabs" class="nav tabs pos0"><li data-dropdown="dropdown" class="dropdown"><ul class="dropdown-menu"></ul></li><li data-dropdown="dropdown" class="dropdown"><ul class="dropdown-menu"></ul></li><li data-dropdown="dropdown" class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle"><span>Functions (1)</span><b class="caret"></b></a><ul class="dropdown-menu"><li data-id="Ace.edit" class="memberLink"><a href="#Ace.edit" class="" title="Ace.edit (class method)" data-id="Ace.edit">edit</a></li></ul></li><li data-dropdown="dropdown" class="dropdown"><ul class="dropdown-menu"></ul></li><li data-dropdown="dropdown" class="dropdown"><ul class="dropdown-menu"></ul></li><li data-dropdown="dropdown" class="dropdown"><ul class="dropdown-menu"></ul></li><li data-dropdown="dropdown" class="dropdown"><ul class="dropdown-menu"></ul></li></ul></div></div><article id="Ace" data-title="Ace (class)" class="article"><div class="section description"><div class="memberContent"><p>The main class required to set up an Ace instance in the browser.</p>
5-
</div></div></article><h3 class="sectionHeader">Methods</h3><article id="Ace.edit" data-title="Ace.edit (class method)" class="article"><div class="section method"><div class="memberContent"><div class="title"><ul class="signatures"><li class="signature"><ul><li class="signature-call"><span id="Ace.edit" class="member-name methodClicker"><span class="sigClassName">Ace.</span><span class="sigMemberName">edit</span></span>(<span class="sigArgList"><a href="http://www.nodemanual.org/latest/js_doc/String.html" class="argument methodClicker" title="String" data-id="String">String</a> | <a href="https://developer.mozilla.org/en/DOM/element" class="argument methodClicker" title="DOMElement" data-id="DOMElement">DOMElement</a> el</span>)<li class="signature-returns"><ul class="argument-types"><li class="argument-type"><a href="editor.html#Editor" class="returnType " title="Editor (class)" data-id="Editor">Editor</a></li></ul></li></li></ul><ul class="metaInfo"></ul></li></ul></div><div class="sideToggler"><div id="ellipsis_Ace.edit" class="ellipsis_description"><p>This method embeds the Ace editor into the DOM, at the element provided by <code>el</code>.</p>
6-
</div><h3 id="Ace.edit" class="methodToggle methodClicker inactive">&nbsp;&nbsp;&nbsp;</h3><div class="description"><p>This method embeds the Ace editor into the DOM, at the element provided by <code>el</code>.</p>
1+
<div id="documentation" class="span8"><div class="classContent"><div class="membersBackground"></div><div class=" members pos0"><div class=" membersContent pos0"><h1 class="memberHeader"><span class="name">Ace<span class="editInC9"> <a href='http://c9.io/open/git/?url=git%3A%2F%2Fgithub.com%2Fajaxorg%2Face.git' title='Edit in Cloud9 IDE'>[edit]</a></span></span></h1><ul data-tabs="tabs" class="nav tabs pos0"><li data-dropdown="dropdown" class="dropdown"><ul class="dropdown-menu"></ul></li><li data-dropdown="dropdown" class="dropdown"><ul class="dropdown-menu"></ul></li><li data-dropdown="dropdown" class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle"><span>Functions (1)</span><b class="caret"></b></a><ul class="dropdown-menu"><li id="dropdown_Ace.edit" data-id="Ace.edit" class="memberLink"><a href="#Ace.edit" class="" title="Ace.edit (class method)" data-id="Ace.edit">edit</a></li></ul></li><li data-dropdown="dropdown" class="dropdown"><ul class="dropdown-menu"></ul></li><li data-dropdown="dropdown" class="dropdown"><ul class="dropdown-menu"></ul></li><li data-dropdown="dropdown" class="dropdown"><ul class="dropdown-menu"></ul></li><li data-dropdown="dropdown" class="dropdown"><ul class="dropdown-menu"></ul></li></ul></div></div><article id="Ace" data-title="Ace (class)" class="article"><div class="section description"><div class="memberContent"><p>The main class required to set up an Ace instance in the browser.</p>
2+
</div></div></article><h3 class="sectionHeader">Methods</h3><article id="Ace.edit" data-title="Ace.edit (class method)" class="article"><div class="section method"><div class="memberContent"><div class="title"><i id="Ace.edit" class="methodToggle methodClicker inactive icon-caret-right"></i><ul class="signatures"><li class="signature"><ul><li class="signature-call"><span id="Ace.edit" class="member-name methodClicker"><span class="sigClassName">Ace.</span><span class="sigMemberName">edit</span></span>(<span class="sigArgList"><a href="http://www.nodemanual.org/latest/js_doc/String.html" class="argument methodClicker" title="String" data-id="String">String</a> | <a href="https://developer.mozilla.org/en/DOM/element" class="argument methodClicker" title="DOMElement" data-id="DOMElement">DOMElement</a> el</span>)<li class="signature-returns"><ul class="argument-types"><li class="argument-type"><a href="#nav=api&api=editor" class="returnType " title="Editor (class)" data-id="Editor">Editor</a></li></ul></li></li></ul><ul class="metaInfo"></ul></li></ul></div><div class="sideToggler"><div id="ellipsis_Ace.edit" class="ellipsis_description"><p>This method embeds the Ace editor into the DOM, at the element provided by <code>el</code>.</p>
3+
</div><div class="description"><p>This method embeds the Ace editor into the DOM, at the element provided by <code>el</code>.</p>
74
<h4>Arguments</h4><table class="argumentTable argument-list table table-striped table-bordered"><tr class="argumentRow "><td class="argName ">el</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/String.html" class="" title="String" data-id="String">String</a> | <a href="https://developer.mozilla.org/en/DOM/element" class="" title="DOMElement" data-id="DOMElement">DOMElement</a></td><td class="argDescription "><p>Required. Either the id of an element, or the element itself</p>
8-
</td></tr></table></div></div></div></div></article></div></div><div id="disqus_thread"></div></div></div></div></div><div class="push"></div></div><div id="footer"><div class="footerInner"><div class="footer-text pull-right"> <p><a href="http://www.c9.io">About Cloud9</a> | Ace & Cloud9 IDE are &copy; <a href="http://ajax.org">Ajax.org</a> 2012</p></div></div></div><!-- scripts concatenated and minified via ant build script--><script defer src="./resources/javascripts/plugins.js"></script>
9-
<script defer src="./resources/javascripts/prettify.js"></script>
10-
<script defer src="./resources/javascripts/prettify-extension.js"></script>
11-
<script defer src="./resources/javascripts/ux.js"></script>
12-
<script defer src="./resources/javascripts/disqus-ext.js"></script>
13-
<script defer src="./resources/javascripts/ga.js"></script><!-- end scripts--><!--[if lt IE 7]><script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js"></script><script>window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})
14-
15-
</script><![endif]--></body></html>
5+
</td></tr></table></div></div></div></div></article></div><script defer src="./resources/javascripts/ux.js"></script><script src="./resources/javascripts/clicker.js"></script><script src="./resources/javascripts/jquery-scrollspy.js"></script><script defer src="./resources/javascripts/disqus-ext.js"></script><script defer src="./resources/javascripts/ga.js"></script><div id="disqus_thread"></div></div>

0 commit comments

Comments
 (0)