cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i..@apache.org
Subject [04/10] git commit: manually merging CB-3208
Date Wed, 23 Apr 2014 18:56:30 GMT
manually merging CB-3208


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/commit/db17e0b2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/tree/db17e0b2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/diff/db17e0b2

Branch: refs/heads/master
Commit: db17e0b241ec9124537db09d8778e05385bd60bf
Parents: 9712e9b
Author: Piotr Zalewa <piotr@zalewa.info>
Authored: Wed Feb 26 16:04:25 2014 +0100
Committer: hermwong <herm.wong@gmail.com>
Committed: Tue Mar 4 11:54:57 2014 -0800

----------------------------------------------------------------------
 src/firefoxos/ContactsProxy.js | 58 ++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/blob/db17e0b2/src/firefoxos/ContactsProxy.js
----------------------------------------------------------------------
diff --git a/src/firefoxos/ContactsProxy.js b/src/firefoxos/ContactsProxy.js
index b0e2706..a5b6667 100644
--- a/src/firefoxos/ContactsProxy.js
+++ b/src/firefoxos/ContactsProxy.js
@@ -41,7 +41,7 @@ function _hasId(id) {
 }
 
 // Extend mozContact prototype to provide update from Cordova
-mozContact.prototype.updateFromCordova = function(contact) {
+function updateFromCordova(contact, fromContact) {
 
     function exportContactFieldArray(contactFieldArray, key) {
         if (!key) {
@@ -100,45 +100,45 @@ mozContact.prototype.updateFromCordova = function(contact) {
     var baseArrayFields = [['displayName', 'name'], ['nickname']];
     var baseStringFields = [];
     var j = 0; while(field = nameFields[j++]) {
-      if (contact.name[field[0]]) {
-        this[field[1] || field[0]] = contact.name[field[0]].split(' ');
+      if (fromContact.name[field[0]]) {
+        contact[field[1] || field[0]] = fromContact.name[field[0]].split(' ');
       }
     }
     j = 0; while(field = baseArrayFields[j++]) {
-      if (contact[field[0]]) {
-        this[field[1] || field[0]] = contact[field[0]].split(' ');
+      if (fromContact[field[0]]) {
+        contact[field[1] || field[0]] = fromContact[field[0]].split(' ');
       }
     }
     j = 0; while(field = baseStringFields[j++]) {
-      if (contact[field[0]]) {
-        this[field[1] || field[0]] = contact[field[0]];
+      if (fromContact[field[0]]) {
+        contact[field[1] || field[0]] = fromContact[field[0]];
       }
     }
-    if (contact.birthday) {
-      this.bday = new Date(contact.birthday);
+    if (fromContact.birthday) {
+      contact.bday = new Date(fromContact.birthday);
     }
-    if (contact.emails) {
-        var emails = exportContactField(contact.emails)
-        this.email = emails;
+    if (fromContact.emails) {
+        var emails = exportContactField(fromContact.emails)
+        contact.email = emails;
     }
-    if (contact.categories) {
-        this.category = exportContactFieldArray(contact.categories);
+    if (fromContact.categories) {
+        contact.category = exportContactFieldArray(fromContact.categories);
     }
-    if (contact.addresses) {
-        this.adr = exportAddress(contact.addresses);
+    if (fromContact.addresses) {
+        contact.adr = exportAddress(fromContact.addresses);
     }
-    if (contact.phoneNumbers) {
-        this.tel = exportContactField(contact.phoneNumbers);
+    if (fromContact.phoneNumbers) {
+        contact.tel = exportContactField(fromContact.phoneNumbers);
     }
-    if (contact.organizations) {
+    if (fromContact.organizations) {
         // XXX: organizations are saved in 2 arrays - org and jobTitle
         //      depending on the usecase it might generate issues
         //      where wrong title will be added to an organization
-        this.org = exportContactFieldArray(contact.organizations, 'name');
-        this.jobTitle = exportContactFieldArray(contact.organizations, 'title');
+        contact.org = exportContactFieldArray(fromContact.organizations, 'name');
+        contact.jobTitle = exportContactFieldArray(fromContact.organizations, 'title');
     }
-    if (contact.note) {
-        this.note = [contact.note];
+    if (fromContact.note) {
+        contact.note = [fromContact.note];
     }
 }
 
@@ -287,7 +287,7 @@ function createMozillaFromCordova(successCB, errorCB, contact) {
         filterBy: ['id'], filterValue: contact.id, filterOp: 'equals'});
       search.onsuccess = function() {
         moz = search.result[0];
-        moz.updateFromCordova(contact);
+        updateFromCordova(moz, contact);
         successCB(moz);
       };
       search.onerror = errorCB;
@@ -296,11 +296,11 @@ function createMozillaFromCordova(successCB, errorCB, contact) {
 
     // create empty contact
     moz = new mozContact();
-    if ('init' in moz) {
+    // if ('init' in moz) {
       // 1.2 and below compatibility
-      moz.init();
-    }
-    moz.updateFromCordova(contact);
+      // moz.init();
+    // }
+    updateFromCordova(moz, contact);
     successCB(moz);
 }
 
@@ -461,4 +461,4 @@ module.exports = {
     search: search
 };    
     
-require("cordova/firefoxos/commandProxy").add("Contacts", module.exports); 
+require("cordova/firefoxos/commandProxy").add("Contacts", module.exports);
\ No newline at end of file


Mime
View raw message