Merge branch 'master' into doc/api
This commit is contained in:
Garen Torikian
commit
d80ed19f65
325 changed files with 473 additions and 3145 deletions
|
|
@ -51,7 +51,7 @@ function main(args) {
|
|||
target = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!target) {
|
||||
console.log("--- Ace Dryice Build Tool ---");
|
||||
console.log("");
|
||||
|
|
@ -61,7 +61,7 @@ function main(args) {
|
|||
console.log(" bm Runs bookmarklet build of Ace");
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
|
||||
var aceProject = {
|
||||
roots: [
|
||||
ACE_HOME + '/lib',
|
||||
|
|
@ -69,7 +69,7 @@ function main(args) {
|
|||
],
|
||||
textPluginPattern: /^ace\/requirejs\/text!/
|
||||
};
|
||||
|
||||
|
||||
if (target == "normal") {
|
||||
ace(aceProject);
|
||||
}
|
||||
|
|
@ -91,7 +91,7 @@ function bookmarklet(aceProject) {
|
|||
source: "build_support/style.css",
|
||||
dest: targetDir + '/style.css'
|
||||
});
|
||||
|
||||
|
||||
buildAce(aceProject, {
|
||||
targetDir: targetDir + "/src",
|
||||
ns: "__ace_shadowed__",
|
||||
|
|
@ -125,7 +125,7 @@ function ace(aceProject) {
|
|||
name: "ace",
|
||||
workers: []
|
||||
});
|
||||
|
||||
|
||||
// compressed
|
||||
buildAce(aceProject, {
|
||||
compress: true,
|
||||
|
|
@ -145,7 +145,7 @@ function ace(aceProject) {
|
|||
});
|
||||
|
||||
console.log('# ace License | Readme | Changelog ---------');
|
||||
|
||||
|
||||
copy({
|
||||
source: "build_support/editor.html",
|
||||
dest: "build/editor.html"
|
||||
|
|
@ -175,7 +175,7 @@ function demo(aceProject) {
|
|||
ref = "";
|
||||
version = "";
|
||||
}
|
||||
|
||||
|
||||
copy({
|
||||
source: "kitchen-sink.html",
|
||||
dest: "build/kitchen-sink.html",
|
||||
|
|
@ -190,7 +190,7 @@ function demo(aceProject) {
|
|||
);
|
||||
}]
|
||||
});
|
||||
|
||||
|
||||
buildAce(aceProject, {
|
||||
targetDir: "build/demo/kitchen-sink",
|
||||
ns: "ace",
|
||||
|
|
@ -206,7 +206,7 @@ function demo(aceProject) {
|
|||
}
|
||||
|
||||
function buildAce(aceProject, options) {
|
||||
|
||||
|
||||
var defaults = {
|
||||
targetDir: __dirname + "/build/src",
|
||||
ns: "ace",
|
||||
|
|
@ -220,10 +220,11 @@ function buildAce(aceProject, options) {
|
|||
modes: [
|
||||
"css", "html", "javascript", "php", "coldfusion", "python", "lua", "xml", "ruby", "java", "c_cpp",
|
||||
"coffee", "perl", "csharp", "haxe", "svg", "clojure", "scss", "json", "groovy",
|
||||
"ocaml", "scala", "textile", "scad", "markdown", "latex", "powershell", "sql", "pgsql"
|
||||
"ocaml", "scala", "textile", "scad", "markdown", "latex", "powershell", "sql",
|
||||
"text", "pgsql"
|
||||
],
|
||||
themes: [
|
||||
"chrome", "clouds", "clouds_midnight", "cobalt", "crimson_editor", "dawn",
|
||||
"chrome", "clouds", "clouds_midnight", "cobalt", "crimson_editor", "dawn",
|
||||
"dreamweaver", "eclipse",
|
||||
"idle_fingers", "kr_theme", "merbivore", "merbivore_soft",
|
||||
"mono_industrial", "monokai", "pastel_on_dark", "solarized_dark",
|
||||
|
|
@ -234,11 +235,11 @@ function buildAce(aceProject, options) {
|
|||
workers: ["javascript", "coffee", "css"],
|
||||
keybindings: ["vim", "emacs"]
|
||||
};
|
||||
|
||||
|
||||
for(var key in defaults)
|
||||
if (!options.hasOwnProperty(key))
|
||||
options[key] = defaults[key];
|
||||
|
||||
|
||||
if (!options.requires)
|
||||
options.requires = [options.exportModule];
|
||||
|
||||
|
|
@ -247,18 +248,18 @@ function buildAce(aceProject, options) {
|
|||
if (options.noconflict) {
|
||||
filters.push(namespace(options.ns));
|
||||
if (options.exportModule)
|
||||
filters.push(exportAce(options.ns, options.exportModule, options.ns));
|
||||
var exportFilter = exportAce(options.ns, options.exportModule, options.ns);
|
||||
} else if (options.exportModule) {
|
||||
filters.push(exportAce(options.ns, options.exportModule));
|
||||
var exportFilter = exportAce(options.ns, options.exportModule);
|
||||
}
|
||||
|
||||
|
||||
if (options.compress)
|
||||
filters.push(copy.filter.uglifyjs);
|
||||
|
||||
|
||||
var suffix = options.suffix;
|
||||
var targetDir = options.targetDir;
|
||||
var name = options.name;
|
||||
|
||||
|
||||
var project = copy.createCommonJsProject(aceProject);
|
||||
var ace = copy.createDataObject();
|
||||
copy({
|
||||
|
|
@ -267,29 +268,29 @@ function buildAce(aceProject, options) {
|
|||
});
|
||||
copy({
|
||||
source: [
|
||||
copy.source.commonjs({
|
||||
{
|
||||
project: project,
|
||||
require: options.requires
|
||||
})
|
||||
}
|
||||
],
|
||||
filter: [ copy.filter.moduleDefines ],
|
||||
dest: ace
|
||||
});
|
||||
|
||||
|
||||
copy({
|
||||
source: ace,
|
||||
filter: filters,
|
||||
filter: exportFilter ? filters.concat(exportFilter) : filters,
|
||||
dest: targetDir + '/' + name + suffix
|
||||
});
|
||||
|
||||
|
||||
if (options.compat) {
|
||||
project.assumeAllFilesLoaded();
|
||||
copy({
|
||||
source: [
|
||||
copy.source.commonjs({
|
||||
{
|
||||
project: cloneProject(project),
|
||||
require: [ "pilot/index" ]
|
||||
})
|
||||
}
|
||||
],
|
||||
filter: filters,
|
||||
dest: targetDir + "/" + name + "-compat" + suffix
|
||||
|
|
@ -297,38 +298,39 @@ function buildAce(aceProject, options) {
|
|||
}
|
||||
|
||||
console.log('# ace modes ---------');
|
||||
|
||||
|
||||
project.assumeAllFilesLoaded();
|
||||
options.modes.forEach(function(mode) {
|
||||
console.log("mode " + mode);
|
||||
copy({
|
||||
source: [
|
||||
copy.source.commonjs({
|
||||
{
|
||||
project: cloneProject(project),
|
||||
require: [ 'ace/mode/' + mode ]
|
||||
})
|
||||
}
|
||||
],
|
||||
filter: filters,
|
||||
dest: targetDir + "/mode-" + mode + suffix
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
console.log('# ace themes ---------');
|
||||
|
||||
|
||||
project.assumeAllFilesLoaded();
|
||||
options.themes.forEach(function(theme) {
|
||||
console.log("theme " + theme);
|
||||
copy({
|
||||
source: [{
|
||||
root: ACE_HOME + '/lib',
|
||||
include: "ace/theme/" + theme + ".js"
|
||||
project: cloneProject(project),
|
||||
require: ["ace/theme/" + theme]
|
||||
}],
|
||||
filter: filters,
|
||||
dest: targetDir + "/theme-" + theme + suffix
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
console.log('# ace worker ---------');
|
||||
|
||||
|
||||
options.workers.forEach(function(mode) {
|
||||
console.log("worker for " + mode + " mode");
|
||||
var worker = copy.createDataObject();
|
||||
|
|
@ -340,7 +342,7 @@ function buildAce(aceProject, options) {
|
|||
});
|
||||
copy({
|
||||
source: [
|
||||
copy.source.commonjs({
|
||||
{
|
||||
project: workerProject,
|
||||
require: [
|
||||
'ace/lib/fixoldbrowsers',
|
||||
|
|
@ -348,7 +350,7 @@ function buildAce(aceProject, options) {
|
|||
'ace/lib/oop',
|
||||
'ace/mode/' + mode + '_worker'
|
||||
]
|
||||
})
|
||||
}
|
||||
],
|
||||
filter: [ copy.filter.moduleDefines, filterTextPlugin ],
|
||||
dest: worker
|
||||
|
|
@ -362,18 +364,18 @@ function buildAce(aceProject, options) {
|
|||
dest: targetDir + "/worker-" + mode + ".js"
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
console.log('# ace key bindings ---------');
|
||||
|
||||
|
||||
// copy key bindings
|
||||
project.assumeAllFilesLoaded();
|
||||
options.keybindings.forEach(function(keybinding) {
|
||||
copy({
|
||||
source: [
|
||||
copy.source.commonjs({
|
||||
{
|
||||
project: cloneProject(project),
|
||||
require: [ 'ace/keyboard/keybinding/' + keybinding ]
|
||||
})
|
||||
}
|
||||
],
|
||||
filter: filters,
|
||||
dest: "build/src/keybinding-" + keybinding + suffix
|
||||
|
|
@ -388,12 +390,12 @@ function cloneProject(project) {
|
|||
ignores: project.ignoreRequires
|
||||
});
|
||||
|
||||
Object.keys(project.currentFiles).forEach(function(module) {
|
||||
clone.currentFiles[module] = project.currentFiles[module];
|
||||
Object.keys(project.currentModules).forEach(function(module) {
|
||||
clone.currentModules[module] = project.currentModules[module];
|
||||
});
|
||||
|
||||
Object.keys(project.ignoredFiles).forEach(function(module) {
|
||||
clone.ignoredFiles[module] = project.ignoredFiles[module];
|
||||
Object.keys(project.ignoredModules).forEach(function(module) {
|
||||
clone.ignoredModules[module] = project.ignoredModules[module];
|
||||
});
|
||||
|
||||
return clone;
|
||||
|
|
@ -409,7 +411,7 @@ function namespace(ns) {
|
|||
.toString()
|
||||
.replace('var ACE_NAMESPACE = "";', 'var ACE_NAMESPACE = "' + ns +'";')
|
||||
.replace(/\bdefine\(/g, ns + ".define(");
|
||||
|
||||
|
||||
return text;
|
||||
};
|
||||
}
|
||||
|
|
@ -418,7 +420,7 @@ function exportAce(ns, module, requireBase) {
|
|||
requireBase = requireBase || "window";
|
||||
module = module || "ace/ace";
|
||||
return function(text) {
|
||||
|
||||
|
||||
var template = function() {
|
||||
(function() {
|
||||
REQUIRE_NS.require(["MODULE"], function(a) {
|
||||
|
|
@ -429,7 +431,7 @@ function exportAce(ns, module, requireBase) {
|
|||
});
|
||||
})();
|
||||
};
|
||||
|
||||
|
||||
return (text + ";" + template
|
||||
.toString()
|
||||
.replace(/MODULE/g, module)
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
* @param module a name for the payload
|
||||
* @param payload a function to call with (require, exports, module) params
|
||||
*/
|
||||
|
||||
|
||||
(function() {
|
||||
|
||||
var ACE_NAMESPACE = "";
|
||||
|
|
@ -49,9 +49,6 @@ var global = (function() {
|
|||
return this;
|
||||
})();
|
||||
|
||||
if (typeof requirejs !== "undefined")
|
||||
return;
|
||||
|
||||
var _define = function(module, deps, payload) {
|
||||
if (typeof module !== 'string') {
|
||||
if (_define.original)
|
||||
|
|
@ -68,7 +65,7 @@ var _define = function(module, deps, payload) {
|
|||
|
||||
if (!_define.modules)
|
||||
_define.modules = {};
|
||||
|
||||
|
||||
_define.modules[module] = payload;
|
||||
};
|
||||
|
||||
|
|
@ -92,11 +89,11 @@ var _require = function(parentId, module, callback) {
|
|||
var payload = lookup(parentId, module);
|
||||
if (!payload && _require.original)
|
||||
return _require.original.apply(window, arguments);
|
||||
|
||||
|
||||
if (callback) {
|
||||
callback();
|
||||
}
|
||||
|
||||
|
||||
return payload;
|
||||
}
|
||||
else {
|
||||
|
|
@ -115,13 +112,13 @@ var normalizeModule = function(parentId, moduleName) {
|
|||
if (moduleName.charAt(0) == ".") {
|
||||
var base = parentId.split("/").slice(0, -1).join("/");
|
||||
moduleName = base + "/" + moduleName;
|
||||
|
||||
|
||||
while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
|
||||
var previous = moduleName;
|
||||
moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return moduleName;
|
||||
};
|
||||
|
||||
|
|
@ -141,19 +138,19 @@ var lookup = function(parentId, moduleName) {
|
|||
if (typeof module === 'function') {
|
||||
var exports = {};
|
||||
var mod = {
|
||||
id: moduleName,
|
||||
id: moduleName,
|
||||
uri: '',
|
||||
exports: exports,
|
||||
packaged: true
|
||||
};
|
||||
|
||||
|
||||
var req = function(module, callback) {
|
||||
return _require(moduleName, module, callback);
|
||||
};
|
||||
|
||||
|
||||
var returnValue = module(req, exports, mod);
|
||||
exports = returnValue || mod.exports;
|
||||
|
||||
|
||||
// cache the resulting module object for next time
|
||||
_define.modules[moduleName] = exports;
|
||||
return exports;
|
||||
|
|
@ -163,26 +160,45 @@ var lookup = function(parentId, moduleName) {
|
|||
};
|
||||
|
||||
function exportAce(ns) {
|
||||
|
||||
if (typeof requirejs !== "undefined") {
|
||||
|
||||
var define = global.define;
|
||||
global.define = function(id, deps, callback) {
|
||||
if (typeof callback !== "function")
|
||||
return define.apply(this, arguments);
|
||||
|
||||
return define(id, deps, function(require, exports, module) {
|
||||
if (deps[2] == "module")
|
||||
module.packaged = true;
|
||||
return callback.apply(this, arguments);
|
||||
});
|
||||
};
|
||||
global.define.packaged = true;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
var require = function(module, callback) {
|
||||
return _require("", module, callback);
|
||||
};
|
||||
require.packaged = true;
|
||||
|
||||
|
||||
var root = global;
|
||||
if (ns) {
|
||||
if (!global[ns])
|
||||
global[ns] = {};
|
||||
root = global[ns];
|
||||
}
|
||||
|
||||
|
||||
if (root.define)
|
||||
_define.original = root.define;
|
||||
|
||||
|
||||
root.define = _define;
|
||||
|
||||
if (root.require)
|
||||
_require.original = root.require;
|
||||
|
||||
|
||||
root.require = require;
|
||||
}
|
||||
|
||||
|
|
@ -232,7 +248,7 @@ define('kitchen-sink/demo', ['require', 'exports', 'module' , 'ace/lib/fixoldbro
|
|||
|
||||
require("ace/lib/fixoldbrowsers");
|
||||
var env = {};
|
||||
|
||||
|
||||
var net = require("ace/lib/net");
|
||||
var event = require("ace/lib/event");
|
||||
var theme = require("ace/theme/textmate");
|
||||
|
|
@ -256,7 +272,7 @@ var Doc = function(name, desc, file) {
|
|||
|
||||
var WrappedDoc = function(name, desc, file) {
|
||||
Doc.apply(this, arguments);
|
||||
|
||||
|
||||
this.doc.setUseWrapMode(true);
|
||||
this.doc.setWrapLimitRange(80, 80);
|
||||
};
|
||||
|
|
@ -267,7 +283,7 @@ var Mode = function(name, desc, clazz, extensions) {
|
|||
this.clazz = clazz;
|
||||
this.mode = new clazz();
|
||||
this.mode.name = name;
|
||||
|
||||
|
||||
this.extRe = new RegExp("^.*\\.(" + extensions.join("|") + ")$", "g");
|
||||
};
|
||||
|
||||
|
|
@ -279,7 +295,7 @@ var themes = {};
|
|||
function loadTheme(name, callback) {
|
||||
if (themes[name])
|
||||
return callback();
|
||||
|
||||
|
||||
themes[name] = 1;
|
||||
var base = name.split("/").pop();
|
||||
var fileName = "demo/kitchen-sink/theme-" + base + "-uncompressed.js";
|
||||
|
|
@ -549,6 +565,9 @@ bindDropdown("mode", function(value) {
|
|||
});
|
||||
|
||||
bindDropdown("theme", function(value) {
|
||||
if (!value)
|
||||
return;
|
||||
|
||||
if (module.packaged) {
|
||||
loadTheme(value, function() {
|
||||
env.editor.setTheme(value);
|
||||
|
|
@ -2186,20 +2205,9 @@ else {
|
|||
}
|
||||
|
||||
exports.addMouseWheelListener = function(el, callback) {
|
||||
var max = 0;
|
||||
var factor = 8;
|
||||
var listener = function(e) {
|
||||
if (e.wheelDelta !== undefined) {
|
||||
|
||||
// some versions of Safari (e.g. 5.0.5) report insanely high
|
||||
// scroll values. These browsers require a higher factor
|
||||
if (Math.abs(e.wheelDeltaY) > max)
|
||||
max = Math.abs(e.wheelDeltaY);
|
||||
|
||||
if (max > 5000)
|
||||
var factor = 400;
|
||||
else
|
||||
var factor = 8;
|
||||
|
||||
if (e.wheelDeltaX !== undefined) {
|
||||
e.wheelX = -e.wheelDeltaX / factor;
|
||||
e.wheelY = -e.wheelDeltaY / factor;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/chrome', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/chrome', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
|
||||
exports.cssClass = "ace-chrome";
|
||||
exports.cssText = ".ace-chrome .ace_editor {\
|
||||
|
|
@ -211,13 +211,3 @@ var dom = require("../lib/dom");
|
|||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/clouds', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/clouds', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
|
||||
exports.isDark = false;
|
||||
exports.cssClass = "ace-clouds";
|
||||
|
|
@ -150,13 +150,3 @@ var dom = require("../lib/dom");
|
|||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/clouds_midnight', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/clouds_midnight', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
|
||||
exports.isDark = true;
|
||||
exports.cssClass = "ace-clouds-midnight";
|
||||
|
|
@ -151,13 +151,3 @@ var dom = require("../lib/dom");
|
|||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/cobalt', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/cobalt', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
|
||||
exports.isDark = true;
|
||||
exports.cssClass = "ace-cobalt";
|
||||
|
|
@ -164,13 +164,3 @@ background-color:#001221;\
|
|||
var dom = require("../lib/dom");
|
||||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/crimson_editor', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/crimson_editor', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
exports.isDark = false;
|
||||
exports.cssText = ".ace-crimson-editor .ace_editor {\
|
||||
border: 2px solid rgb(159, 159, 159);\
|
||||
|
|
@ -196,13 +196,3 @@ exports.cssClass = "ace-crimson-editor";
|
|||
var dom = require("../lib/dom");
|
||||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/dawn', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/dawn', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
|
||||
exports.isDark = false;
|
||||
exports.cssClass = "ace-dawn";
|
||||
|
|
@ -167,13 +167,3 @@ color:#5A525F;\
|
|||
var dom = require("../lib/dom");
|
||||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/dreamweaver', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/dreamweaver', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
exports.isDark = false;
|
||||
exports.cssClass = "ace-tm";
|
||||
exports.cssText = ".ace-tm .ace_editor {\
|
||||
|
|
@ -224,13 +224,3 @@ exports.cssText = ".ace-tm .ace_editor {\
|
|||
var dom = require("../lib/dom");
|
||||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/eclipse', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/eclipse', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
"use strict";
|
||||
|
||||
exports.isDark = false;
|
||||
|
|
@ -143,13 +143,3 @@ exports.cssClass = "ace-eclipse";
|
|||
var dom = require("../lib/dom");
|
||||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/idle_fingers', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/idle_fingers', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
|
||||
exports.isDark = true;
|
||||
exports.cssClass = "ace-idle-fingers";
|
||||
|
|
@ -156,13 +156,3 @@ background-color:#FFF980; \
|
|||
var dom = require("../lib/dom");
|
||||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/kr_theme', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/kr_theme', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
|
||||
exports.isDark = true;
|
||||
exports.cssClass = "ace-kr-theme";
|
||||
|
|
@ -159,13 +159,3 @@ color:#706D5B;\
|
|||
var dom = require("../lib/dom");
|
||||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/merbivore', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/merbivore', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
|
||||
exports.isDark = true;
|
||||
exports.cssClass = "ace-merbivore";
|
||||
|
|
@ -159,13 +159,3 @@ color:#AD2EA4;\
|
|||
var dom = require("../lib/dom");
|
||||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/merbivore_soft', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/merbivore_soft', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
|
||||
exports.isDark = true;
|
||||
exports.cssClass = "ace-merbivore-soft";
|
||||
|
|
@ -165,13 +165,3 @@ color:#AC4BB8;\
|
|||
var dom = require("../lib/dom");
|
||||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/mono_industrial', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/mono_industrial', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
|
||||
exports.isDark = true;
|
||||
exports.cssClass = "ace-mono-industrial";
|
||||
|
|
@ -159,13 +159,3 @@ background-color:#151C19;\
|
|||
var dom = require("../lib/dom");
|
||||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/monokai', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/monokai', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
|
||||
exports.isDark = true;
|
||||
exports.cssClass = "ace-monokai";
|
||||
|
|
@ -155,13 +155,3 @@ background-color:#AE81FF;\
|
|||
var dom = require("../lib/dom");
|
||||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/pastel_on_dark', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/pastel_on_dark', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
|
||||
exports.isDark = true;
|
||||
exports.cssClass = "ace-pastel-on-dark";
|
||||
|
|
@ -177,13 +177,3 @@ color:#D2A8A1;\
|
|||
var dom = require("../lib/dom");
|
||||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/solarized_dark', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/solarized_dark', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
|
||||
exports.isDark = true;
|
||||
exports.cssClass = "ace-solarized-dark";
|
||||
|
|
@ -154,13 +154,3 @@ color:#657B83;\
|
|||
var dom = require("../lib/dom");
|
||||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/solarized_light', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
define('ace/theme/solarized_light', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
|
||||
|
||||
exports.isDark = false;
|
||||
exports.cssClass = "ace-solarized-light";
|
||||
|
|
@ -153,13 +153,3 @@ exports.cssText = "\
|
|||
var dom = require("../lib/dom");
|
||||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -1,210 +0,0 @@
|
|||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Ajax.org Code Editor (ACE).
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Ajax.org B.V.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2010
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Fabian Jakobs <fabian AT ajax DOT org>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define('ace/theme/textmate', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
"use strict";
|
||||
|
||||
exports.isDark = false;
|
||||
exports.cssClass = "ace-tm";
|
||||
exports.cssText = ".ace-tm .ace_editor {\
|
||||
border: 2px solid rgb(159, 159, 159);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_editor.ace_focus {\
|
||||
border: 2px solid #327fbd;\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_gutter {\
|
||||
background: #e8e8e8;\
|
||||
color: #333;\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_print_margin {\
|
||||
width: 1px;\
|
||||
background: #e8e8e8;\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_fold {\
|
||||
background-color: #6B72E6;\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_text-layer {\
|
||||
cursor: text;\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_cursor {\
|
||||
border-left: 2px solid black;\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_cursor.ace_overwrite {\
|
||||
border-left: 0px;\
|
||||
border-bottom: 1px solid black;\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_invisible {\
|
||||
color: rgb(191, 191, 191);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_keyword {\
|
||||
color: blue;\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_constant.ace_buildin {\
|
||||
color: rgb(88, 72, 246);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_constant.ace_language {\
|
||||
color: rgb(88, 92, 246);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_constant.ace_library {\
|
||||
color: rgb(6, 150, 14);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_invalid {\
|
||||
background-color: rgb(153, 0, 0);\
|
||||
color: white;\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_support.ace_function {\
|
||||
color: rgb(60, 76, 114);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_support.ace_constant {\
|
||||
color: rgb(6, 150, 14);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_support.ace_type,\
|
||||
.ace-tm .ace_line .ace_support.ace_class {\
|
||||
color: rgb(109, 121, 222);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_keyword.ace_operator {\
|
||||
color: rgb(104, 118, 135);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_string {\
|
||||
color: rgb(3, 106, 7);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_comment {\
|
||||
color: rgb(76, 136, 107);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_comment.ace_doc {\
|
||||
color: rgb(0, 102, 255);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {\
|
||||
color: rgb(128, 159, 191);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_constant.ace_numeric {\
|
||||
color: rgb(0, 0, 205);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_variable {\
|
||||
color: rgb(49, 132, 149);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_line .ace_xml_pe {\
|
||||
color: rgb(104, 104, 91);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_entity.ace_name.ace_function {\
|
||||
color: #0000A2;\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_markup.ace_markupine {\
|
||||
text-decoration:underline;\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_markup.ace_heading {\
|
||||
color: rgb(12, 7, 255);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_markup.ace_list {\
|
||||
color:rgb(185, 6, 144);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_marker-layer .ace_selection {\
|
||||
background: rgb(181, 213, 255);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_marker-layer .ace_step {\
|
||||
background: rgb(252, 255, 0);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_marker-layer .ace_stack {\
|
||||
background: rgb(164, 229, 101);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_marker-layer .ace_bracket {\
|
||||
margin: -1px 0 0 -1px;\
|
||||
border: 1px solid rgb(192, 192, 192);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_marker-layer .ace_active_line {\
|
||||
background: rgba(0, 0, 0, 0.07);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_marker-layer .ace_selected_word {\
|
||||
background: rgb(250, 250, 255);\
|
||||
border: 1px solid rgb(200, 200, 250);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_meta.ace_tag {\
|
||||
color:rgb(28, 2, 255);\
|
||||
}\
|
||||
\
|
||||
.ace-tm .ace_string.ace_regex {\
|
||||
color: rgb(255, 0, 0)\
|
||||
}";
|
||||
|
||||
var dom = require("../lib/dom");
|
||||
dom.importCssString(exports.cssText, exports.cssClass);
|
||||
});
|
||||
;
|
||||
(function() {
|
||||
window.require(["ace/ace"], function(a) {
|
||||
if (!window.ace)
|
||||
window.ace = {};
|
||||
for (var key in a) if (a.hasOwnProperty(key))
|
||||
ace[key] = a[key];
|
||||
});
|
||||
})();
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue