mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

First stab at getting client side require(plugin/..) to work from within etherpad

Browse source
This commit is contained in:
Egil Moeller 2012-02-26 17:48:17 +01:00
parent fd5b7c1080
commit 763361a7c9
40 changed files with 122 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ Ace2Editor.registry = {
nextId: 1
};
var plugins = require('/plugins').plugins;
var plugins = require('ep_etherpad-lite/static/js/plugins').plugins;
function Ace2Editor()
{
@ -233,14 +233,14 @@ function Ace2Editor()
if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[ACE_SOURCE]) {
buffer.push('<script type="text/javascript">');
buffer.push(Ace2Editor.EMBEDED[ACE_SOURCE]);
buffer.push('require("/ace2_inner");');
buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');
buffer.push('<\/script>');
} else {
file = ACE_SOURCE;
file = file.replace(/^\.\.\/static\/js\//, '../minified/');
buffer.push('<script type="application/javascript" src="' + file + '"><\/script>');
buffer.push('<script type="text/javascript">');
buffer.push('require("/ace2_inner");');
buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');
buffer.push('<\/script>');
}
}
@ -322,7 +322,7 @@ function Ace2Editor()
<script type="text/javascript">\
require.define("/plugins", null);\n\
require.define("/plugins.js", function (require, exports, module) {\
module.exports = parent.parent.require("/plugins");\
module.exports = parent.parent.require("ep_etherpad-lite/static/js/plugins");\
});\
</script>\
');