libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

Fix ordering of editer code loading operations.

Browse source
This commit is contained in:
Chad Weider 2012-05-14 19:01:00 -07:00
parent 9b0e2287aa
commit a9eb2d4e31
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/static/js/ace.js
View file

@ -185,14 +185,10 @@ require.setGlobalKeyPath("require");\n\
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(Ace2Editor.EMBEDED[ACE_COMMON]);
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="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>');
} }
} }
function pushStyleTagsFor(buffer, files) { function pushStyleTagsFor(buffer, files) {
@ -264,8 +260,9 @@ require.setGlobalKeyPath("require");\n\
pushStyleTagsFor(iframeHTML, includedCSS); pushStyleTagsFor(iframeHTML, includedCSS);
var includedJS = []; var includedJS = [];
var $$INCLUDE_JS = function(filename) {includedJS.push(filename)};
pushRequireScriptTo(iframeHTML); pushRequireScriptTo(iframeHTML);
pushScriptsTo(iframeHTML);
// Inject my plugins into my child. // Inject my plugins into my child.
iframeHTML.push('\ iframeHTML.push('\
<script type="text/javascript">\ <script type="text/javascript">\
@ -280,7 +277,10 @@ require.setGlobalKeyPath("require");\n\
});\ });\
</script>\ </script>\
'); ');
pushScriptsTo(iframeHTML);
iframeHTML.push('<script type="text/javascript">');
iframeHTML.push('require("ep_etherpad-lite/static/js/ace2_inner");');
iframeHTML.push('<\/script>');
iframeHTML.push('<style type="text/css" title="dynamicsyntax"></style>'); iframeHTML.push('<style type="text/css" title="dynamicsyntax"></style>');
iframeHTML.push('</head><body id="innerdocbody" class="syntax" spellcheck="false">&nbsp;</body></html>'); iframeHTML.push('</head><body id="innerdocbody" class="syntax" spellcheck="false">&nbsp;</body></html>');