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

Merge remote-tracking branch 'remotes/megshark/master'

Browse source 
Conflicts:
	Makefile.dryice.js
	demo/kitchen-sink/demo.js
This commit is contained in:
nightwing 2012-05-23 22:08:18 +04:00
commit d50f526495
5 changed files with 222 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -120,7 +120,8 @@ var modes = [
new Mode("textile", "Textile", ["textile"]),
new Mode("xml", "XML", ["xml"]),
new Mode("sh", "SH", ["sh"]),
new Mode("xquery", "XQuery", ["xq"])
new Mode("xquery", "XQuery", ["xq"]),
new Mode("yaml", "YAML", require("ace/mode/yaml").Mode, ["yaml"])
];
modesByName = {};
@ -167,6 +168,10 @@ var docs = [
"xml", "XML",
require("ace/requirejs/text!./docs/xml.xml")
),
new Doc(
"yaml", "YAML",
require("ace/requirejs/text!./docs/yaml.yaml")
),
new Doc(
"svg", "SVG",
require("ace/requirejs/text!./docs/svg.svg")