Eliminate some internal formatting calls when setting RTE data

horde · Mar 5, 2015 · 4199051 · 4199051
1 parent f93c528
commit 4199051
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/imp/js/compose.js b/imp/js/compose.js
@@ -608,8 +608,6 @@ var ImpCompose = {
             );
         }
 
-        this.rteInit(opts.rte);
-
         if (this.rte && opts.rte) {
             if (this.rte.busy()) {
                 this.setMessageText.bind(this, opts, r).delay(0.1);
@@ -618,9 +616,12 @@ var ImpCompose = {
             this.rte.setData(r.text.body);
         } else {
             ta.setValue(r.text.body);
+            this.rteInit(opts.rte);
         }
 
-        this.RTELoading(false);
+        if (!opts.rte) {
+            this.RTELoading(false);
+        }
 
         this.setSignature(opts.rte, r.text.sig ? r.text.sig : this.identities[$F('identity')]);