mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #977 from cweider/loopback-avoidance

Browse source 
Loopback avoidance
This commit is contained in:
John McLear 2012-09-03 14:56:55 -07:00
commit c5be2eb418
3 changed files with 79 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -168,11 +168,9 @@ require.setGlobalKeyPath("require");\n\
buffer.push(KERNEL_BOOT);
buffer.push('<\/script>');
} else {
file = KERNEL_SOURCE;
buffer.push('<script type="application/javascript" src="' + KERNEL_SOURCE + '"><\/script>');
buffer.push('<script type="text/javascript">');
buffer.push(KERNEL_BOOT);
buffer.push('<\/script>');
// Remotely src'd script tag will not work in IE; it must be embedded, so
// throw an error if it is not.
throw new Error("Require script could not be embedded.");
}
}
function pushScriptsTo(buffer) {