diff --git a/Makefile.dryice.js b/Makefile.dryice.js index 92cd5516..48e90961 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -551,22 +551,25 @@ function generateThemesModule(themes) { } function inlineTextModules(text) { - var lastDep = ""; - return text.replace(/, *['"]ace\/requirejs\/text!(.*?)['"]|= *require\(['"](?:ace|[.\/]+)\/requirejs\/text!(.*?)['"]\)/g, function(_, dep, call) { + var deps = []; + return text.replace(/, *['"]ace\/requirejs\/text!(.*?)['"]| require\(['"](?:ace|[.\/]+)\/requirejs\/text!(.*?)['"]\)/g, function(_, dep, call) { if (dep) { - if (!lastDep) { - lastDep = dep; - return ""; - } + deps.push(dep); + return ""; } else if (call) { - call = textModules[lastDep]; - delete textModules[lastDep]; - lastDep = ""; + deps.some(function(d) { + if (d.split("/").pop() == call.split("/").pop()) { + dep = d; + return true; + } + }); + + call = textModules[dep]; + // if (deps.length > 1) + // console.log(call.length) if (call) - return "= " + call; + return " " + call; } - console.log(dep, lastDep, call); - throw "inlining of multiple text modules is not supported"; }); } diff --git a/lib/ace/snippets/javascript.js b/lib/ace/snippets/javascript.js index bf59ba85..ed832d74 100644 --- a/lib/ace/snippets/javascript.js +++ b/lib/ace/snippets/javascript.js @@ -1,7 +1,9 @@ define(function(require, exports, module) { "use strict"; -exports.snippetText = require("../requirejs/text!./javascript.snippets"); +exports.snippetText = require("../requirejs/text!./javascript-jquery.snippets") + + "\n" + + require("../requirejs/text!./javascript.snippets"); exports.scope = "javascript"; });