Changeset c6118b

Timestamp:

Feb 6, 2010, 2:31:12 PM (13 years ago)

Author:

rene <rene@…>

Branches:

multiEdit, ng_0.6, ng_0.8, ng_0.9

Children:

424a52

Parents:

ea0667

Message:

fix for problem with Identity-Selection (#217)

File:

• chrome/content/v_identity/vI_smartIdentity.js (modified) (3 diffs)

chrome/content/v_identity/vI_smartIdentity.js

@@ -366 +366 @@
     
     __smartIdentitySelection : function(allIdentities, autocreate) {
-        document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(allIdentities);
-
         /* compare with existing Identities                                     */
         for (var index = 0; index < allIdentities.number; index++) {
@@ -376 +374 @@
                 if (vI.preferences.getBoolPref("idSelection_preferExisting")) {
                     vI_notificationBar.dump("## vI_smartIdentity: found existing Identity, use without interaction.\n");
+                    // add all Indentities to Clone Menu before selecting and leaving the function
+                    document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(allIdentities);
                     vI_smartIdentity.changeIdentityToSmartIdentity(allIdentities, index);
                     return;
                 }
                 // else reorder list of Identities to prefer it on autoselect
+                // has to be done before Identities are added to the Menu
                 vI_notificationBar.dump("## vI_smartIdentity: found existing Identity, prefer this one.\n");
                 var firstIdentity = allIdentities.identityDataCollection[index];
@@ -390 +391 @@
         }
         
+        document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(allIdentities);
+
         if (!autocreate && vI.preferences.getBoolPref("idSelection_ask") && 
             ((allIdentities.number == 1 && vI.preferences.getBoolPref("idSelection_ask_always"))