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

Merge branch 'master' of https://github.com/desoi/ace into desoi-master

Browse source 
Conflicts:
	Makefile.dryice.js
This commit is contained in:
Fabian Jakobs 2012-01-06 11:39:27 +01:00
commit cf6f4d88d3
6 changed files with 772 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -114,6 +114,7 @@ var modes = [
new Mode("markdown", "Markdown", require("ace/mode/markdown").Mode, ["md", "markdown"]),
new Mode("ocaml", "OCaml", require("ace/mode/ocaml").Mode, ["ml", "mli"]),
new Mode("perl", "Perl", require("ace/mode/perl").Mode, ["pl", "pm"]),
new Mode("pgsql", "pgSQL",require("ace/mode/pgsql").Mode, ["pgsql", "sql"]),
new Mode("php", "PHP",require("ace/mode/php").Mode, ["php"]),
new Mode("powershell", "Powershell", require("ace/mode/powershell").Mode, ["ps1"]),
new Mode("python", "Python", require("ace/mode/python").Mode, ["py"]),
@ -242,6 +243,14 @@ var docs = [
new WrappedDoc(
"latex", "LaTeX",
require("ace/requirejs/text!./docs/latex.tex")
),
new WrappedDoc(
"sql", "SQL",
require("ace/requirejs/text!./docs/sql.sql")
),
new WrappedDoc(
"pgsql", "pgSQL",
require("ace/requirejs/text!./docs/pgsql.pgsql")
)
];