public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

So simple, yet so hard to find. Finally I found you, oh error caused by the new require usage...

pull/528/head
Egil Moeller 2012-02-28 21:14:31 +01:00
parent b20b86cdc8
commit cf191df0b8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,7 +238,10 @@ function Ace2Editor()
} else { } else {
file = ACE_SOURCE; file = ACE_SOURCE;
file = file.replace(/^\.\.\/static\/js\//, '../minified/'); file = file.replace(/^\.\.\/static\/js\//, '../minified/');
buffer.push('<script type="application/javascript">require = parent.parent.require;<\/script>'); buffer.push('<script type="text/javascript" src="../static/js/require-kernel.js"><\/script>');
buffer.push('<script type="text/javascript">');
buffer.push('require.setRootURI("../minified/"); require.setLibraryURI("../minified/plugins/"); require.setGlobalKeyPath("require");');
buffer.push('<\/script>');
buffer.push('<script type="application/javascript" src="' + file + '"><\/script>'); buffer.push('<script type="application/javascript" src="' + file + '"><\/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");');
@ -320,10 +323,12 @@ function Ace2Editor()
pushRequireScriptTo(iframeHTML); pushRequireScriptTo(iframeHTML);
// Inject my plugins into my child. // Inject my plugins into my child.
iframeHTML.push('\ iframeHTML.push('\
<script type="text/javascript" src="../static/js/require-kernel.js"></script>\
<script type="text/javascript">\ <script type="text/javascript">\
require.setRootURI("../minified/"); require.setLibraryURI("../minified/plugins/"); require.setGlobalKeyPath("require");\
require.define("/plugins", null);\n\ require.define("/plugins", null);\n\
require.define("/plugins.js", function (require, exports, module) {\ require.define("/plugins.js", function (require, exports, module) {\
module.exports = parent.parent.require("ep_etherpad-lite/static/js/plugins");\ module.exports = require("ep_etherpad-lite/static/js/plugins");\
});\ });\
</script>\ </script>\
'); ');