Merge pull request #8045 from arcturus/bug-838622

Bug 836170 - [Contact]: Scrolling and Dragging in contact application is very slow(cherry picked from commit 3859bf4)

Conflicts:
	apps/communications/contacts/js/contacts_list.js
	apps/communications/contacts/test/unit/contacts_list_test.js

apps/communications/contacts/index.html

@@ -18,6 +18,8 @@
 
     <script defer src="/contacts/js/activities.js"></script>
 
+    <script defer type="text/javascript" src="/shared/js/async_storage.js"></script>
+
     <!-- For initializing FB integration -->
     <script defer src="/contacts/js/fb/fb_init.js"></script>
     <script defer type="text/javascript" src="/contacts/js/utilities/event_listeners.js"></script>
@@ -33,8 +35,6 @@
     <script defer type="text/javascript" src="/contacts/js/fb_loader.js"></script>
     <script defer type="text/javascript" src="/shared/js/mouse_event_shim.js"></script>
 
-    <script defer type="text/javascript" src="/shared/js/async_storage.js"></script>
-
     <!-- Loading FB indexedDB related stuff -->
     <script defer src="/contacts/js/utilities/config.js"></script>
     <script defer type="text/javascript" src="/contacts/js/search.js"></script>

apps/communications/contacts/js/contacts.js

