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

Merge branch 'master' of github.com:ajaxorg/ace

Browse source 
Conflicts:
	demo/demo.js
	editor.html
This commit is contained in:
Fabian Jakobs 2011-02-03 10:13:18 +01:00
commit 89963dedac
4 changed files with 287 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
demo/demo.js
View file

@ -53,6 +53,7 @@ exports.launch = function(env) {
var PythonMode = require("ace/mode/python").Mode;
var PhpMode = require("ace/mode/php").Mode;
var JavaMode = require("ace/mode/java").Mode;
var RubyMode = require("ace/mode/ruby").Mode;
var TextMode = require("ace/mode/text").Mode;
var UndoManager = require("ace/undomanager").UndoManager;
@ -107,6 +108,10 @@ exports.launch = function(env) {
docs.java.setMode(new JavaMode());
docs.java.setUndoManager(new UndoManager());
docs.ruby = new EditSession(document.getElementById("rubytext").innerHTML);
docs.ruby.setMode(new RubyMode());
docs.ruby.setUndoManager(new UndoManager());
var container = document.getElementById("editor");
env.editor = new Editor(new Renderer(container, theme));
@ -119,7 +124,8 @@ exports.launch = function(env) {
javascript: new JavaScriptMode(),
python: new PythonMode(),
php: new PhpMode(),
java: new JavaMode()
java: new JavaMode(),
ruby: new RubyMode()
};
function getMode() {
@ -155,6 +161,9 @@ exports.launch = function(env) {
else if (mode instanceof JavaMode) {
modeEl.value = "java";
}
else if (mode instanceof RubyMode) {
modeEl.value = "ruby";
}
else {
modeEl.value = "text";
}
@ -282,6 +291,8 @@ exports.launch = function(env) {
mode = "php";
} else if (/^.*\.java$/i.test(file.name)) {
mode = "java";
} else if (/^.*\.rb$/i.test(file.name)) {
mode = "ruby";
}
env.editor.onTextInput(reader.result);