Fix updating BCC field when switching identities

horde · Dec 6, 2014 · 4ca9c86 · 4ca9c86
1 parent 8dbd4d8
commit 4ca9c86
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/imp/js/compose.js b/imp/js/compose.js
@@ -26,6 +26,7 @@ var ImpCompose = {
     // last_identity,
     // onload_show,
     // old_action,
+    // old_bcc,
     // old_identity,
     // rte_sig,
     // sc_submit,
@@ -144,11 +145,17 @@ var ImpCompose = {
                 label: 'sent_mail_label'
             }
         });
+
+        if (this.old_bcc) {
+            this.ac.get('bcc').removeEntry(this.old_bcc);
+        }
+        delete this.old_bcc;
+
         if (identity.bcc) {
-            $('bcc').setValue(($F('bcc') ? $F('bcc') + ', ' : '') + identity.bcc)
-                .fire('AutoComplete:reset');
-            this.toggleCC('bcc');
+            this.old_bcc = new IMP_Autocompleter_Elt(identity.bcc);
+            this.updateAddrField('bcc', [ this.old_bcc ]);
         }
+
         this.setSaveSentMail(identity.sm_save);
         this.setSignature(this.editor_on, identity);
         this.last_identity = $F('identity');
@@ -1496,11 +1503,6 @@ var ImpCompose = {
             $('other_options').hide();
         }
 
-        /* Create sent-mail list. */
-        if ($('save_sent_mail_mbox')) {
-            this.changeIdentity();
-        }
-
         /* Create priority list. */
         if (ImpCore.conf.priority) {
             this.createPopdown('p', {