From d2be8aefc0caf83841da3e5919c9ea7d3bbc6dbe Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 4 Jul 2013 14:31:42 +0400 Subject: [PATCH] fix snippet loading in build --- lib/ace/config.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/ace/config.js b/lib/ace/config.js index 0ef36d13..606a1e57 100644 --- a/lib/ace/config.js +++ b/lib/ace/config.js @@ -77,17 +77,26 @@ exports.moduleUrl = function(name, component) { var parts = name.split("/"); component = component || parts[parts.length - 2] || ""; - var re = new RegExp("^" + component + "[\-_]|[\-_]" + component + "$", "g"); - base = base.replace(re, ""); + + // 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, ""); + } if (!base && parts.length > 1) base = parts[parts.length - 2]; var path = options[component + "Path"]; - if (path == null) + if (path == null) { path = options.basePath; + } else if (sep == "/") { + component = sep = ""; + } if (path && path.slice(-1) != "/") path += "/"; - return path + component + "-" + base + this.get("suffix"); + return path + component + sep + base + this.get("suffix"); }; exports.setModuleUrl = function(name, subst) {