Changeset ffaef1


Ignore:
Timestamp:
Mar 12, 2010, 2:13:06 PM (11 years ago)
Author:
rene <rene@…>
Branches:
multiEdit, ng_0.6, ng_0.8, ng_0.9
Children:
ec3005
Parents:
8f1d60
Message:

masked identityData objects

Location:
chrome/content/v_identity
Files:
8 edited

Legend:

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

    r8f1d60 rffaef1  
    2323 * ***** END LICENSE BLOCK ***** */
    2424
    25 function identityData(email, fullName, id, smtp, extras, sideDescription, existingID) {
     25function vI_identityData(email, fullName, id, smtp, extras, sideDescription, existingID) {
    2626    this.email = email;
    2727    this.fullName = (fullName?fullName:'');
    28     this.id = new idObj(id);
    29     this.smtp = new smtpObj(smtp);
     28    this.id = new vI_idObj(id);
     29    this.smtp = new vI_smtpObj(smtp);
    3030    this.extras = extras?extras:new vI_storageExtras();
    3131    this.comp = {   // holds the results of the last comparison for later creation of a compareMatrix
     
    3838    this.stringBundle = document.getElementById("vIdentBundle");
    3939}
    40 identityData.prototype = {
     40vI_identityData.prototype = {
    4141    email : null,
    4242    fullName : null,
     
    8484    // creates an Duplicate of the current IdentityData, cause usually we are working with a pointer
    8585    getDuplicate : function() {
    86         return new identityData(this.email, this.fullName, this.id.key, this.smtp.key, this.extras.getDuplicate(), this.sideDescription, this.existingID);
     86        return new vI_identityData(this.email, this.fullName, this.id.key, this.smtp.key, this.extras.getDuplicate(), this.sideDescription, this.existingID);
    8787    },
    8888
     
    115115                    this.fullName.toLowerCase() == identities[j].fullName.toLowerCase()) &&
    116116                    (email.toLowerCase() == idEmail.toLowerCase()) &&
    117                     this.smtp.equal(new smtpObj(identities[j].smtpServerKey))   ) {
     117                    this.smtp.equal(new vI_smtpObj(identities[j].smtpServerKey))    ) {
    118118                    vI_notificationBar.dump("## vI_identityData: isExistingIdentity: " + this.combinedName + " found, id='" + identities[j].key + "'\n");
    119119                    return identities[j].key;
     
    177177}
    178178
    179 function identityCollection() {
     179function vI_identityCollection() {
    180180    this.number = 0;
    181181    this.identityDataCollection = {};
    182182    this.menuItems = {};
    183183}
    184 identityCollection.prototype =
     184vI_identityCollection.prototype =
    185185{
    186186    number : null,
     
    239239const NO_SMTP_TAG = "vI_noStoredSMTP"
    240240
    241 function smtpObj(key) {
     241function vI_smtpObj(key) {
    242242    this._key = key;
    243243    this.DEFAULT_TAG = document.getElementById("bundle_messenger").getString("defaultServerTag");
    244244}
    245 smtpObj.prototype = {
     245vI_smtpObj.prototype = {
    246246    DEFAULT_TAG : null,
    247247    _key : null,
     
    298298}
    299299
    300 function idObj(key) { this._key = key; }
    301 idObj.prototype = {
     300function vI_idObj(key) { this._key = key; }
     301vI_idObj.prototype = {
    302302    _key : null,
    303303    _value : null,
  • chrome/content/v_identity/vI_rdfDataEditor.js

    r8f1d60 rffaef1  
    5252        vI_rdfDataEditor.__rdfDataTree = window.arguments[3];
    5353        ;
    54         vI_rdfDataEditor.__identityData = new identityData();
     54        vI_rdfDataEditor.__identityData = new vI_identityData();
    5555        vI_rdfDataEditor.__identityData.copy(window.arguments[0].identityData);
    5656
     
    102102        var address = vI_helper.parseAddress(document.getElementById("sender").value)
    103103       
    104         var localIdentityData = new identityData(address.email, address.name,
     104        var localIdentityData = new vI_identityData(address.email, address.name,
    105105            document.getElementById("identity_list").selectedItem.getAttribute("value"),
    106106            document.getElementById("smtp_server_list").selectedItem.getAttribute("key"));
  • chrome/content/v_identity/vI_rdfDataTree.js

    r8f1d60 rffaef1  
    430430    newItem : function() {
    431431        var treeType = vI_rdfDataTree.tabbox.selectedPanel.id;
    432         var newItemPreset = { identityData : new identityData ("", null, null, NO_SMTP_TAG, null, null) };
     432        var newItemPreset = { identityData : new vI_identityData ("", null, null, NO_SMTP_TAG, null, null) };
    433433        // XXXX create useful preset
    434434        var retVar = { treeType: null };
  • chrome/content/v_identity/vI_rdfDatasource.js

    r8f1d60 rffaef1  
    209209            var extras = new vI_storageExtras(vI_rdfDatasource.__getRDFValue, resource);
    210210           
    211             var localIdentityData = new identityData(email, fullName, id, smtp, extras)
     211            var localIdentityData = new vI_identityData(email, fullName, id, smtp, extras)
    212212            addNewDatum (resource, name, localIdentityData, idData)
    213213        }
     
    280280        vI_notificationBar.dump("## vI_rdfDatasource: extras:" + extras.status() + "\n");
    281281       
    282         var localIdentityData = new identityData(email, fullName, id, smtp, extras)
     282        var localIdentityData = new vI_identityData(email, fullName, id, smtp, extras)
    283283        return localIdentityData;
    284284    },
  • chrome/content/v_identity/vI_smartIdentity.js

    r8f1d60 rffaef1  
    8181   
    8282    NewMail : function() {
    83         var storageIdentities = new identityCollection();
     83        var storageIdentities = new vI_identityCollection();
    8484        vI_storage.getVIdentityFromAllRecipients(storageIdentities);
    8585       
     
    9191        vI_notificationBar.dump("## vI_smartIdentity: ReplyOnSent() (rules like SmartDraft)\n");
    9292       
    93         var allIdentities = new identityCollection();
     93        var allIdentities = new vI_identityCollection();
    9494
    9595        vI_smartIdentity.__SmartDraftOrReplyOnSent(hdr, allIdentities);
    96         var storageIdentities = new identityCollection();
     96        var storageIdentities = new vI_identityCollection();
    9797        vI_storage.getVIdentityFromAllRecipients(storageIdentities);
    9898       
     
    106106        vI_notificationBar.dump("## vI_smartIdentity: Draft()\n");
    107107       
    108         var allIdentities = new identityCollection();
     108        var allIdentities = new vI_identityCollection();
    109109
    110110        var draftHdr = vI_smartIdentity.messenger.
     
    116116
    117117        vI_smartIdentity.__SmartDraftOrReplyOnSent(draftHdr, allIdentities);
    118         var storageIdentities = new identityCollection();
     118        var storageIdentities = new vI_identityCollection();
    119119        vI_storage.getVIdentityFromAllRecipients(storageIdentities);
    120120       
     
    128128        var number = vI_main.headerParser.parseHeadersWithArray(hdr, emails, fullNames, combinedNames);
    129129        for (var index = 0; index < number; index++) {
    130             var newIdentity = new identityData(emails.value[index], fullNames.value[index],
     130            var newIdentity = new vI_identityData(emails.value[index], fullNames.value[index],
    131131                null, NO_SMTP_TAG, null, null);
    132132            allIdentities.addWithoutDuplicates(newIdentity);
     
    149149   
    150150    __filterAddresses : function(smartIdentities) {
    151         var returnIdentities = new identityCollection();
     151        var returnIdentities = new vI_identityCollection();
    152152       
    153153        var filterList  =
     
    229229           
    230230            // ------------- parse address-string to get a field of single email-addresses
    231             var splitted = new identityCollection();
     231            var splitted = new vI_identityCollection();
    232232            vI_smartIdentity.__parseHeadersWithArray(value, splitted);
    233233           
     
    292292        }
    293293           
    294         var storageIdentities = new identityCollection();
     294        var storageIdentities = new vI_identityCollection();
    295295        vI_storage.getVIdentityFromAllRecipients(storageIdentities);
    296296       
    297         var smartIdentities = new identityCollection();
     297        var smartIdentities = new vI_identityCollection();
    298298        if (storageIdentities.number == 0 || !vI_main.preferences.getBoolPref("idSelection_storage_ignore_smart_reply"))
    299299            vI_smartIdentity.__SmartReply(hdr, smartIdentities);
     
    429429        var skip_bcc = false;
    430430        if (getCurrentIdentity().doBcc) {
    431             var bcc_addresses = new identityCollection();
     431            var bcc_addresses = new vI_identityCollection();
    432432            vI_smartIdentity.__parseHeadersWithArray(getCurrentIdentity().doBccList, bcc_addresses);
    433433           
  • chrome/content/v_identity/vI_upgrade.js

    r8f1d60 rffaef1  
    298298        //~ alert(splitted.email + "++" + splitted.name + "++" + splitted.combinedName)
    299299       
    300         var localIdentityData = new identityData(splitted.email, splitted.name, id, smtp, null)
     300        var localIdentityData = new vI_identityData(splitted.email, splitted.name, id, smtp, null)
    301301       
    302302        vI_rdfDatasource.updateRDF(vI_helper.combineNames(Card.displayName, Card.primaryEmail),
  • chrome/content/v_identity/v_identity.js

    r8f1d60 rffaef1  
    182182            var virtualIdentityData = document.getElementById("msgIdentity_clone").identityData;
    183183            var currentIdentity = getCurrentIdentity();
    184             var currentSMTPobj = new smtpObj(currentIdentity.smtpServerKey);
     184            var currentSMTPobj = new vI_smtpObj(currentIdentity.smtpServerKey);
    185185           
    186186            vI_notificationBar.dump("\n## vI_identityData GenericSendMessage Final Check\n");
  • chrome/content/v_identity/v_identity.xml

    r8f1d60 rffaef1  
    368368            // else description = identity.description?"- "+identity.description:identity.accountname
    369369           
    370             var newIdentity = new identityData(identity.email, identity.fullName, identity.key,
     370            var newIdentity = new vI_identityData(identity.email, identity.fullName, identity.key,
    371371                        identity.smtpServerKey, null, description, true)
    372372            newIdentity.extras.readIdentityValues(identity);
Note: See TracChangeset for help on using the changeset viewer.