Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile.dryice.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ function ace() {
for (var i = 0; i < 4; i++) {
buildAce({compress: i & 2, noconflict: i & 1, check: true});
}

copy.dirs(ACE_HOME + "/node_modules/ace-legacy-linters/build", BUILD_DIR, ["src", "src-min", "src-noconflict", "src-min-noconflict"]);
}

function correctDeclarationsForBuild(path, additionalDeclarations) {
Expand Down
1 change: 1 addition & 0 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Features
* Code folding
* Multiple cursors and selections
* Live syntax checker (currently JavaScript/CoffeeScript/CSS/XQuery)
* Full language client support for many languages available via [ace-linters](https://github.com/mkslanc/ace-linters)
* Cut, copy, and paste functionality

Take Ace for a spin!
Expand Down
2 changes: 1 addition & 1 deletion demo/kitchen-sink/require.js
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@
if (!/^\w+:/.test(path)) path = host + path;
var onLoad = function(e, val) {
if (e) return processLoadQueue({id: id, path: path});
if (!/^(\s|\/\*([^*]|[*](?!\/))*\*\/|\/\/.*[\r]?\n)*define\s*\(\s*function\s*\(\s*require\b/.test(val) && !/define\(\[\],/.test(val))
if (!/^(\s|\/\*([^*]|[*](?!\/))*\*\/|\/\/.*[\r]?\n)*define\s*\(\s*function\s*\(\s*require\b/.test(val) && !/define\(\[\],/.test(val) && !/ace\-legacy\-linters/.test(path))
val = "define(function(require, exports, module){" + val + "\n});"
nextModule = {name: id};
/* eslint no-eval:0 */
Expand Down
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ <h2>Features</h2>
<li>Code folding</li>
<li>Multiple cursors and selections</li>
<li>Live syntax checker (currently JavaScript/CoffeeScript/CSS/XQuery)</li>
<li>Full language client support for many languages available via <a href="https://github.com/mkslanc/ace-linters">ace-linters</a></li>
<li>Cut, copy, and paste functionality</li>
</ul>
<h2>Get the Open-Source Code</h2>
Expand Down
32 changes: 14 additions & 18 deletions kitchen-sink.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<script src="demo/kitchen-sink/require.js" type="text/javascript"></script>
<script>
var useLib = /lib=1/.test(location.search);
var legacyLintersBuild = "node_modules/ace-legacy-linters/build/src";
var paths = useLib ? {
ace: "lib/ace",
demo: "demo/kitchen-sink"
Expand All @@ -67,33 +68,28 @@
};

if (!useLib) {
Object.entries({
json_worker: "worker-json",
yaml_worker: "worker-yaml",
css_worker: "worker-css",
lua_worker: "worker-lua",
xml_worker: "worker-xml",
javascript_worker: "worker-javascript",
php_worker: "worker-php",
html_worker: "worker-html"
}).forEach(function(entry) {
paths["ace/mode/" + entry[0]] = legacyLintersBuild + "/" + entry[1];
});

[
"json_worker",
"xquery_worker",
"yaml_worker",
"xquery/xqlint",
"xquery/jsoniq_lexer",
"xquery/xquery_lexer",
"css/csslint",
"coffee_worker",
"css_worker",
"xquery",
"html/saxparser",
"php/php",
"lua/luaparse",
"xml/sax",
"xml/dom-parser",
"xml/dom",
"lua_worker",
"jsoniq",
"json/json_parse",
"xml_worker",
"coffee/coffee",
"javascript_worker",
"php_worker",
"yaml/yaml-lint",
"javascript/jshint",
"html_worker",
].forEach(function(m) {
paths["ace/mode/" + m] = "lib/ace/mode/" + m
})
Expand Down
Loading
Loading