Drop embedding of modules.
With loopback removed, embedding concatenated resources doesn't happen. It was a marginal feature to begin with so it will not be missed.
This commit is contained in:
parent
6e796eb5fb
commit
3312387b08
|
@ -173,22 +173,6 @@ require.setGlobalKeyPath("require");\n\
|
||||||
throw new Error("Require script could not be embedded.");
|
throw new Error("Require script could not be embedded.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function pushScriptsTo(buffer) {
|
|
||||||
/* Folling is for packaging regular expression. */
|
|
||||||
/* $$INCLUDE_JS("../javascripts/lib/ep_etherpad-lite/static/js/ace2_inner.js?callback=require.define"); */
|
|
||||||
/* $$INCLUDE_JS("../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define"); */
|
|
||||||
var ACE_SOURCE = '../javascripts/lib/ep_etherpad-lite/static/js/ace2_inner.js?callback=require.define';
|
|
||||||
var ACE_COMMON = '../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define';
|
|
||||||
if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[ACE_SOURCE]) {
|
|
||||||
buffer.push('<script type="text/javascript">');
|
|
||||||
buffer.push(Ace2Editor.EMBEDED[ACE_SOURCE]);
|
|
||||||
buffer.push(Ace2Editor.EMBEDED[ACE_COMMON]);
|
|
||||||
buffer.push('<\/script>');
|
|
||||||
} else {
|
|
||||||
buffer.push('<script type="application/javascript" src="' + ACE_SOURCE + '"><\/script>');
|
|
||||||
buffer.push('<script type="application/javascript" src="' + ACE_COMMON + '"><\/script>');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
function pushStyleTagsFor(buffer, files) {
|
function pushStyleTagsFor(buffer, files) {
|
||||||
var sorted = sortFilesByEmbeded(files);
|
var sorted = sortFilesByEmbeded(files);
|
||||||
var embededFiles = sorted.embeded;
|
var embededFiles = sorted.embeded;
|
||||||
|
@ -254,7 +238,6 @@ require.setGlobalKeyPath("require");\n\
|
||||||
|
|
||||||
var includedJS = [];
|
var includedJS = [];
|
||||||
pushRequireScriptTo(iframeHTML);
|
pushRequireScriptTo(iframeHTML);
|
||||||
pushScriptsTo(iframeHTML);
|
|
||||||
|
|
||||||
// Inject my plugins into my child.
|
// Inject my plugins into my child.
|
||||||
iframeHTML.push('\
|
iframeHTML.push('\
|
||||||
|
|
Loading…
Reference in New Issue