Changeset f0f993

Timestamp:

Jul 16, 2010, 4:09:10 PM (12 years ago)

Author:

rene <rene@…>

Branches:

ng_0.6, ng_0.8, ng_0.9

Children:

f7b110

Parents:

e777bd

Message:

unified parsing of email addresses, recursively remove paranthesis

Location:

chrome/content/v_identity

Files:

• vI_helper.js (modified) (1 diff)
• vI_identityData.js (modified) (3 diffs)
• vI_rdfDataEditor.js (modified) (1 diff)
• vI_storage.js (modified) (1 diff)
• vI_upgrade.js (modified) (2 diffs)

chrome/content/v_identity/vI_helper.js

@@ -75 +75 @@
         }
         else return false;
-    },
-
-// vI_upgrade.js:229:
-// vI_upgrade.js:232:
-    combineNames : function (fullName, email) {
-        if (fullName && fullName.replace(/^\s+|\s+$/g,"")) return fullName.replace(/^\s+|\s+$/g,"") + " <" + email.replace(/^\s+|\s+$/g,"") + ">"
-        else return email?email.replace(/^\s+|\s+$/g,""):""
-    },
-    
-// vI_rdfDataEditor.js:80:
-// vI_rdfDatasource.js:119:
-// vI_rdfDatasource.js:123:
-// vI_rdfDatasource.js:130:
-// vI_upgrade.js:225:
-// vI_upgrade.js:256:
-    parseAddress : function(address) {
-        var name = ""; var email = "";
-        // prefer an email address separated with < >, only if not found use any other
-        if (address.match(/<\s*[^>\s]*@[^>\s]*\s*>/) || address.match(/<?\s*[^>\s]*@[^>\s]*\s*>?/) || address.match(/$/)) {
-            name = RegExp.leftContext + RegExp.rightContext
-            email = RegExp.lastMatch
-            email = email.replace(/\s+|<|>/g,"")
-            name = name.replace(/^\s+|\s+$/g,"")
-            name = name.replace(/^\"|\"$/g,"")
-            name = name.replace(/^\'|\'$/g,"")
-        }
-        return { name: name,
-             email: email,
-             combinedName: vI_helper.combineNames(name, email)}
     }
 }

chrome/content/v_identity/vI_identityData.js

@@ -24 +24 @@
 
 function vI_identityData(email, fullName, id, smtp, extras, sideDescription, existingID) {
-    this.email = email;
-    this.fullName = (fullName?fullName:'');
+    this._email = email;
+    this._emailParsed = false;
+    this._fullName = fullName?fullName:"";
     this.id = new vI_idObj(id);
     this.smtp = new vI_smtpObj(smtp);
@@ -39 +40 @@
 }
 vI_identityData.prototype = {
-    email : null,
-    fullName : null,
+    _email : null,          // internal email-field might contain combinedName (until first queried via email)
+    _fullName : null,
+    _emailParsed : null,
     id : null,
     smtp : null,
@@ -50 +52 @@
     comp : null,    
 
+    parseEmail : function() {
+        if (this._emailParsed) return;
+        // parse email and move any additional parts to fullName
+        if (this._email.match(/<\s*[^>\s]*@[^>\s]*\s*>/) || this._email.match(/<?\s*[^>\s]*@[^>\s]*\s*>?/) || this._email.match(/$/)) {
+            this._fullName += RegExp.leftContext + RegExp.rightContext;
+            this._email = RegExp.lastMatch;
+//          vI_notificationBar.dump("## vI_identityData: parseEmail _fullName = '" + this._fullName + "'\n");
+//          vI_notificationBar.dump("## vI_identityData: parseEmail _email =    '" + this._email + "'\n");
+        }
+        this._emailParsed = true;
+    },
+    get email() {
+        this.parseEmail();
+        return (this._email?this._email.replace(/\s+|<|>/g,""):"");
+    },
+    set email(email) { this._email = email; this._emailParsed = false; },
+
+    cleanName : function(fullName) {
+//      vI_notificationBar.dump("## vI_identityData: cleanName init '" + fullName + "'\n");
+        var _fullName = fullName.replace(/^\s+|\s+$/g,"");
+        if (_fullName.search(/^\".+\"$|^'.+'$/g) != -1) {
+            _fullName = this.cleanName(_fullName.replace(/^\"(.+)\"$|^'(.+)'$/g,"$1$2"));
+        }
+//      vI_notificationBar.dump("## vI_identityData: cleanName done '" + _fullName + "'\n");
+        return _fullName;
+    },
+
+    get fullName() {
+        this.parseEmail();
+        return (this._fullName?this.cleanName(this._fullName):"")
+    },
+    set fullName(fullName) { this._fullName = fullName; },
+
     get combinedName() {
-        var email = this.email?this.email.replace(/^\s+|\s+$/g,""):"";
-        var fullName = this.fullName?this.fullName.replace(/^\s+|\s+$/g,""):"";
+        var fullName = this.fullName; var email = this.email;
         return fullName?fullName+(email?" <"+email+">":""):email
     },
-    set combinedName(combinedName) {
-        var name = ""; var email = "";
-        // prefer an email address separated with < >, only if not found use any other
-        if (combinedName.match(/<\s*[^>\s]*@[^>\s]*\s*>/) || combinedName.match(/<?\s*[^>\s]*@[^>\s]*\s*>?/) || combinedName.match(/$/)) {
-            name = RegExp.leftContext + RegExp.rightContext
-            email = RegExp.lastMatch
-            email = email.replace(/\s+|<|>/g,"")
-            name = name.replace(/^\s+|\s+$/g,"")
-            name = name.replace(/^\"|\"$/g,"")
-            name = name.replace(/^\'|\'$/g,"")
-        }
-        this.fullName = name;
-        this.email = email;
-    },
+    set combinedName(combinedName) { this._email = combinedName; this._fullName = ""; this._emailParsed = false; },
 
     __makeHtml : function (string) { return string?string.replace(/>/g,"&gt;").replace(/</g,"&lt;"):"" },

chrome/content/v_identity/vI_rdfDataEditor.js

@@ -94 +94 @@
     
     blurEvent : function(elementId) {
-        var elem = document.getElementById(elementId)
-        var address = vI_helper.parseAddress(elem.value)
-        elem.value = address.combinedName;                  
+        var elem = document.getElementById(elementId);
+        var localIdentityData = new vI_identityData(elem.value, null, null, null, null, null, null);
+        elem.value = localIdentityData.combinedName;                    
     },
     
     accept : function() {
-        var address = vI_helper.parseAddress(document.getElementById("sender").value)
-        
-        var localIdentityData = new vI_identityData(address.email, address.name,
+        var localIdentityData = new vI_identityData(document.getElementById("sender").value, null,
             document.getElementById("identity_list").selectedItem.getAttribute("value"),
             document.getElementById("smtp_server_list").selectedItem.getAttribute("key"));

chrome/content/v_identity/vI_storage.js

@@ -208 +208 @@
         else if (vI_storage.isMailingList(recipient))
             return { recDesc : vI_storage.getMailListName(recipient), recType : "maillist" }
-        else 
-            return { recDesc : vI_helper.parseAddress(recipient).combinedName, recType : "email" }
+        else {
+            var localIdentityData = new vI_identityData(recipient, null, null, null, null, null, null);
+            return { recDesc : localIdentityData.combinedName, recType : "email" }
+        }
     },
         

chrome/content/v_identity/vI_upgrade.js

@@ -295 +295 @@
         if ( info && info[1] ) smtp = info[1];
         
-        var splitted = vI_upgrade.__parseAddress(newFullEmail);
-        //~ alert(splitted.email + "++" + splitted.name + "++" + splitted.combinedName)
-        
-        var localIdentityData = new vI_identityData(splitted.email, splitted.name, id, smtp, null)
-        
-        vI_rdfDatasource.updateRDF(vI_helper.combineNames(Card.displayName, Card.primaryEmail),
+        var localIdentityData = new vI_identityData(newFullEmail, null, id, smtp, null)
+        
+        vI_rdfDatasource.updateRDF(localIdentityData.combinedName,
                         "email", localIdentityData, true, true, null, null)
         if (Card.secondEmail.replace(/^\s+|\s+$/g,""))
-            vI_rdfDatasource.updateRDF(vI_helper.combineNames(Card.displayName, Card.secondEmail),
+            vI_rdfDatasource.updateRDF(localIdentityData.combinedName,
                     "email", localIdentityData, true, true, null, null)
         
@@ -312 +309 @@
     },
     
-    // by now in vI, not accessible from here. Best change all references to vI_helper.
-    __parseAddress : function(address) {
-        //~ vI_notificationBar.dump("## v_identity: getAddress: parsing '" + address + "'\n")
-        var name = ""; email = "";
-        // prefer an email address separated with < >, only if not found use any other
-        if (address.match(/<\s*[^>\s]*@[^>\s]*\s*>/) || address.match(/<?\s*[^>\s]*@[^>\s]*\s*>?/) || address.match(/$/)) {
-            name = RegExp.leftContext + RegExp.rightContext
-            email = RegExp.lastMatch
-            email = email.replace(/\s+|<|>/g,"")
-            name = name.replace(/^\s+|\s+$/g,"")
-        }
-        //~ vI_notificationBar.dump("## v_identity: getAddress: address '" + address + "' name '" + 
-            //~ name + "' email '" + email + "'\n");
-        return { name: name,
-             email: email,
-             combinedName: name + " <" + email + ">"}
-    },
-
     openURL : function(aURL) {
             var uri = Components.classes["@mozilla.org/network/standard-url;1"].createInstance(Components.interfaces.nsIURI);