@@ -502,43 +502,6 @@ var Contacts = (function() {
       (contact1.updated - contact2.updated) == 0;
   };
 
-  // When a visiblity change is sent, handles and updates the
-  // different views according to the app state
-  var handleVisibilityChange = function handleVisibilityChange() {
-    switch (navigation.currentView()) {
-      case 'view-contact-details':
-        if (!currentContact) {
-          return;
-        }
-        contacts.List.load();
-        contacts.List.getContactById(currentContact.id, function(contact) {
-          if (isUpdated(contact, currentContact)) {
-            return;
-          }
-          currentContact = contact;
-          contactsDetails.render(currentContact, TAG_OPTIONS);
-        });
-        break;
-      case 'view-contact-form':
-        if (!currentContact) {
-          return;
-        }
-        contacts.List.load();
-        contacts.List.getContactById(currentContact.id, function(contact) {
-          if (!contact || isUpdated(contact, currentContact)) {
-            return;
-          }
-          currentContact = contact;
-          contactsDetails.render(currentContact, TAG_OPTIONS);
-          navigation.back();
-        });
-        break;
-      case 'view-contacts-list':
-        contacts.List.load();
-        break;
-    }
-  };
-
   var showAddContact = function showAddContact() {
     showForm();
   };
@@ -776,6 +739,76 @@ var Contacts = (function() {
     document.head.appendChild(fragment);
   };
 
+  var pendingChanges = {};
+
+  // This function is called when we finish a oncontactchange operation to 
+  // remove the op of the pending changes and check if we need to apply more
+  // changes request over the same id.
+  var checkPendingChanges = function checkPendingChanges(id) {
+    var changes = pendingChanges[id];
+
+    if(!changes) {
+      return;
+    }
+
+    pendingChanges[id].shift();
+
+    if (pendingChanges[id].length >= 1) {
+      performOnContactChange(pendingChanges[id][0]);
+    }
+  }
+
+  navigator.mozContacts.oncontactchange = function oncontactchange(event) {
+    if (typeof pendingChanges[event.contactID] !== 'undefined') {
+      pendingChanges[event.contactID].push({
+        contactID: event.contactID,
+        reason: event.reason
+      });
+    } else {
+      pendingChanges[event.contactID] = [{
+        contactID: event.contactID,
+        reason: event.reason
+      }];
+    }
+
+    // If there is already a pending request, don't do anything, just wait to finish it in order
+    if(pendingChanges[event.contactID].length > 1) {
+      return;
+    }
+
+    performOnContactChange(event);
+  }
+
+  var performOnContactChange = function performOnContactChange(event) {
+    var currView = navigation.currentView();
+    switch (event.reason) {
+      case 'update':
+        if (currView == 'view-contact-details' && currentContact != null &&
+          currentContact.id == event.contactID) {
+          contactsList.getContactById(event.contactID, function success(contact, enrichedContact) {
+            currentContact = enrichedContact || contact;
+            contactsDetails.render(currentContact);
+            contactsList.refresh(currentContact, checkPendingChanges, event.reason);
+          });
+        } else {
+          contactsList.refresh(event.contactID, checkPendingChanges, event.reason);
+        }
+        break;
+      case 'create':
+        contactsList.refresh(event.contactID, checkPendingChanges, event.reason);
+        break;
+      case 'remove':
+        if (currentContact != null && currentContact.id == event.contactID
+          && (currView == 'view-contact-details' || currView == 'view-contact-form')) {
+          navigation.home();
+        }
+        contactsList.remove(event.contactID, event.reason);
+        currentContact = {};
+        checkPendingChanges(event.contactID);
+        break;
+    }
+  }
+
   return {
     'doneTag': doneTag,
     'goBack' : handleBack,
@@ -789,7 +822,6 @@ var Contacts = (function() {
     'checkCancelableActivity': checkCancelableActivity,
     'isEmpty': isEmpty,
     'getLength': getLength,
-    'handleVisibilityChange': handleVisibilityChange,
     'showForm': showForm,
     'setCurrent': setCurrent,
     'getTags': TAG_OPTIONS,
@@ -826,9 +858,6 @@ window.addEventListener('localized', function initContacts(evt) {
         ActivityHandler.postCancel();
         return;
       }
-      if (!ActivityHandler.currentlyHandling && !document.mozHidden) {
-        Contacts.handleVisibilityChange();
-      }
       Contacts.checkCancelableActivity();
     });
   }); // fb.init

apps/communications/contacts/js/contacts_details.js

@@ -218,16 +218,7 @@ contacts.Details = (function() {
       */
        cList.getContactById(contact.id,
                            function onSuccess(savedContact, enrichedContact) {
-
-        contactData = savedContact;
-        Contacts.setCurrent(contactData);
-
-        if (enrichedContact) {
-          cList.refresh(enrichedContact);
-        } else {
-          cList.refresh(contact);
-        }
-        renderFavorite(contactData);
+        renderFavorite(savedContact);
         favoriteMessage.style.pointerEvents = 'auto';
       }, function onError() {
         console.error('Error reloading contact');

apps/communications/contacts/js/contacts_form.js

@@ -315,12 +315,10 @@ contacts.Form = (function() {
 
   var deleteContact = function deleteContact(contact) {
     var deleteSuccess = function deleteSuccess() {
-      contacts.List.remove(contact.id);
       if (contacts.Search.isInSearchMode()) {
         contacts.Search.invalidateCache();
         contacts.Search.removeContact(contact.id);
       }
-      Contacts.setCurrent({});
       Contacts.navigation.home();
     };
     var request;
@@ -438,31 +436,10 @@ contacts.Form = (function() {
 
     request.onsuccess = function onsuccess() {
       // Reloading contact, as it only allows to be updated once
-      var cList = contacts.List;
-      cList.getContactById(contact.id, function onSuccess(savedContact,
-                                        enrichedContact) {
-        var nextCurrent = enrichedContact || savedContact;
-
-        Contacts.setCurrent(savedContact);
-        myContact.id = savedContact.id;
-
-        myContact.photo = nextCurrent.photo;
-        myContact.org = nextCurrent.org;
-        myContact.category = nextCurrent.category;
-
-        cList.refresh(myContact);
-        if (ActivityHandler.currentlyHandling) {
-          ActivityHandler.postNewSuccess(savedContact);
-        } else {
-          contacts.Details.render(savedContact, TAG_OPTIONS);
-        }
-        Contacts.cancel();
-      }, function onError() {
-        console.error('Error reloading contact');
-        if (ActivityHandler.currentlyHandling) {
-          ActivityHandler.postCancel();
-        }
-      });
+      if (ActivityHandler.currentlyHandling) {
+        ActivityHandler.postNewSuccess(contact);
+      }
+      Contacts.cancel();
     };
 
     request.onerror = function onerror() {