Changeset 138943


Ignore:
Timestamp:
Apr 12, 2008, 7:19:44 PM (14 years ago)
Author:
rene <rene@…>
Branches:
master
Children:
723866
Parents:
1e5198
Message:

disable Warning if timestamp gets overwritten by stored Identity

Location:
chrome/content/v_identity
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • chrome/content/v_identity/vI_msgIdentityClone.js

    r1e5198 r138943  
    210210    },
    211211   
    212     setIdentity : function(newName) {
     212    setIdentity : function(newName, timeStamp) {
    213213        vI_notificationBar.dump("## initReplyToFields setIdentity " + newName + "\n");
    214214        vI_msgIdentityClone.initMsgIdentityTextbox_clone();
     
    219219        if (!newIdentity) window.setTimeout(vI_msgIdentityClone.setMenuToIdentity, 0,
    220220            vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.getAttribute("value"));
     221        else vI_msgIdentityClone.elements.Obj_MsgIdentity_clone
     222                        .setAttribute("timeStamp",timeStamp)
    221223        return newIdentity;
    222224    },
     
    225227    blurEvent : function() {
    226228        if (vI_msgIdentityClone.blurEventBlocked) return;
     229        vI_notificationBar.dump("## vI_msgIdentityClone: blurEvent.\n");
    227230        vI_msgIdentityClone.initMsgIdentityTextbox_clone();
    228231        var address = vI_helper.getAddress();
     
    233236    inputEvent :  function()
    234237    {
     238        vI_notificationBar.dump("## vI_msgIdentityClone: inputEvent.\n");
    235239        vI_msgIdentityClone.initMsgIdentityTextbox_clone();
    236240        // compare Identity with existant ones and prepare Virtual-Identity if nonexistant found
    237241        var newIdentity = vI_msgIdentityClone.isNewIdentity();
    238242        vI_msgIdentityClone.markAsNewAccount(newIdentity);
     243        vI_msgIdentityClone.elements.Obj_MsgIdentity_clone
     244                        .setAttribute("timeStamp",null)
    239245        if (!newIdentity) vI_msgIdentityClone.setMenuToIdentity(vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.getAttribute("value"));
    240246    },
  • chrome/content/v_identity/vI_smartIdentity.js

    r1e5198 r138943  
    9595        vI_notificationBar.setNote(vI.elements.strings.getString("vident.smartIdentity.vIUsage") + ".",
    9696                    "smart_reply_notification");
    97         vI_msgIdentityClone.setIdentity(getCurrentIdentity().fullName + " <" + new_email + ">");
     97        vI_msgIdentityClone.setIdentity(getCurrentIdentity().fullName + " <" + new_email + ">", "timeStamp");
    9898    },
    9999   
     
    438438            vI_smtpSelector.setMenuToKey(all_addresses.smtp_keys[selectedValue])
    439439        }
    440         vI_msgIdentityClone.setIdentity(all_addresses.combinedNames[selectedValue]);
     440        vI_msgIdentityClone.setIdentity(all_addresses.combinedNames[selectedValue], null);
    441441        vI_smartIdentity.removeSmartIdentityFromRecipients(all_addresses, selectedValue);
    442442    },
  • chrome/content/v_identity/vI_storage.js

    r1e5198 r138943  
    173173                storageData.id, storageData.smtp)
    174174            var warning = vI_storage.__getReplaceVIdentityWarning(recipient, storageData);
    175             if (    vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.getAttribute("value") != "vid" ||
     175           
     176            if (    vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.getAttribute("timeStamp") ||
     177                vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.getAttribute("value") != "vid" ||
    176178                !vI.preferences.getBoolPref("storage_warn_vI_replace") ||
    177179                vI_storage.promptService.confirm(window,"Warning",warning)) {                       
     
    179181                    vI_smtpSelector.setMenuToKey(storageData.smtp)
    180182                    if (vI_msgIdentityClone.setIdentity(
    181                         vI_helper.combineNames(storageData.fullName, storageData.email)))
     183                        vI_helper.combineNames(storageData.fullName, storageData.email), null))
    182184                    vI_notificationBar.setNote(vI.elements.strings.getString("vident.smartIdentity.vIStorageUsage") + ".",
    183185                        "storage_notification");
Note: See TracChangeset for help on using the changeset viewer.