fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Require ace2_common separately.

This commit is contained in:
Chad Weider 2012-05-14 18:19:54 -07:00
parent 97c7842d19
commit 384523859e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/static/js/ace.js
View File

@ -178,14 +178,18 @@ require.setGlobalKeyPath("require");\n\
function pushScriptsTo(buffer) { function pushScriptsTo(buffer) {
/* Folling is for packaging regular expression. */ /* Folling is for packaging regular expression. */
/* $$INCLUDE_JS("../javascripts/src/ace2_inner.js?callback=require.define"); */ /* $$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_SOURCE = '../javascripts/src/ace2_inner.js?callback=require.define';
var ACE_COMMON = '../javascripts/src/ace2_common.js?callback=require.define';
if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[ACE_SOURCE]) { if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[ACE_SOURCE]) {
buffer.push('<script type="text/javascript">'); buffer.push('<script type="text/javascript">');
buffer.push(Ace2Editor.EMBEDED[ACE_SOURCE]); buffer.push(Ace2Editor.EMBEDED[ACE_SOURCE]);
buffer.push(Ace2Editor.EMBEDED[ACE_COMMON]);
buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");'); buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');
buffer.push('<\/script>'); buffer.push('<\/script>');
} else { } else {
buffer.push('<script type="application/javascript" src="' + ACE_SOURCE + '"><\/script>'); buffer.push('<script type="application/javascript" src="' + ACE_SOURCE + '"><\/script>');
buffer.push('<script type="application/javascript" src="' + ACE_COMMON + '"><\/script>');
buffer.push('<script type="text/javascript">'); buffer.push('<script type="text/javascript">');
buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");'); buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');
buffer.push('<\/script>'); buffer.push('<\/script>');