You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by he...@apache.org on 2013/12/03 22:32:50 UTC

[07/11] git commit: search hacked via getAll

search hacked via getAll


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/c2fb0d0d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/tree/c2fb0d0d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/diff/c2fb0d0d

Branch: refs/heads/dev
Commit: c2fb0d0d1a9950e5512d6542f3382a2a06c3955d
Parents: 08e6dab
Author: Piotr Zalewa <pi...@zalewa.info>
Authored: Wed Nov 27 15:46:26 2013 +0100
Committer: hermwong <he...@gmail.com>
Committed: Tue Dec 3 13:31:28 2013 -0800

----------------------------------------------------------------------
 src/firefoxos/ContactsProxy.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/blob/c2fb0d0d/src/firefoxos/ContactsProxy.js
----------------------------------------------------------------------
diff --git a/src/firefoxos/ContactsProxy.js b/src/firefoxos/ContactsProxy.js
index cc8f9c1..10f0288 100644
--- a/src/firefoxos/ContactsProxy.js
+++ b/src/firefoxos/ContactsProxy.js
@@ -249,11 +249,11 @@ function hackedSearch(successCB, errorCB, params) {
         }
     }
     var getall = navigator.mozContacts.getAll({});
+    var contacts = [];
+    
     getall.onsuccess = function() {
-        var contacts = [];
-        var allContacts = getall.result;
-        for (var i=0; i < allContacts.length; i++) {
-            var mozContact = allContacts[i];
+        if (getall.result) {
+            var mozContact = getall.result;
             var valid = false;
             for (var j=0; j < filter.length; j++) {
                 if (mozContact[filter[0]].indexOf(options.filter)) {
@@ -263,8 +263,13 @@ function hackedSearch(successCB, errorCB, params) {
             if (valid) {
                 contacts.push(createCordovaFromMozilla(mozContact));
             }
+            
+            getall.continue();
+            
+        } else {
+            successCB(contacts);
         }
-        successCB(contacts);
+
     };
     getall.onerror = errorCB;
 }