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

Merge pull request #2063 from ajaxorg/fix/build

Browse source 
do not rename kr_theme to kr during the build
This commit is contained in:
Lennart Kats 2014-08-10 10:49:50 +02:00
commit b714925ed8
3 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.dryice.js
View file

@ -359,7 +359,7 @@ function buildAce(options) {
buildSubmodule(options, { buildSubmodule(options, {
projectType: "theme", projectType: "theme",
require: ["ace/theme/" + name] require: ["ace/theme/" + name]
}, "theme-" + name.replace("_theme", "")); }, "theme-" + name);
}); });
// keybindings // keybindings
["vim", "emacs"].forEach(function(name) { ["vim", "emacs"].forEach(function(name) {

6
lib/ace/config.js
View file

@ -80,11 +80,7 @@ exports.moduleUrl = function(name, component) {
// todo make this configurable or get rid of '-' // todo make this configurable or get rid of '-'
var sep = component == "snippets" ? "/" : "-"; var sep = component == "snippets" ? "/" : "-";
var base = parts[parts.length - 1]; var base = parts[parts.length - 1];
if (sep == "-") {
var re = new RegExp("^" + component + "[\\-_]|[\\-_]" + component + "$", "g");
base = base.replace(re, "");
}
if ((!base || base == component) && parts.length > 1) if ((!base || base == component) && parts.length > 1)
base = parts[parts.length - 2]; base = parts[parts.length - 2];

2
lib/ace/config_test.js
View file

@ -43,7 +43,7 @@ module.exports = {
"test: path resolution" : function() { "test: path resolution" : function() {
config.set("packaged", "true"); config.set("packaged", "true");
var url = config.moduleUrl("kr_theme", "theme"); var url = config.moduleUrl("kr_theme", "theme");
assert.equal(url, "theme-kr.js"); assert.equal(url, "theme-kr_theme.js");
config.set("basePath", "a/b"); config.set("basePath", "a/b");
url = config.moduleUrl("m/theme", "theme"); url = config.moduleUrl("m/theme", "theme");