Updated Modello web samples from upstream

Package version up (3.0.30).

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

diff --git a/package/changelog b/package/changelog
index 485f542..ab66abe 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 3.0.30
+* Updated Modello web samples from upstream
+== Alice Liu <alice.liu@intel.com> 2014-11-07
+
 * 3.0.29
 * Updated Modello web samples from upstream
 == Alice Liu <alice.liu@intel.com> 2014-10-23

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index fe8e23b..69ae0fc 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:3.0.29
+Version:3.0.30
 Maintainer: Alice Liu<alice.liu@intel.com>
 
 Package:ivi-3.0-web-sample

diff --git a/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/systemd/Modello_Homescreen-launchpad-ready.path b/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/systemd/Modello_Homescreen-launchpad-ready.path
index 70d3a96..75b9cfc 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/systemd/Modello_Homescreen-launchpad-ready.path
+++ b/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/systemd/Modello_Homescreen-launchpad-ready.path
@@ -1,7 +1,7 @@
 # Description=Path activation for Modello_Homescreen
 
 [Path]
-PathExists=/run/user/%U/wayland-0
+PathExists=%t/wayland-0
 Unit=Modello_Homescreen.service
 
 [Install]

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 9306bb9..211cba0 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
@@ -199,8 +199,17 @@ Carousel.prototype.createSwipeItem = function(callHistoryEntry, index) {
                carouselItem.data("contact", contact);
                carouselItem.click(function() {
                        self.swipe.trigger("slideTo", [ $(this), -1 ]);
-                       var hystoryEntry = $(this).data("callhistory");
+                       var historyEntry = $(this).data("callhistory");
                        var contactEntry = $(this).data("contact");
+                       if (!contactEntry) {
+                               contactEntry = {
+                                       name : {
+                                               displayName : historyEntry.remoteParties[0].personId,
+                                               firstName : "",
+                                               lastName : ""
+                                       }
+                               };
+                       }
                        var contact = {
                                name : {
                                        displayName : contactEntry.name.displayName,
@@ -209,7 +218,7 @@ Carousel.prototype.createSwipeItem = function(callHistoryEntry, index) {
                                },
                                photoURI : contactEntry.photoURI,
                                phoneNumbers : [ {
-                                       number : hystoryEntry.remoteParties[0].personId
+                                       number : historyEntry.remoteParties[0].personId
                                } ]
 
                        };

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 9ee0db7..45ebadf 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
@@ -55,7 +55,7 @@ var telInput;
 var bootstrap;
 
 /**
-* Instance of class Carousel, this class provides methods to operate with hystory carousel.
+* Instance of class Carousel, this class provides methods to operate with history carousel.
 * * {{#crossLink "Carousel"}}{{/crossLink}}
 *
 * @property callHistoryCarousel {Object}

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 e3970e8..32f8b8e 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 @@
+* Tue Oct 28 2014 Jimmy Huang <jimmy.huang@intel.com> accepted/tizen/3.0.m14.3/ivi/20141018.100013-2-g71c6c96
+- Fixed a bug on dialing from recent history
+
 * Mon Oct 20 2014 Jimmy Huang <jimmy.huang@intel.com> accepted/tizen/3.0.m14.3/ivi/20141018.100013-1-gce6f884
 - Fixed a bug where alpha filter is not working in contacts