Fix download history spinner sometimes not hiding correctly

Change-Id: Ia18f3517f6843e3486618ac77bcd985e6d462110
Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>

diff --git a/js/main.js b/js/main.js
index 328b8b2..02440c9 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -569,7 +569,6 @@ $(document).ready(
                             $("#noPairedDevice").show();
                         } else {
                             $("#noPairedDevice").hide();
-                            $("#loadingHistorySpinnerWrapper").show();
                             $(".caroufredsel_wrapper").show();
                         }
                     });
@@ -579,9 +578,10 @@ $(document).ready(
                             Phone.loadContacts(function(err) {
                                 if (!err) {
                                     ContactsLibrary.init();
+                                    $("#loadingHistorySpinnerWrapper").show();
                                     Phone.loadCallHistory(function(err) {
+                                        $("#loadingHistorySpinnerWrapper").hide();
                                         if (!err) {
-                                            $("#loadingHistorySpinnerWrapper").hide();
                                             callHistoryCarousel.loadCallHistory(Phone.callHistory(), 0);
                                         }
                                     });
@@ -608,8 +608,8 @@ $(document).ready(
                         if (acceptPhoneCallFromOtherWidget !== true) {
                             window.setTimeout(function() {
                                 Phone.loadCallHistory(function(err) {
+                                    $("#loadingHistorySpinnerWrapper").hide();
                                     if (!err) {
-                                        $("#loadingHistorySpinnerWrapper").hide();
                                         callHistoryCarousel.loadCallHistory(Phone.callHistory(), 0);
 
                                     }

diff --git a/packaging/modello-phone.changes b/packaging/modello-phone.changes
index f37d026..c82574b 100644 (file)
--- a/packaging/modello-phone.changes
+++ b/packaging/modello-phone.changes
@@ -1,3 +1,6 @@
+* Thu Dec 11 2014 Jimmy Huang <jimmy.huang@intel.com> accepted/tizen/ivi/20141208.013020-1-gcd10124
+- Fix download history spinner sometimes not hiding correctly
+
 * Fri Dec 05 2014 Jimmy Huang <jimmy.huang@intel.com> accepted/tizen/3.0.m14.3/ivi/20141018.100013-3-g927cca8
 - Fix TC-1906 - no call time recording when answering without phone launched