diff --git a/node/utils/Minify.js b/node/utils/Minify.js index b2c98d52..c078c5c6 100644 --- a/node/utils/Minify.js +++ b/node/utils/Minify.js @@ -239,9 +239,15 @@ function getAceFile(callback) { // the kernel isn’t actually on the file system. handleEmbed(null, requireDefinition()); } else { - fs.readFile(ROOT_DIR + filename, "utf8", function (error, data) { - handleEmbed(error, isolateJS(data, shortFilename)); - }); + var contents = ''; + tarCode(tar[shortFilename] || shortFilename + , function (content) { + contents += content; + } + , function () { + handleEmbed(null, contents); + } + ); } } else { fs.readFile(ROOT_DIR + filename, "utf8", handleEmbed); diff --git a/node/utils/tar.json b/node/utils/tar.json index aeafe23f..b319791c 100644 --- a/node/utils/tar.json +++ b/node/utils/tar.json @@ -48,4 +48,18 @@ , "broadcast_revisions.js" , "timeslider.js" ] +, "ace2_inner.js": [ + "ace2_common.js" + , "skiplist.js" + , "virtual_lines.js" + , "easysync2.js" + , "cssmanager.js" + , "colorutils.js" + , "undomodule.js" + , "contentcollector.js" + , "changesettracker.js" + , "linestylefilter.js" + , "domline.js" + , "ace2_inner.js" + ] } diff --git a/static/js/ace.js b/static/js/ace.js index 4cad6b4f..4a313727 100644 --- a/static/js/ace.js +++ b/static/js/ace.js @@ -228,29 +228,23 @@ function Ace2Editor() buffer.push('\ '); - pushScriptTagsFor(iframeHTML, includedJS); + pushScriptsTo(iframeHTML); iframeHTML.push(''); iframeHTML.push(' ');