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

Merge branch 'master' into timeslider-realtimeupdate+readonly-pads

This commit is contained in:
Egil Moeller 2012-05-30 19:31:33 +02:00
parent ad68a6e3bf 357ca73a99
commit 7ca7a5c3fa
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,10 +239,6 @@ require.setGlobalKeyPath("require");\n\
iframeHTML.push(doctype);
iframeHTML.push("<html><head>");
hooks.callAll("aceInitInnerdocbodyHead", {
iframeHTML: iframeHTML
});
// calls to these functions ($$INCLUDE_...) are replaced when this file is processed
// and compressed, putting the compressed code from the named file directly into the
// source here.
@ -277,6 +273,11 @@ require.setGlobalKeyPath("require");\n\
iframeHTML.push('<\/script>');
iframeHTML.push('<style type="text/css" title="dynamicsyntax"></style>');
hooks.callAll("aceInitInnerdocbodyHead", {
iframeHTML: iframeHTML
});
iframeHTML.push('</head><body id="innerdocbody" class="syntax" spellcheck="false">&nbsp;</body></html>');
// Expose myself to global for my child frame.