diff options
| author | Chad Weider <cweider@oofn.net> | 2012-05-14 18:19:54 -0700 |
|---|---|---|
| committer | Chad Weider <cweider@oofn.net> | 2012-05-14 18:20:16 -0700 |
| commit | 384523859e0ef7fa7d56513c7b648ec613b113d8 (patch) | |
| tree | 99bc5dac3be9e489eaeab43058bdfeed0bc70d8d /src/static/js/ace.js | |
| parent | 97c7842d1919870f676681dd8cb39d7e7c39ad9e (diff) | |
| download | etherpad-lite-384523859e0ef7fa7d56513c7b648ec613b113d8.zip | |
Require ace2_common separately.
Diffstat (limited to 'src/static/js/ace.js')
| -rw-r--r-- | src/static/js/ace.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/static/js/ace.js b/src/static/js/ace.js index 2dab8d54..f3a27a11 100644 --- a/src/static/js/ace.js +++ b/src/static/js/ace.js @@ -178,14 +178,18 @@ 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'; 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('require("ep_etherpad-lite/static/js/ace2_inner");'); buffer.push('<\/script>'); } else { 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('require("ep_etherpad-lite/static/js/ace2_inner");'); buffer.push('<\/script>'); |