Updated Modello web samples from upstream

Package version up (3.0.35).

Change-Id: Ie811a420c8860963fec6801744aac220b7ac0e0a
Signed-off-by: Alice Liu <alice.liu@intel.com>

diff --git a/package/changelog b/package/changelog
index 989fd3b..2e95ee9 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 3.0.35
+* Updated Modello web samples from upstream
+== Alice Liu <alice.liu@intel.com> 2014-12-23
+
 * 3.0.34
 * Updated Modello web samples from upstream
 == Alice Liu <alice.liu@intel.com> 2014-12-22

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 536cc41..d435dbe 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:3.0.34
+Version:3.0.35
 Maintainer: Alice Liu<alice.liu@intel.com>
 
 Package:ivi-3.0-web-sample

diff --git a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/js/callhistorycarousel.js b/samples/web/Sample/Tizen/Web App/ModelloPhone/project/js/callhistorycarousel.js
index 211cba0..b2b69b8 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/js/callhistorycarousel.js
+++ b/samples/web/Sample/Tizen/Web App/ModelloPhone/project/js/callhistorycarousel.js
@@ -131,6 +131,36 @@ Carousel.prototype.loadCallHistory = function(callHistory, index) {
        }
 };
 /**
+ * This method adds newest call history data up to the index given and reset position to start.
+ *
+ * @method addCallHistory
+ * @param  callHistory {Array} Call history array.
+ * @param  index {Integer} Index position of the last entry that needs to be added.
+ */
+Carousel.prototype.addCallHistory = function(callHistory, index) {
+        "use strict";
+        var carouselItem;
+        this.callHistory = callHistory;
+
+        if (!!this.swipe) {
+                this.swipe.trigger("removeItem", 0);
+
+                for (var i = index; i >= 0; i--) {
+                        carouselItem = this.createSwipeItem(this.callHistory[i], i);
+                        if (!!carouselItem && !!this.swipe) {
+                                this.swipe.trigger("insertItem", [ carouselItem, 0 ]);
+                        }
+                }
+
+                var html = "<li><div class='carouselEdgeBox'></div></li>";
+                this.swipe.trigger("insertItem", [ html, 0 ]);
+
+                this.swipe.trigger("slideTo", [ 0, 0, {
+                        duration : 0
+                } ]);
+        }
+};
+/**
  * This method creates one carousel item for swipe.
  *
  * @method createSwipeItem

diff --git a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/js/main.js b/samples/web/Sample/Tizen/Web App/ModelloPhone/project/js/main.js
index 02440c9..4111f4c 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/js/main.js
+++ b/samples/web/Sample/Tizen/Web App/ModelloPhone/project/js/main.js
@@ -701,8 +701,7 @@ $(document).ready(
                             tmpCallHistory.unshift(tmpContact[0]);
                             Phone.callHistory(tmpCallHistory);
 
-                            callHistoryCarousel.loadCallHistory(Phone.callHistory(), 0);
-
+                            callHistoryCarousel.addCallHistory(Phone.callHistory(), 0);
                         }
                     });
                     /* add listener to change call state */

diff --git a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.changes b/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.changes
index c82574b..cf9af27 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.changes
+++ b/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.changes
@@ -1,3 +1,6 @@
+* Mon Dec 22 2014 Jimmy Huang <jimmy.huang@intel.com> accepted/tizen/ivi/20141212.011920-1-gd50348c
+- Fix TC-2267 - Calling history refresh too slow
+
 * 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