diff --git a/Readme.md b/Readme.md index f9ec20d1..7960e48c 100644 --- a/Readme.md +++ b/Readme.md @@ -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 diff --git a/api/resources/csses/ace_api.css b/api/resources/csses/ace_api.css index f28658cc..1958d3d4 100644 --- a/api/resources/csses/ace_api.css +++ b/api/resources/csses/ace_api.css @@ -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; } diff --git a/api/resources/javascripts/clicker.js b/api/resources/javascripts/clicker.js index d37cf253..90e7e12c 100644 --- a/api/resources/javascripts/clicker.js +++ b/api/resources/javascripts/clicker.js @@ -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]; diff --git a/doc/resources/ace/skeleton/csses/ace_api.css b/doc/resources/ace/skeleton/csses/ace_api.css index f28658cc..1958d3d4 100644 --- a/doc/resources/ace/skeleton/csses/ace_api.css +++ b/doc/resources/ace/skeleton/csses/ace_api.css @@ -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; } diff --git a/doc/resources/ace/skeleton/javascripts/clicker.js b/doc/resources/ace/skeleton/javascripts/clicker.js index d37cf253..90e7e12c 100644 --- a/doc/resources/ace/skeleton/javascripts/clicker.js +++ b/doc/resources/ace/skeleton/javascripts/clicker.js @@ -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]; diff --git a/doc/site/images/ac-logo.png b/doc/site/images/ac-logo.png new file mode 100644 index 00000000..6ca069a3 Binary files /dev/null and b/doc/site/images/ac-logo.png differ diff --git a/doc/site/js/main.js b/doc/site/js/main.js index 8a1fd27a..6bfad39f 100644 --- a/doc/site/js/main.js +++ b/doc/site/js/main.js @@ -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 diff --git a/doc/site/style.css b/doc/site/style.css index 8f68d36d..bfb25f50 100644 --- a/doc/site/style.css +++ b/doc/site/style.css @@ -53,6 +53,7 @@ H3 { H4 { font-size:21px; color:#222222; + margin-bottom:8px; } P { diff --git a/index.html b/index.html index 7c4e77a9..874adfcb 100644 --- a/index.html +++ b/index.html @@ -337,7 +337,7 @@ editor.replace('bar'); //... } }); -

Importing Themes and Languages

+

Importing Themes and Languages

ACE supports the importing of .tmtheme and .tmlanguage files for use in the editor. The task is accomplished by two simple node scripts.

@@ -464,104 +464,69 @@ tests for the highlighting.

RStudio
  • - - Sky Edit -
    • -
  • - - WaveMaker -
    • -
  • - - Play My Code -
    • -
  • - - Qooxdoo playground -
    • -
  • - - Radiant CMS -
    • -
  • - - Developer Companion -
    • -
  • - - PythonAnywhere -
    • -
  • - + Application Craft
  • - + Sky Edit +
    • +
  • + WaveMaker +
    • +
  • + Play My Code +
    • +
  • + Qooxdoo playground +
    • +
  • + Radiant CMS +
    • +
  • + Developer Companion +
    • +
  • + PythonAnywhere +
    • +
  • shiftEdit
  • - Akshell
  • - beanstalk
  • - Neutron IDE
  • - Acebug
  • - Weecod
  • - RubyMonk
  • - tmpltr
  • - CMS Made Simple
  • - Try Jasmine
  • - Codebender
  • - ShareLaTeX
    • +
  • + Fine Cut Engine +

  • +

    Your Site Here diff --git a/lib/ace/theme/monokai.css b/lib/ace/theme/monokai.css index 19c95ed3..d2526206 100644 --- a/lib/ace/theme/monokai.css +++ b/lib/ace/theme/monokai.css @@ -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 { diff --git a/lib/ace/worker/worker.js b/lib/ace/worker/worker.js index 2e1853df..0e7270a3 100644 --- a/lib/ace/worker/worker.js +++ b/lib/ace/worker/worker.js @@ -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];