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

Merge resolution

Browse source
This commit is contained in:
C9 2012-09-17 18:30:14 -04:00
commit 3e4847c88b
11 changed files with 64 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Readme.md
View file

@ -1,6 +1,8 @@
Ace (Ajax.org Cloud9 Editor)
============================
_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.
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.
Features

11
api/resources/csses/ace_api.css
View file

@ -156,6 +156,9 @@ form.navbar-search .search-query {
form.navbar-search .search-query:focus, form.navbar-search .search-query:active {
border: 1px solid #666;
}
.navbar-search .search-query:focus, .navbar-search .search-query.focused {
padding: 4px 9px;
}
@ -295,9 +298,14 @@ ul.menu {
.srolled .membersContent {
/*top : 0;*/
width: 625px;
padding-left: 330px;
padding-left: 327px;
margin : 0 auto 0 auto;
}
.srolled ul.nav {
padding-right: 10px;
}
.membersBackground {
/* background-color: white;
position: fixed;
@ -506,7 +514,6 @@ header.filler {
}
.centerpiece {
background: url(../images/sidebar_border.png) repeat-y 230px 0;
min-height: 100%;
padding: 10px 0;
}

2
api/resources/javascripts/clicker.js
View file

@ -61,7 +61,7 @@ function setupClicker() {
// for the top dropdown
$('li.memberLink a').click(transformHash);
$('a[href^="#"]').click(transformHash);
//$('a[href^="#"]').click(transformHash);
$('.related-to', '.metaInfo').click(function(){
location.hash = $(this).find('a').attr('href').split('#')[1];

11
doc/resources/ace/skeleton/csses/ace_api.css
View file

@ -156,6 +156,9 @@ form.navbar-search .search-query {
form.navbar-search .search-query:focus, form.navbar-search .search-query:active {
border: 1px solid #666;
}
.navbar-search .search-query:focus, .navbar-search .search-query.focused {
padding: 4px 9px;
}
@ -295,9 +298,14 @@ ul.menu {
.srolled .membersContent {
/*top : 0;*/
width: 625px;
padding-left: 330px;
padding-left: 327px;
margin : 0 auto 0 auto;
}
.srolled ul.nav {
padding-right: 10px;
}
.membersBackground {
/* background-color: white;
position: fixed;
@ -506,7 +514,6 @@ header.filler {
}
.centerpiece {
background: url(../images/sidebar_border.png) repeat-y 230px 0;
min-height: 100%;
padding: 10px 0;
}

2
doc/resources/ace/skeleton/javascripts/clicker.js
View file

@ -61,7 +61,7 @@ function setupClicker() {
// for the top dropdown
$('li.memberLink a').click(transformHash);
$('a[href^="#"]').click(transformHash);
//$('a[href^="#"]').click(transformHash);
$('.related-to', '.metaInfo').click(function(){
location.hash = $(this).find('a').attr('href').split('#')[1];

BIN
doc/site/images/ac-logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

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

@ -22,14 +22,14 @@ $(function() {
// used when page is access directly
function magicClickInterceptor(e) {
e.preventDefault();
var state = {};
state.api = $(this).attr("href").substring(6, $(this).attr("href").length - 5);
$.bbq.pushState(state);
var _self = $(this);
$("#apiHolder").load($(this).attr("href") + " #documentation", function(){
$("#apiHolder").removeClass("apiIntro").removeClass("span8");
$("#apiHolder").removeClass("apiIntro").removeClass("span8");
ux();
setupClicker();
@ -46,6 +46,10 @@ $(function() {
$('.menu-item a').click(magicClickInterceptor);
$('a.argument').click(magicClickInterceptor);
$('a.external').click(function(e) {
e.preventDefault();
});
var tabs = $("#tabnav"),
tab_a_selector = "a";
@ -100,6 +104,7 @@ $(function() {
$(window).on("hashchange", function(e) {
tabs.each(function() {
var idx = $.bbq.getState("nav") || "about";
var section = e.fragment.split("&")[1] || "";
$(this).find(tab_a_selector + "[href='#" + idx + "']").triggerHandler('click');
// handles dropping in from new link

1
doc/site/style.css
View file

@ -53,6 +53,7 @@ H3 {
H4 {
font-size:21px;
color:#222222;
margin-bottom:8px;
}
P {

89
index.html
View file

@ -337,7 +337,7 @@ editor.replace('bar');</code></pre>
//...
}
});</code></pre>
<h3>Importing Themes and Languages</h3>
<h3 id ="importing">Importing Themes and Languages</h3>
<p>ACE supports the importing of <em>.tmtheme</em> and <em>.tmlanguage</em> files for use
in the editor. The task is accomplished by two simple node scripts.</p>
@ -464,104 +464,69 @@ tests for the highlighting.</p>
<a href="http://rstudio.org/">RStudio</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href="https://github.com/Gozala/sky-edit">Sky Edit</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href="http://www.wavemaker.com/">WaveMaker</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href="http://www.playmycode.com/">Play My Code</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href="http://demo.qooxdoo.org/devel/playground/#">Qooxdoo playground</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href="http://ext.radiantcms.org/extensions/264-ace">Radiant CMS</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href="http://developercompanion.com/">Developer Companion</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href="http://www.pythonanywhere.com/">PythonAnywhere</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<img src="doc/site/images/ac-logo.png"
style="position: relative; left: 4px; top: 25px;" />
<a href="http://www.applicationcraft.com/">Application Craft</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href="https://github.com/Gozala/sky-edit">Sky Edit</a>
</li>
<li>
<a href="http://www.wavemaker.com/">WaveMaker</a>
</li>
<li>
<a href="http://www.playmycode.com/">Play My Code</a>
</li>
<li>
<a href="http://demo.qooxdoo.org/devel/playground/#">Qooxdoo playground</a>
</li>
<li>
<a href="http://ext.radiantcms.org/extensions/264-ace">Radiant CMS</a>
</li>
<li>
<a href="http://developercompanion.com/">Developer Companion</a>
</li>
<li>
<a href="http://www.pythonanywhere.com/">PythonAnywhere</a>
</li>
<li>
<a href="http://shiftedit.net/">shiftEdit</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href="http://www.akshell.com/">Akshell</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href="http://beanstalkapp.com/">beanstalk</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href="http://neutronide.com/">Neutron IDE</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href="https://addons.mozilla.org/en-US/firefox/addon/acebug/">Acebug</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href="http://www.weecod.com">Weecod</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href='http://rubymonk.com'>RubyMonk</a></li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href='http://rocktronica.github.com/tmpltr/'>tmpltr</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href='http://dev.cmsmadesimple.org/projects/aceeditor'>CMS Made Simple</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href='http://tryjasmine.com/'>Try Jasmine</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href="http://codebender.cc/">Codebender</a>
</li>
<li>
<img src="doc/site/images/empty-logo.png"
class="prod_no_image" />
<a href="https://www.sharelatex.com">ShareLaTeX</a>
</li>
<li>
<a href="http://finecut.info/">Fine Cut Engine</a>
</li>
<li id="add_your_site">
<p>+</p>
<a href="mailto:ace@c9.io?subject=Put me on the ACE site!">Your Site Here</a>

4
lib/ace/theme/monokai.css
View file

@ -53,11 +53,11 @@
}
.ace-monokai .ace_marker-layer .ace_active_line {
background: #49483E;
background: #202020;
}
.ace-monokai .ace_gutter_active_line {
background-color: #191916;
background-color: #272727;
}
.ace-monokai .ace_marker-layer .ace_selected_word {

7
lib/ace/worker/worker.js
View file

@ -1,8 +1,8 @@
"no use strict";
var console = {
log: function(msg) {
postMessage({type: "log", data: msg});
log: function(msgs) {
postMessage({type: "log", data: arguments.join(" ")});
}
};
var window = {
@ -30,6 +30,9 @@ var normalizeModule = function(parentId, moduleName) {
};
var require = function(parentId, id) {
if (!id.charAt)
throw new Error("worker.js require() accepts only (parentId, id) as arguments");
var id = normalizeModule(parentId, id);
var module = require.modules[id];