diff --git a/src/node/utils/tar.json b/src/node/utils/tar.json index 461e5197..15ce68e2 100644 --- a/src/node/utils/tar.json +++ b/src/node/utils/tar.json @@ -40,11 +40,9 @@ ] , "ace2_inner.js": [ "ace2_inner.js" - , "underscore.js" , "AttributePool.js" , "Changeset.js" , "ChangesetUtils.js" - , "security.js" , "skiplist.js" , "virtual_lines.js" , "cssmanager.js" diff --git a/src/static/js/ace.js b/src/static/js/ace.js index 8cb9f188..87068d07 100644 --- a/src/static/js/ace.js +++ b/src/static/js/ace.js @@ -177,10 +177,10 @@ require.setGlobalKeyPath("require");\n\ } function pushScriptsTo(buffer) { /* Folling is for packaging regular expression. */ - /* $$INCLUDE_JS("../javascripts/src/ace2_inner.js?callback=require.define"); */ - /* $$INCLUDE_JS("../javascripts/src/ace2_common.js?callback=require.define"); */ - var ACE_SOURCE = '../javascripts/src/ace2_inner.js?callback=require.define'; - var ACE_COMMON = '../javascripts/src/ace2_common.js?callback=require.define'; + /* $$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(''); hooks.callAll("aceInitInnerdocbodyHead", { iframeHTML: iframeHTML @@ -266,7 +265,7 @@ require.setGlobalKeyPath("require");\n\ // Inject my plugins into my child. iframeHTML.push('\ - - - + + + + - + + + + +