diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2012-03-22 18:43:59 +0100 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2012-03-22 18:43:59 +0100 |
| commit | d0ad90456ea47215943985b2fe5e26b6aa05f41f (patch) | |
| tree | 6b928e57f73fbec6f6a1f142f6ce013617c561ba /src/static/js/ace.js | |
| parent | 22eaa6ffc012e83438d54e6fb5b023a7952246a7 (diff) | |
| parent | 1a64a6c1c5ece11307db152581ae51d34a9449bf (diff) | |
| download | etherpad-lite-d0ad90456ea47215943985b2fe5e26b6aa05f41f.zip | |
Merge commit '1a64a6c1'
Diffstat (limited to 'src/static/js/ace.js')
| -rw-r--r-- | src/static/js/ace.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/static/js/ace.js b/src/static/js/ace.js index 473ecc1b..4dc3308a 100644 --- a/src/static/js/ace.js +++ b/src/static/js/ace.js @@ -262,6 +262,11 @@ require.setGlobalKeyPath("require");\n\ // Inject my plugins into my child. iframeHTML.push('\ <script type="text/javascript">\ + parent_req = require("./pluginfw/parent_require.js");\ + parent_req.getRequirementFromParent(require, "ep_etherpad-lite/static/js/pluginfw/hooks");\ + parent_req.getRequirementFromParent(require, "ep_etherpad-lite/static/js/pluginfw/plugins");\ + parent_req.getRequirementFromParent(require, "./pluginfw/hooks");\ + parent_req.getRequirementFromParent(require, "./pluginfw/plugins");\ require.define("/plugins", null);\n\ require.define("/plugins.js", function (require, exports, module) {\ module.exports = require("ep_etherpad-lite/static/js/plugins");\ |