summaryrefslogtreecommitdiff
path: root/src/static/js/ace.js
diff options
context:
space:
mode:
authorChad Weider <cweider@oofn.net>2012-09-12 00:04:15 -0700
committerChad Weider <cweider@oofn.net>2012-09-21 22:09:55 -0700
commit622819ba930b5d4685c053eefaac77c1776fe0b0 (patch)
treee04e92e40f65abf3309ed519849b7721b50f0787 /src/static/js/ace.js
parent9f5946c9426346d371cb84f53a6005a7f853175b (diff)
downloadetherpad-lite-622819ba930b5d4685c053eefaac77c1776fe0b0.zip
Make intialization of Ace2Inner analogous to other page controllers.
Diffstat (limited to 'src/static/js/ace.js')
-rw-r--r--src/static/js/ace.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 1561dea5..e50f75c7 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -246,7 +246,11 @@ hooks.plugins = plugins;\n\
plugins.adoptPluginsFromAncestorsOf(window);\n\
\n\
$ = jQuery = require("ep_etherpad-lite/static/js/rjquery").jQuery; // Expose jQuery #HACK\n\
-require("ep_etherpad-lite/static/js/ace2_inner");\n\
+var Ace2Inner = require("ep_etherpad-lite/static/js/ace2_inner");\n\
+\n\
+plugins.ensure(function () {\n\
+ Ace2Inner.init();\n\
+});\n\
'));
iframeHTML.push('<style type="text/css" title="dynamicsyntax"></style>');