summaryrefslogtreecommitdiff
path: root/src/static/js/ace.js
diff options
context:
space:
mode:
authorChad Weider <cweider@oofn.net>2012-09-09 13:05:45 -0700
committerChad Weider <cweider@oofn.net>2012-09-09 14:40:20 -0700
commit3312387b0850a51afb1831e05aa4672539ae47a8 (patch)
treef76dcddd6716a8d25677394e74555bbf52ce246b /src/static/js/ace.js
parent6e796eb5fbaf7c842ecdecabd48f8065eaec1084 (diff)
downloadetherpad-lite-3312387b0850a51afb1831e05aa4672539ae47a8.zip
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.
Diffstat (limited to 'src/static/js/ace.js')
-rw-r--r--src/static/js/ace.js17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index d7414c17..4d720f59 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -173,22 +173,6 @@ require.setGlobalKeyPath("require");\n\
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) {
var sorted = sortFilesByEmbeded(files);
var embededFiles = sorted.embeded;
@@ -254,7 +238,6 @@ require.setGlobalKeyPath("require");\n\
var includedJS = [];
pushRequireScriptTo(iframeHTML);
- pushScriptsTo(iframeHTML);
// Inject my plugins into my child.
iframeHTML.push('\