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

use nicer script name for bookmarklet

Browse source
This commit is contained in:
Fabian Jakobs 2011-12-19 13:02:29 +01:00
commit 9e35b31e2d
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build_support/editor_textarea.html
View file

@ -60,7 +60,7 @@ function inject(callback) {
}; };
}; };
load('ace-uncompressed-noconflict.js', "ace/ext/textarea", function() { load('ace-bookmarklet.js', "ace/ext/textarea", function() {
var ace = window.__ace_shadowed__; var ace = window.__ace_shadowed__;
ace.options.mode = "javascript"; ace.options.mode = "javascript";

4
lib/ace/ext/textarea.js
View file

@ -274,7 +274,7 @@ function setupApi(editor, editorDiv, settingDiv, ace, options, loader) {
case "mode": case "mode":
if (value != "text") { if (value != "text") {
// Load the required mode file. Files get loaded only once. // Load the required mode file. Files get loaded only once.
loader("mode-" + value + "-noconflict.js", "ace/mode/" + value, function() { loader("mode-" + value + ".js", "ace/mode/" + value, function() {
var aceMode = require("../mode/" + value).Mode; var aceMode = require("../mode/" + value).Mode;
session.setMode(new aceMode()); session.setMode(new aceMode());
}); });
@ -286,7 +286,7 @@ function setupApi(editor, editorDiv, settingDiv, ace, options, loader) {
case "theme": case "theme":
if (value != "textmate") { if (value != "textmate") {
// Load the required theme file. Files get loaded only once. // Load the required theme file. Files get loaded only once.
loader("theme-" + value + "-noconflict.js", "ace/theme/" + value, function() { loader("theme-" + value + ".js", "ace/theme/" + value, function() {
editor.setTheme("ace/theme/" + value); editor.setTheme("ace/theme/" + value);
}); });
} else { } else {