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

Merge branch 'haxesyntax'

Browse source 
Conflicts:
	demo/kitchen-sink/demo.js
This commit is contained in:
Fabian Jakobs 2011-11-15 11:38:43 +01:00
commit c97fc93a71
6 changed files with 183 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
demo/kitchen-sink/demo.js
View file

@ -107,6 +107,7 @@ var modes = [
new Mode("csharp", "C#", require("ace/mode/csharp").Mode, ["cs"]),
new Mode("css", "CSS", require("ace/mode/css").Mode, ["css"]),
new Mode("groovy", "Groovy", require("ace/mode/groovy").Mode, ["groovy"]),
new Mode("haxe", "haXe", require("ace/mode/haxe").Mode, ["hx"]),
new Mode("html", "HTML", require("ace/mode/html").Mode, ["html", "htm"]),
new Mode("java", "Java", require("ace/mode/java").Mode, ["java"]),
new Mode("javascript", "JavaScript", require("ace/mode/javascript").Mode, ["js"]),
@ -229,6 +230,10 @@ var docs = [
"c_cpp", "C/C++",
require("ace/requirejs/text!./docs/cpp.cpp")
),
new Doc(
"haxe", "haXe",
require("ace/requirejs/text!./docs/Haxe.hx")
),
new WrappedDoc(
"markdown", "Markdown",
require("ace/requirejs/text!./docs/markdown.md")