From acce02adcd4a0b43217f0ae1b937fee04bdc2ebd Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Mon, 1 Oct 2012 21:06:25 -0600 Subject: [PATCH 01/13] Fix removeLicenceComments typo. --- Makefile.dryice.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.dryice.js b/Makefile.dryice.js index 6c55a5bd..814b1c5e 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -269,7 +269,7 @@ function buildAce(options) { copy.filter.moduleDefines, filterTextPlugin, removeUseStrict, - removeLicenceCmments + removeLicenceComments ]; if (options.noconflict) { @@ -370,7 +370,7 @@ function buildAce(options) { copy.filter.moduleDefines, filterTextPlugin, removeUseStrict, - removeLicenceCmments + removeLicenceComments ]; options.workers.forEach(function(mode) { @@ -466,7 +466,7 @@ function removeUseStrict(text) { return text.replace(/['"]use strict['"];/g, ""); } -function removeLicenceCmments(text) { +function removeLicenceComments(text) { return text.replace(/(;)\s*\/\*[\d\D]*?\*\//g, "$1"); } From 6eecc42409d0c67abd1a4275545df8d612040af5 Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Mon, 1 Oct 2012 21:06:53 -0600 Subject: [PATCH 02/13] Add missing ; --- Makefile.dryice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.dryice.js b/Makefile.dryice.js index 814b1c5e..807058a2 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -336,7 +336,7 @@ function buildAce(options) { dest: targetDir + "/theme-" + theme + ".js" });*/ // use this instead, to not create separate modules for js and css - var themePath = ACE_HOME + "/lib/ace/theme/" + theme + var themePath = ACE_HOME + "/lib/ace/theme/" + theme; var js = fs.readFileSync(themePath + ".js", "utf8"); js = js.replace("define(", "define('ace/theme/" + theme + "', ['require', 'exports', 'module', 'ace/lib/dom'], "); From 3e5fa146a1e14e96df83ccb3fed70acf409472ae Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Mon, 1 Oct 2012 21:08:56 -0600 Subject: [PATCH 03/13] Include ext in dryice. Fix #986. --- Makefile.dryice.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Makefile.dryice.js b/Makefile.dryice.js index 807058a2..2239215b 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -245,6 +245,10 @@ function buildAce(options) { themes: fs.readdirSync(ACE_HOME + "/lib/ace/theme").map(function(x){ return x.slice(-3) == ".js" && x.slice(0, -3); }).filter(function(x){ return !!x; }), + extensions: fs.readdirSync(ACE_HOME + "/lib/ace/ext").map(function(x){ + if (x.slice(-3) == ".js" && !/_test/.test(x)) + return x.slice(0, -3); + }).filter(function(x){ return !!x; }), workers: ["javascript", "coffee", "css", "json", "xquery"], keybindings: ["vim", "emacs"] }; @@ -349,6 +353,21 @@ function buildAce(options) { fs.writeFileSync(targetDir + "/theme-" + theme + ".js", js); }); + console.log('# ace extensions ---------'); + + project.assumeAllFilesLoaded(); + options.extensions.forEach(function(ext) { + console.log("extensions " + ext); + copy({ + source: [{ + project: cloneProject(project), + require: [ 'ace/ext/' + ext ] + }], + filter: filters, + dest: targetDir + "/ext-" + ext + ".js" + }); + }); + console.log('# ace key bindings ---------'); // copy key bindings From 6cfe9617c2328eae6f9cbf1b8d42ef089ff8b15f Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Tue, 2 Oct 2012 17:18:08 -0600 Subject: [PATCH 04/13] Fix filterTextPlugin. Code from @nightwing on #1000 --- Makefile.dryice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.dryice.js b/Makefile.dryice.js index 2239215b..3a9f75f1 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -478,7 +478,7 @@ function quoteString(str) { } function filterTextPlugin(text) { - return text.replace(/(['"])ace\/requirejs\/text\!/g, "$1text!"); + return text.replace(/(['"])(ace|[.\/]+?)\/requirejs\/text\!/g, "$1"); } function removeUseStrict(text) { From 2b08cebd56b2e57fb3bbb01b1ab70855c3925600 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 6 Oct 2012 14:40:13 +0400 Subject: [PATCH 05/13] do not call install on sm update --- install.js | 49 +++++++++++++++++++++++++++++-------------------- package.json | 2 +- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/install.js b/install.js index 4f96d891..730fc12c 100644 --- a/install.js +++ b/install.js @@ -33,27 +33,36 @@ * ***** END LICENSE BLOCK ***** */ var buildAce = require("./Makefile.dryice").buildAce; - +var fs = require("fs"); var ACE_HOME = __dirname; -try { - var aceProject = { - roots: [ - ACE_HOME + '/lib', - ACE_HOME + '/demo' - ], - textPluginPattern: /^ace\/requirejs\/text!/ - }; - buildAce(aceProject, { - compress: false, - noconflict: false, - suffix: "", - compat: true, - name: "ace" - }); -} catch (e) { - console.log("--- Ace Build error ---"); - console.log(e); - process.exit(0); +function getVersion(path) { + if (fs.existsSync(path + "/.git-ref")) + return fs.readFileSync(path + "/.git-ref", "utf8"); + if (fs.existsSync(path + "/.git/ORIG_HEAD")) + return fs.readFileSync(path + "/.git/ORIG_HEAD", "utf8"); } + +if (process.argv.indexOf("-c") > 0) try { + var version = getVersion(ACE_HOME); + var oldVersion = getVersion(ACE_HOME + "/build"); + if (version && oldVersion == version) { + console.log("ace build is up to date"); + process.exit(0); + } + fs.writeFileSync(ACE_HOME + "/build/.git-ref", version, "utf8"); +} catch (e) {} + +try { + buildAce({ + compress: false, + noconflict: false, + suffix: "", + name: "ace" + }); +} catch (e) { + console.log("--- Ace Build error ---"); + console.log(e); + process.exit(0); +} \ No newline at end of file diff --git a/package.json b/package.json index 86b2fd8e..bd226318 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ }, "scripts": { "test": "node lib/ace/test/all.js", - "postinstall": "node ./install.js" + "postinstall": "node ./install.js -c" }, "config": { "github.com/sourcemint/bundler-js/0/-meta/config/0": { From 60723e3b960252e1f3f653061d6f10e0a8213582 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 6 Oct 2012 14:43:25 +0400 Subject: [PATCH 06/13] small cleanup --- Makefile.dryice.js | 84 +++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 39 deletions(-) diff --git a/Makefile.dryice.js b/Makefile.dryice.js index 3a9f75f1..a6cb8720 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -4,7 +4,7 @@ * * Copyright (c) 2010, Ajax.org B.V. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright @@ -15,7 +15,7 @@ * * Neither the name of Ajax.org B.V. nor the * names of its contributors may be used to endorse or promote products * derived from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -44,7 +44,7 @@ function main(args) { return "-" + x; return x; }); - + if (args[2] && (args[2][0] != "-" || args[2].indexOf("h") != -1)) type = args[2]; @@ -166,23 +166,26 @@ function demo() { ref = ""; version = ""; } - var changeComments = function(data) { - return (data - .replace(//g, "") - .replace(/PACKAGE\-\->|/g, "") + .replace(/PACKAGE\-\->| Date: Sat, 6 Oct 2012 14:48:03 +0400 Subject: [PATCH 07/13] silence annoying messages from dryice --- Makefile.dryice.js | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Makefile.dryice.js b/Makefile.dryice.js index a6cb8720..583e2f8c 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -429,15 +429,28 @@ var buildAce = function(options) { }); - console.log('# combining files into one ---------'); - if (options.shrinkwrap) { + console.log('# combining files into one ---------'); copy({ source: { root:targetDir, exclude:/^worker\-/ }, dest: BUILD_DIR + '/ace-min.js' }); } -} +}; + +// silence annoying messages from dryice +var buildAce = function(fn) { + return function() { + var log = console.log + console.log = function() { + if (typeof arguments[0] == "string" && /Ignoring requirement/.test(arguments[0])) + return; + log.apply(console, arguments); + } + fn.apply(null, arguments); + console.log = log; + } +}(buildAce); // TODO: replace with project.clone once it is fixed in dryice function cloneProject(project) { From 73f66d94088f42c5ab7344c61e18620794ca3f53 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 6 Oct 2012 14:54:27 +0400 Subject: [PATCH 08/13] move css strings inline to avoid problems with text plugin --- Makefile.dryice.js | 126 +++++++++++++++++++++++++++------------------ 1 file changed, 76 insertions(+), 50 deletions(-) diff --git a/Makefile.dryice.js b/Makefile.dryice.js index 583e2f8c..d7c31851 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -244,6 +244,33 @@ function addSuffix(options) { options.suffix += "-noconflict"; } } + +function getWriteFilters(options, projectType) { + var filters = [ + copy.filter.moduleDefines, + inlineTextModules, + removeUseStrict, + removeLicenceComments + ]; + + if (projectType == "worker") + return filters; + + if (options.noconflict) + filters.push(namespace(options.ns)); + + if (options.compress) + filters.push(copy.filter.uglifyjs); + + if (options.exportModule && projectType == "main") { + if (options.noconflict) + filters.push(exportAce(options.ns, options.exportModule, options.ns)); + else + filters.push(exportAce(options.ns, options.exportModule)); + } + return filters; +} + var buildAce = function(options) { var aceProject = { roots: [ACE_HOME + '/lib', ACE_HOME + '/demo'], @@ -275,24 +302,6 @@ var buildAce = function(options) { if (!options.requires) options.requires = [options.exportModule]; - var filters = [ - copy.filter.moduleDefines, - filterTextPlugin, - removeUseStrict, - removeLicenceComments - ]; - - if (options.noconflict) { - filters.push(namespace(options.ns)); - if (options.exportModule) - var exportFilter = exportAce(options.ns, options.exportModule, options.ns); - } else if (options.exportModule) { - var exportFilter = exportAce(options.ns, options.exportModule); - } - - if (options.compress) - filters.push(copy.filter.uglifyjs); - var targetDir = options.targetDir + options.suffix; var name = options.name; @@ -313,7 +322,7 @@ var buildAce = function(options) { copy({ source: ace, - filter: exportFilter ? filters.concat(exportFilter) : filters, + filter: getWriteFilters(options, "main"), dest: targetDir + '/' + name + ".js" }); @@ -327,7 +336,7 @@ var buildAce = function(options) { project: cloneProject(project), require: [ 'ace/mode/' + mode ] }], - filter: filters, + filter: getWriteFilters(options, "mode"), dest: targetDir + "/mode-" + mode + ".js" }); }); @@ -337,26 +346,14 @@ var buildAce = function(options) { project.assumeAllFilesLoaded(); options.themes.forEach(function(theme) { console.log("theme " + theme); - /*copy({ + copy({ source: [{ project: cloneProject(project), require: ["ace/theme/" + theme] }], - filter: filters, - dest: targetDir + "/theme-" + theme + ".js" - });*/ - // use this instead, to not create separate modules for js and css - var themePath = ACE_HOME + "/lib/ace/theme/" + theme; - var js = fs.readFileSync(themePath + ".js", "utf8"); - js = js.replace("define(", "define('ace/theme/" + theme + "', ['require', 'exports', 'module', 'ace/lib/dom'], "); - - if (fs.existsSync(themePath + ".css", "utf8")) { - var css = fs.readFileSync(themePath + ".css", "utf8") - js = js.replace(/require\(.ace\/requirejs\/text!.*?\)/, quoteString(css)) - } - filters.forEach(function(f) {js = f(js); }); - - fs.writeFileSync(targetDir + "/theme-" + theme + ".js", js); + filter: getWriteFilters(options, "theme"), + dest: targetDir + "/theme-" + theme.replace("_theme", "") + ".js" + }); }); console.log('# ace extensions ---------'); @@ -369,7 +366,7 @@ var buildAce = function(options) { project: cloneProject(project), require: [ 'ace/ext/' + ext ] }], - filter: filters, + filter: getWriteFilters(options, "ext"), dest: targetDir + "/ext-" + ext + ".js" }); }); @@ -384,19 +381,12 @@ var buildAce = function(options) { project: cloneProject(project), require: [ 'ace/keyboard/' + keybinding ] }], - filter: filters, + filter: getWriteFilters(options, "keybinding"), dest: targetDir + "/keybinding-" + keybinding + ".js" }); }); console.log('# ace worker ---------'); - - filters = [ - copy.filter.moduleDefines, - filterTextPlugin, - removeUseStrict, - removeLicenceComments - ]; options.workers.forEach(function(mode) { console.log("worker for " + mode + " mode"); @@ -415,7 +405,7 @@ var buildAce = function(options) { 'ace/mode/' + mode + '_worker' ] }], - filter: filters, + filter: getWriteFilters(options, "worker"), dest: worker }); copy({ @@ -452,6 +442,45 @@ var buildAce = function(fn) { } }(buildAce); +var textModules = {} +var detectTextModules = function(input, source) { + if (!source) + throw new Error('Missing filename for text module'); + + if (typeof input !== 'string') + input = input.toString(); + + var module = source.isLocation ? source.path : source; + + input = input.replace(/\\/g, "\\\\").replace(/"/g, '\\"'); + input = '"' + input.replace(/\n/g, '\\n\\\n') + '"'; + textModules[module] = input; + + return ""; +}; +detectTextModules.onRead = true; +copy.filter.addDefines = detectTextModules; + +function inlineTextModules(text) { + var lastDep = ""; + return text.replace(/, *['"]ace\/requirejs\/text!(.*?)['"]|= *require\(['"](?:ace|[.\/]+)\/requirejs\/text!(.*?)['"]\)/g, function(_, dep, call) { + if (dep) { + if (!lastDep) { + lastDep = dep; + return ""; + } + } else if (call) { + call = textModules[lastDep]; + delete textModules[lastDep]; + lastDep = ""; + if (call) + return "= " + call; + } + console.log(dep, lastDep, call); + throw "inlining of multiple text modules is not supported"; + }); +} + // TODO: replace with project.clone once it is fixed in dryice function cloneProject(project) { var clone = copy.createCommonJsProject({ @@ -470,6 +499,7 @@ function cloneProject(project) { return clone; } + function copyFileSync(srcFile, destFile) { var BUF_LENGTH = 64*1024, buf = new Buffer(BUF_LENGTH), @@ -496,10 +526,6 @@ function quoteString(str) { return '"' + str.replace(/\\/, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\\n") + '"'; } -function filterTextPlugin(text) { - return text.replace(/(['"])(ace|[.\/]+?)\/requirejs\/text\!/g, "$1"); -} - function removeUseStrict(text) { return text.replace(/['"]use strict['"];/g, ""); } From 20a7a6307daaa11ad11e9a0e75287894c7a20604 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 6 Oct 2012 14:55:43 +0400 Subject: [PATCH 09/13] remove state handler from build --- lib/ace/ace.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/ace/ace.js b/lib/ace/ace.js index 3dd08504..b0fc073d 100644 --- a/lib/ace/ace.js +++ b/lib/ace/ace.js @@ -53,7 +53,6 @@ var MultiSelect = require("./multi_select").MultiSelect; // The following require()s are for inclusion in the built ace file require("./worker/worker_client"); require("./keyboard/hash_handler"); -require("./keyboard/state_handler"); require("./placeholder"); exports.config = require("./config"); /** From a2d34bf2918c754fa39dbbb217710feff3440478 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 6 Oct 2012 15:52:15 +0400 Subject: [PATCH 10/13] fix demo build --- Makefile.dryice.js | 48 +++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/Makefile.dryice.js b/Makefile.dryice.js index d7c31851..4f525c39 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -66,8 +66,7 @@ function main(args) { } else if (type == "bm") { bookmarklet(); } else if (type == "full") { - ace(); - demo(); + demo(ace()); bookmarklet(); } } @@ -120,7 +119,7 @@ function ace() { console.log('# ace ---------'); // uncompressed - buildAce({ + var project = buildAce({ compress: false, noconflict: false }); @@ -153,9 +152,16 @@ function ace() { source: ACE_HOME + "/ChangeLog.txt", dest: BUILD_DIR + "/ChangeLog.txt" }); + + return project; } -function demo() { +function demo(project) { + project = project || buildAce({ + compress: false, + noconflict: false, + coreOnly: true + }); console.log('# kitchen sink ---------'); var version, ref; @@ -185,7 +191,7 @@ function demo() { copy({ source: ACE_HOME + "/kitchen-sink.html", dest: BUILD_DIR + "/kitchen-sink.html", - filter: [changeComments, fixDocPaths] + filter: [changeComments, fixDocPaths] }); copy({ @@ -202,20 +208,17 @@ function demo() { }); var demo = copy.createDataObject(); + + project.assumeAllFilesLoaded(); copy({ - source: ACE_HOME + "/demo/kitchen-sink/demo.js", - dest: demo, - filter: [changeComments, fixDocPaths, function(data) { - return data.replace("define(", "define('kitchen-sink/demo',"); - }] - }); - copy({ - source: ACE_HOME + "/lib/ace/split.js", - dest: demo, - filter: [changeComments, function(data) { - return data.replace("define(", "define('ace/split',"); - }] + source: [{ + project: cloneProject(project), + require: [ "kitchen-sink/demo" ] + }], + filter: getWriteFilters({filters:[fixDocPaths]}, "demo"), + dest: demo }); + copy({ source: demo, dest: BUILD_DIR + "/kitchen-sink/demo.js", @@ -253,6 +256,9 @@ function getWriteFilters(options, projectType) { removeLicenceComments ]; + if (options.filters) + filters = filters.concat(options.filters); + if (projectType == "worker") return filters; @@ -319,6 +325,9 @@ var buildAce = function(options) { filter: [ copy.filter.moduleDefines ], dest: ace }); + + if (options.coreOnly) + return project; copy({ source: ace, @@ -426,6 +435,8 @@ var buildAce = function(options) { dest: BUILD_DIR + '/ace-min.js' }); } + + return project; }; // silence annoying messages from dryice @@ -437,8 +448,9 @@ var buildAce = function(fn) { return; log.apply(console, arguments); } - fn.apply(null, arguments); + var ret = fn.apply(null, arguments); console.log = log; + return ret; } }(buildAce); From 8c310caf8bef1fbf39d868d2d47e279e85379df4 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 13 Oct 2012 17:06:43 +0400 Subject: [PATCH 11/13] include fold_mode in main build since it is used by all modes --- lib/ace/ace.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/ace/ace.js b/lib/ace/ace.js index b0fc073d..f0e7f50b 100644 --- a/lib/ace/ace.js +++ b/lib/ace/ace.js @@ -54,6 +54,7 @@ var MultiSelect = require("./multi_select").MultiSelect; require("./worker/worker_client"); require("./keyboard/hash_handler"); require("./placeholder"); +require("./mode/folding/fold_mode"); exports.config = require("./config"); /** * Ace.edit(el) -> Editor From 0ccab0463c56f9515848124e1b5f75e17d83f438 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 13 Oct 2012 17:25:35 +0400 Subject: [PATCH 12/13] make generated file a little smaller --- Makefile.dryice.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.dryice.js b/Makefile.dryice.js index 4f525c39..3109f84f 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -251,9 +251,9 @@ function addSuffix(options) { function getWriteFilters(options, projectType) { var filters = [ copy.filter.moduleDefines, - inlineTextModules, removeUseStrict, - removeLicenceComments + removeLicenceComments, + inlineTextModules ]; if (options.filters) @@ -465,7 +465,8 @@ var detectTextModules = function(input, source) { var module = source.isLocation ? source.path : source; input = input.replace(/\\/g, "\\\\").replace(/"/g, '\\"'); - input = '"' + input.replace(/\n/g, '\\n\\\n') + '"'; + input = input.replace(/\n\s+/g, "\n"); + input = '"' + input.replace(/\n/g, '\\\n') + '"'; textModules[module] = input; return ""; @@ -543,7 +544,7 @@ function removeUseStrict(text) { } function removeLicenceComments(text) { - return text.replace(/(;)\s*\/\*[\d\D]*?\*\//g, "$1"); + return text.replace(/(?:(;)|\n)\s*\/\*[\d\D]*?\*\/|\n\s*\/\/.*/g, "$1"); } function namespace(ns) { From 872125db46c7f1d44989710a2967d1f55109b681 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 13 Oct 2012 17:46:44 +0400 Subject: [PATCH 13/13] use relative paths everywhere --- lib/ace/ext/textarea.js | 2 +- lib/ace/keyboard/vim/maps/motions.js | 4 ++-- lib/ace/mode/jade.js | 4 ++-- lib/ace/placeholder.js | 2 +- lib/ace/placeholder_test.js | 4 ++-- lib/ace/requirejs/text.js | 2 +- lib/ace/theme/ambiance.js | 2 +- lib/ace/theme/chrome.js | 2 +- lib/ace/theme/clouds.js | 2 +- lib/ace/theme/clouds_midnight.js | 2 +- lib/ace/theme/cobalt.js | 2 +- lib/ace/theme/crimson_editor.js | 2 +- lib/ace/theme/dawn.js | 2 +- lib/ace/theme/dreamweaver.js | 2 +- lib/ace/theme/eclipse.js | 2 +- lib/ace/theme/github.js | 2 +- lib/ace/theme/idle_fingers.js | 2 +- lib/ace/theme/kr_theme.js | 2 +- lib/ace/theme/merbivore.js | 2 +- lib/ace/theme/merbivore_soft.js | 2 +- lib/ace/theme/mono_industrial.css | 2 +- lib/ace/theme/mono_industrial.js | 2 +- lib/ace/theme/monokai.js | 2 +- lib/ace/theme/pastel_on_dark.js | 2 +- lib/ace/theme/solarized_dark.js | 2 +- lib/ace/theme/solarized_light.js | 2 +- lib/ace/theme/textmate.js | 2 +- lib/ace/theme/tomorrow.js | 2 +- lib/ace/theme/tomorrow_night.js | 2 +- lib/ace/theme/tomorrow_night_blue.js | 2 +- lib/ace/theme/tomorrow_night_bright.js | 2 +- lib/ace/theme/tomorrow_night_eighties.js | 2 +- lib/ace/theme/twilight.js | 2 +- lib/ace/theme/vibrant_ink.js | 2 +- lib/ace/theme/xcode.js | 2 +- lib/ace/virtual_renderer.js | 2 +- tool/tmtheme.js | 2 +- 37 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lib/ace/ext/textarea.js b/lib/ace/ext/textarea.js index ddb57df0..a8f6317f 100644 --- a/lib/ace/ext/textarea.js +++ b/lib/ace/ext/textarea.js @@ -36,7 +36,7 @@ var UA = require("../lib/useragent"); var net = require("../lib/net"); var ace = require("../ace"); -require("ace/theme/textmate"); +require("../theme/textmate"); module.exports = exports = ace; diff --git a/lib/ace/keyboard/vim/maps/motions.js b/lib/ace/keyboard/vim/maps/motions.js index 227862b9..f5e0f163 100644 --- a/lib/ace/keyboard/vim/maps/motions.js +++ b/lib/ace/keyboard/vim/maps/motions.js @@ -127,7 +127,7 @@ var StringStream = function(editor, cursor) { }; }; -var Search = require("ace/search").Search; +var Search = require("../../../search").Search; var search = new Search(); function find(editor, needle, dir) { @@ -136,7 +136,7 @@ function find(editor, needle, dir) { return search.find(editor.session); } -var Range = require("ace/range").Range; +var Range = require("../../../range").Range; module.exports = { "w": new Motion(function(editor) { diff --git a/lib/ace/mode/jade.js b/lib/ace/mode/jade.js index 03b54306..076b29c8 100644 --- a/lib/ace/mode/jade.js +++ b/lib/ace/mode/jade.js @@ -40,8 +40,8 @@ var oop = require("../lib/oop"); var TextMode = require("./text").Mode; var Tokenizer = require("../tokenizer").Tokenizer; var JadeHighlightRules = require("./jade_highlight_rules").JadeHighlightRules; -// var JavascriptMode = require("ace/mode/javascript").Mode; -// var CssMode = require("ace/mode/css").Mode; +// var JavascriptMode = require("../mode/javascript").Mode; +// var CssMode = require("../mode/css").Mode; var Mode = function() { var highlighter = new JadeHighlightRules(); diff --git a/lib/ace/placeholder.js b/lib/ace/placeholder.js index 8a93ee54..3306cba1 100644 --- a/lib/ace/placeholder.js +++ b/lib/ace/placeholder.js @@ -30,7 +30,7 @@ define(function(require, exports, module) { "use strict"; -var Range = require('./range').Range; +var Range = require("./range").Range; var EventEmitter = require("./lib/event_emitter").EventEmitter; var oop = require("./lib/oop"); diff --git a/lib/ace/placeholder_test.js b/lib/ace/placeholder_test.js index f395042b..97e561fd 100644 --- a/lib/ace/placeholder_test.js +++ b/lib/ace/placeholder_test.js @@ -41,8 +41,8 @@ var Editor = require("./editor").Editor; var MockRenderer = require("./test/mockrenderer").MockRenderer; var assert = require("./test/assertions"); var JavaScriptMode = require("./mode/javascript").Mode; -var PlaceHolder = require('./placeholder').PlaceHolder; -var UndoManager = require('./undomanager').UndoManager; +var PlaceHolder = require("./placeholder").PlaceHolder; +var UndoManager = require("./undomanager").UndoManager; module.exports = { diff --git a/lib/ace/requirejs/text.js b/lib/ace/requirejs/text.js index 66123169..cba62eef 100644 --- a/lib/ace/requirejs/text.js +++ b/lib/ace/requirejs/text.js @@ -44,7 +44,7 @@ define(function (require, exports, module) { if (globalRequire && globalRequire.nodeRequire) onLoad(globalRequire.nodeRequire('fs').readFileSync(req.toUrl(name), 'utf8')); else - require("ace/lib/net").get(req.toUrl(name), onLoad); + require("../lib/net").get(req.toUrl(name), onLoad); }; }); diff --git a/lib/ace/theme/ambiance.js b/lib/ace/theme/ambiance.js index 4c74d6f8..475c2e87 100644 --- a/lib/ace/theme/ambiance.js +++ b/lib/ace/theme/ambiance.js @@ -25,7 +25,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-ambiance"; -exports.cssText = require("ace/requirejs/text!./ambiance.css"); +exports.cssText = require("../requirejs/text!./ambiance.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/chrome.js b/lib/ace/theme/chrome.js index b0d02480..dafa99c2 100644 --- a/lib/ace/theme/chrome.js +++ b/lib/ace/theme/chrome.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-chrome"; -exports.cssText = require('ace/requirejs/text!./chrome.css'); +exports.cssText = require("../requirejs/text!./chrome.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js index 13d66603..f9b7c6bf 100644 --- a/lib/ace/theme/clouds.js +++ b/lib/ace/theme/clouds.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-clouds"; -exports.cssText = require('ace/requirejs/text!./clouds.css'); +exports.cssText = require("../requirejs/text!./clouds.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/clouds_midnight.js b/lib/ace/theme/clouds_midnight.js index 9359d120..a7b76d65 100644 --- a/lib/ace/theme/clouds_midnight.js +++ b/lib/ace/theme/clouds_midnight.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-clouds-midnight"; -exports.cssText = require('ace/requirejs/text!./clouds_midnight.css'); +exports.cssText = require("../requirejs/text!./clouds_midnight.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js index 0964e9a6..6e2f3d0a 100644 --- a/lib/ace/theme/cobalt.js +++ b/lib/ace/theme/cobalt.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-cobalt"; -exports.cssText = require('ace/requirejs/text!./cobalt.css'); +exports.cssText = require("../requirejs/text!./cobalt.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/crimson_editor.js b/lib/ace/theme/crimson_editor.js index 943930d9..a5971075 100644 --- a/lib/ace/theme/crimson_editor.js +++ b/lib/ace/theme/crimson_editor.js @@ -30,7 +30,7 @@ define(function(require, exports, module) { exports.isDark = false; -exports.cssText = require('ace/requirejs/text!./crimson_editor.css'); +exports.cssText = require("../requirejs/text!./crimson_editor.css"); exports.cssClass = "ace-crimson-editor"; diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js index 88b5ae38..f31f00b8 100644 --- a/lib/ace/theme/dawn.js +++ b/lib/ace/theme/dawn.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-dawn"; -exports.cssText = require('ace/requirejs/text!./dawn.css'); +exports.cssText = require("../requirejs/text!./dawn.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/dreamweaver.js b/lib/ace/theme/dreamweaver.js index 25a7fcba..943dc692 100644 --- a/lib/ace/theme/dreamweaver.js +++ b/lib/ace/theme/dreamweaver.js @@ -31,7 +31,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-dreamweaver"; -exports.cssText = require('ace/requirejs/text!./dreamweaver.css'); +exports.cssText = require("../requirejs/text!./dreamweaver.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/eclipse.js b/lib/ace/theme/eclipse.js index aabeeab2..329b8b79 100644 --- a/lib/ace/theme/eclipse.js +++ b/lib/ace/theme/eclipse.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { "use strict"; exports.isDark = false; -exports.cssText = require('ace/requirejs/text!./eclipse.css'); +exports.cssText = require("../requirejs/text!./eclipse.css"); exports.cssClass = "ace-eclipse"; diff --git a/lib/ace/theme/github.js b/lib/ace/theme/github.js index b5839dd4..de013c8c 100644 --- a/lib/ace/theme/github.js +++ b/lib/ace/theme/github.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-github"; -exports.cssText = require('ace/requirejs/text!./github.css'); +exports.cssText = require("../requirejs/text!./github.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js index fcb3be31..5da497f0 100644 --- a/lib/ace/theme/idle_fingers.js +++ b/lib/ace/theme/idle_fingers.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-idle-fingers"; -exports.cssText = require('ace/requirejs/text!./idle_fingers.css'); +exports.cssText = require("../requirejs/text!./idle_fingers.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js index 81faf395..2018a962 100644 --- a/lib/ace/theme/kr_theme.js +++ b/lib/ace/theme/kr_theme.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-kr-theme"; -exports.cssText = require('ace/requirejs/text!./kr_theme.css'); +exports.cssText = require("../requirejs/text!./kr_theme.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/merbivore.js b/lib/ace/theme/merbivore.js index bba49410..699fb2eb 100644 --- a/lib/ace/theme/merbivore.js +++ b/lib/ace/theme/merbivore.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-merbivore"; -exports.cssText = require('ace/requirejs/text!./merbivore.css'); +exports.cssText = require("../requirejs/text!./merbivore.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/merbivore_soft.js b/lib/ace/theme/merbivore_soft.js index 5848e289..873a6023 100644 --- a/lib/ace/theme/merbivore_soft.js +++ b/lib/ace/theme/merbivore_soft.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-merbivore-soft"; -exports.cssText = require('ace/requirejs/text!./merbivore_soft.css'); +exports.cssText = require("../requirejs/text!./merbivore_soft.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css index 09c765b4..b5eb68b2 100644 --- a/lib/ace/theme/mono_industrial.css +++ b/lib/ace/theme/mono_industrial.css @@ -135,4 +135,4 @@ .ace-mono-industrial .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQ0tH4zzBz5sz/ABAOBECKH+evAAAAAElFTkSuQmCC) right repeat-y -} +} \ No newline at end of file diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js index 288cd710..af763292 100644 --- a/lib/ace/theme/mono_industrial.js +++ b/lib/ace/theme/mono_industrial.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-mono-industrial"; -exports.cssText = require('ace/requirejs/text!./mono_industrial.css'); +exports.cssText = require("../requirejs/text!./mono_industrial.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js index fe4283c6..a33326bd 100644 --- a/lib/ace/theme/monokai.js +++ b/lib/ace/theme/monokai.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-monokai"; -exports.cssText = require('ace/requirejs/text!./monokai.css'); +exports.cssText = require("../requirejs/text!./monokai.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/pastel_on_dark.js b/lib/ace/theme/pastel_on_dark.js index 93776772..5c11fd4c 100644 --- a/lib/ace/theme/pastel_on_dark.js +++ b/lib/ace/theme/pastel_on_dark.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-pastel-on-dark"; -exports.cssText = require('ace/requirejs/text!./pastel_on_dark.css'); +exports.cssText = require("../requirejs/text!./pastel_on_dark.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/solarized_dark.js b/lib/ace/theme/solarized_dark.js index f2ef096b..d7ad4f90 100644 --- a/lib/ace/theme/solarized_dark.js +++ b/lib/ace/theme/solarized_dark.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-solarized-dark"; -exports.cssText = require('ace/requirejs/text!./solarized_dark.css'); +exports.cssText = require("../requirejs/text!./solarized_dark.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/solarized_light.js b/lib/ace/theme/solarized_light.js index a8e9e10f..eda2c45c 100644 --- a/lib/ace/theme/solarized_light.js +++ b/lib/ace/theme/solarized_light.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-solarized-light"; -exports.cssText = require('ace/requirejs/text!./solarized_light.css'); +exports.cssText = require("../requirejs/text!./solarized_light.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/textmate.js b/lib/ace/theme/textmate.js index 47bbae0b..75e19745 100644 --- a/lib/ace/theme/textmate.js +++ b/lib/ace/theme/textmate.js @@ -33,7 +33,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-tm"; -exports.cssText = require('ace/requirejs/text!./textmate.css'); +exports.cssText = require("../requirejs/text!./textmate.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/tomorrow.js b/lib/ace/theme/tomorrow.js index acf984f9..603c92a5 100644 --- a/lib/ace/theme/tomorrow.js +++ b/lib/ace/theme/tomorrow.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-tomorrow"; -exports.cssText = require('ace/requirejs/text!./tomorrow.css'); +exports.cssText = require("../requirejs/text!./tomorrow.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/tomorrow_night.js b/lib/ace/theme/tomorrow_night.js index f3fcdbc9..8a2454ea 100644 --- a/lib/ace/theme/tomorrow_night.js +++ b/lib/ace/theme/tomorrow_night.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-tomorrow-night"; -exports.cssText = require('ace/requirejs/text!./tomorrow_night.css'); +exports.cssText = require("../requirejs/text!./tomorrow_night.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/tomorrow_night_blue.js b/lib/ace/theme/tomorrow_night_blue.js index 0b496d20..dafd1f53 100644 --- a/lib/ace/theme/tomorrow_night_blue.js +++ b/lib/ace/theme/tomorrow_night_blue.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-tomorrow-night-blue"; -exports.cssText = require('ace/requirejs/text!./tomorrow_night_blue.css'); +exports.cssText = require("../requirejs/text!./tomorrow_night_blue.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/tomorrow_night_bright.js b/lib/ace/theme/tomorrow_night_bright.js index 18bc4aa9..12c961ef 100644 --- a/lib/ace/theme/tomorrow_night_bright.js +++ b/lib/ace/theme/tomorrow_night_bright.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-tomorrow-night-bright"; -exports.cssText = require('ace/requirejs/text!./tomorrow_night_bright.css'); +exports.cssText = require("../requirejs/text!./tomorrow_night_bright.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/tomorrow_night_eighties.js b/lib/ace/theme/tomorrow_night_eighties.js index 8217cdbd..fc2cd15c 100644 --- a/lib/ace/theme/tomorrow_night_eighties.js +++ b/lib/ace/theme/tomorrow_night_eighties.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-tomorrow-night-eighties"; -exports.cssText = require('ace/requirejs/text!./tomorrow_night_eighties.css'); +exports.cssText = require("../requirejs/text!./tomorrow_night_eighties.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js index 5c1d3eef..216f09de 100644 --- a/lib/ace/theme/twilight.js +++ b/lib/ace/theme/twilight.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-twilight"; -exports.cssText = require('ace/requirejs/text!./twilight.css'); +exports.cssText = require("../requirejs/text!./twilight.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/vibrant_ink.js b/lib/ace/theme/vibrant_ink.js index 584f8d29..b41b1d47 100644 --- a/lib/ace/theme/vibrant_ink.js +++ b/lib/ace/theme/vibrant_ink.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-vibrant-ink"; -exports.cssText = require('ace/requirejs/text!./vibrant_ink.css'); +exports.cssText = require("../requirejs/text!./vibrant_ink.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/xcode.js b/lib/ace/theme/xcode.js index c6cba5b9..19827338 100644 --- a/lib/ace/theme/xcode.js +++ b/lib/ace/theme/xcode.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-xcode"; -exports.cssText = require('ace/requirejs/text!./xcode.css'); +exports.cssText = require("../requirejs/text!./xcode.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js index fbb1661c..757db95c 100644 --- a/lib/ace/virtual_renderer.js +++ b/lib/ace/virtual_renderer.js @@ -44,7 +44,7 @@ var CursorLayer = require("./layer/cursor").Cursor; var ScrollBar = require("./scrollbar").ScrollBar; var RenderLoop = require("./renderloop").RenderLoop; var EventEmitter = require("./lib/event_emitter").EventEmitter; -var editorCss = require("ace/requirejs/text!./css/editor.css"); +var editorCss = require("./requirejs/text!./css/editor.css"); dom.importCssString(editorCss, "ace_editor"); diff --git a/tool/tmtheme.js b/tool/tmtheme.js index 39570e05..ab40d4a5 100755 --- a/tool/tmtheme.js +++ b/tool/tmtheme.js @@ -278,7 +278,7 @@ function convertTheme(name) { var js = fillTemplate(jsTemplate, { name: name, - css: "require('ace/requirejs/text!./" + name + ".css')", // quoteString(css), // + css: 'require("../requirejs/text!./' + name + '.css")', // quoteString(css), // cssClass: "ace-" + hyphenate(name), isDark: styles.isDark });