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

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

Browse source 
Conflicts:
	lib/ace/commands/command_manager.js
	lib/ace/test/mockrenderer.js
	lib/ace/test/all_browser.js
This commit is contained in:
nightwing 2012-04-07 00:39:11 +04:00
commit 1254357d92
359 changed files with 27169 additions and 12874 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,6 @@ var Doc = function(name, desc, file) {
this.name = name;
this.desc = desc;
this.doc = new EditSession(file);
this.doc.setMode(modesByName[name].mode);
this.doc.modeName = name;
this.doc.setUndoManager(new UndoManager());
};
@ -103,6 +102,7 @@ var modes = [
new Mode("json", "JSON", ["json"]),
new Mode("latex", "LaTeX", ["tex"]),
new Mode("lua", "Lua", ["lua"]),
new Mode("liquid", "Liquid", ["liquid"]),
new Mode("markdown", "Markdown", ["md", "markdown"]),
new Mode("ocaml", "OCaml", ["ml", "mli"]),
new Mode("perl", "Perl", ["pl", "pm"]),
@ -118,7 +118,8 @@ var modes = [
new Mode("text", "Text", ["txt"]),
new Mode("textile", "Textile", ["textile"]),
new Mode("xml", "XML", ["xml"]),
new Mode("sh", "SH", ["sh"])
new Mode("sh", "SH", ["sh"]),
new Mode("xquery", "XQuery", ["xq"])
];
modesByName = {};
@ -193,6 +194,10 @@ var docs = [
"lua", "Lua",
require("ace/requirejs/text!./docs/lua.lua")
),
new Doc(
"liquid", "Liquid",
require("ace/requirejs/text!./docs/liquid.liquid")
),
new Doc(
"java", "Java",
require("ace/requirejs/text!./docs/java.java")
@ -229,6 +234,10 @@ var docs = [
"sh", "SH",
require("ace/requirejs/text!./docs/sh.sh")
),
new Doc(
"xquery", "XQuery",
require("ace/requirejs/text!./docs/xquery.xq")
),
new WrappedDoc(
"markdown", "Markdown",
require("ace/requirejs/text!./docs/markdown.md")
@ -324,6 +333,12 @@ bindDropdown("mode", function(value) {
bindDropdown("doc", function(value) {
var doc = docsByName[value].doc;
if (!docsByName[value].initialized) {
docsByName[value].initialized = true;
doc.setMode(modesByName[docsByName[value].name].mode);
}
var session = env.split.setSession(doc);
session.name = doc.name;