Merge pull request #2063 from ajaxorg/fix/build

do not rename kr_theme to kr during the build

Makefile.dryice.js

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

lib/ace/config.js

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

lib/ace/config_test.js

@@ -43,7 +43,7 @@ module.exports = {
     "test: path resolution" : function() {
         config.set("packaged", "true");
         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");
         url = config.moduleUrl("m/theme", "theme");