Merge pull request mozilla-b2g#2705 from albertopq/contacts-bugfixing

arcturus · arcturus · commit 1cd2a98ed810 · 2012-07-23T02:28:12.000-07:00
[Contacts] Moving favorite button to the "contact details" view
diff --git a/apps/contacts/index.html b/apps/contacts/index.html
@@ -163,6 +163,10 @@ <h1 id='org-title'></h1>
                     <!-- Iterating mails, phones, addresses adn comments here -->
                   </ul>
                 </div>
+                <hr/>
+                <button onclick='Contacts.toggleFavorite(); return false;' id='toggle-favorite' class="fillflow-row action action-add">
+                  <b>Add as favorite</b>
+                </button>
               </section>
             </div>
           </article>
@@ -329,11 +333,6 @@ <h1 id='contact-form-title'></h1>
                   <span role="button" class="icon-add"></span>
                   <b>Add comment</b>
                 </button>
-
-                <hr/>
-                <button onclick='Contacts.toggleFavorite(); return false;' id='toggle-favorite' class="fillflow-row action action-add">
-                  <b>Add as favorite</b>
-                </button>
               </form>
 
               <button id='delete-contact' class="hide fillflow-row action action-delete">
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
@@ -323,6 +323,7 @@ var Contacts = (function() {
   //
   var reloadContactDetails = function reloadContactDetails() {
     var contact = currentContact;
+    toggleFavoriteMessage(isFavorite(currentContact));
     detailsName.textContent = contact.name;
     if (contact.category && contact.category.indexOf('favorite') != -1) {
       detailsName.innerHTML += '<sup></sup>';
@@ -459,7 +460,6 @@ var Contacts = (function() {
       numberEmails++;
     }
 
-    toggleFavoriteMessage(isFavorite(currentContact));
     for (var adr in currentContact.adr) {
       var currentAddress = currentContact.adr[adr];
       var default_type = TAG_OPTIONS['address-type'][0].value;
@@ -657,6 +657,21 @@ var Contacts = (function() {
         delete currentContact.category[pos];
       }
     }
+
+    var request = navigator.mozContacts.save(currentContact);
+    request.onsuccess = function onsuccess() {
+      var cList = contacts.List;
+      cList.getContactById(currentContact.id, function onSuccess(savedContact) {
+        currentContact = savedContact;
+        contactsList.refresh(currentContact);
+        reloadContactDetails();
+      }, function onError() {
+        console.error('Error reloading contact');
+      });
+    };
+    request.onerror = function onerror() {
+      console.error('Error saving favorite');
+    };
   };
 
   var toggleFavoriteMessage = function toggleFavMessage(isFav) {
