summaryrefslogtreecommitdiff
path: root/src/static/js/ace.js
diff options
context:
space:
mode:
authorEgil Moeller <egil.moller@freecode.no>2012-02-26 17:48:17 +0100
committerEgil Moeller <egil.moller@freecode.no>2012-02-26 17:48:17 +0100
commit763361a7c938ca00a73e1ebc00dc08b8ce39ebaf (patch)
tree24a33443ba8ea101e3f65196c4ab205e94169fc9 /src/static/js/ace.js
parentfd5b7c1080d605caba658c0c4913e298ef0184c2 (diff)
downloadetherpad-lite-763361a7c938ca00a73e1ebc00dc08b8ce39ebaf.zip
First stab at getting client side require(plugin/..) to work from within etherpad
Diffstat (limited to 'src/static/js/ace.js')
-rw-r--r--src/static/js/ace.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 04930910..3f64e19f 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -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>\
');