summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-09-26 19:16:37 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-09-26 19:16:37 +0200
commit6c96b1b7cd0313ce0d3afaac03db65662e31be39 (patch)
treecc0e57e57247407fac8162d52d5d5d215fdd5988 /program/js
parent1f4b06a853dfab075017534919abdfc918274a91 (diff)
Initialize TinyMCE editor in rcmail.init() instead of a separate call after. This makes the edior ready when restoring a HTML message from localStorage (#1490016)
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 8469dc81a..e6b1d84a1 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -187,6 +187,11 @@ function rcube_webmail()
if (this.env.permaurl)
this.enable_command('permaurl', 'extwin', true);
+ // initialize html editor
+ if (this.env.html_editor_init && window.rcmail_editor_init) {
+ rcmail_editor_init(this.env.html_editor_init);
+ }
+
switch (this.task) {
case 'mail':