Updated Modello web samples from upstream

Package version up (3.0.38).

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

diff --git a/package/changelog b/package/changelog
index e3d28b5..c7ba75f 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 3.0.38
+* Updated Modello web samples from upstream
+== Alice Liu <alice.liu@intel.com> 2015-01-15
+
 * 3.0.37
 * Updated Modello web samples from upstream
 == Alice Liu <alice.liu@intel.com> 2015-01-13

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 76d767e..0204600 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:3.0.37
+Version:3.0.38
 Maintainer: Alice Liu<alice.liu@intel.com>
 
 Package:ivi-3.0-web-sample

diff --git a/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/js/main.js b/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/js/main.js
index 1de6754..f9790db 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/js/main.js
+++ b/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/js/main.js
@@ -99,7 +99,7 @@ var init = function () {
 
        navigator.vehicle.vehicleSpeed.get().then(
                function(vSpeed){
-                       dashBoardIndicator.onSpeedChanged(vSpeed.speed);
+                       dashBoardIndicator.onSpeedChanged(Math.round(vSpeed.speed * 0.621371));
                },
                function(){
                        console.log("Modello Dashboard failed to get Vehicle Speed");

diff --git a/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/packaging/modello-dashboard.changes b/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/packaging/modello-dashboard.changes
index 26f311c..d1dddc6 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/packaging/modello-dashboard.changes
+++ b/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/packaging/modello-dashboard.changes
@@ -1,3 +1,6 @@
+* Wed Jan 14 2015 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20141202.054057-1-g2c4441a
+- Fix for TC-2353 - convert to MPH properly
+
 * Mon Dec 01 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20141121.050646-1-g0584f9b
 - Changed to use the navigator.vehicle namespace - TC-2055
 

diff --git a/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/css/style.css b/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/css/style.css
index f14a161..a037eea 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/css/style.css
+++ b/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/css/style.css
@@ -484,7 +484,8 @@
     -webkit-animation-duration: 10s;
     -webkit-animation-delay: 0s;
     -webkit-animation-timing-function: linear;
-    -webkit-animation-iteration-count: 1;/*infinite;*/
+    -webkit-animation-iteration-count: infinite;
+    -webkit-animation-play-state: paused;
 }
 
 .rollLeft {
@@ -492,7 +493,8 @@
     -webkit-animation-duration: 10s;
     -webkit-animation-delay: 0s;
     -webkit-animation-timing-function: linear;
-    -webkit-animation-iteration-count: 1;/*infinite;*/
+    -webkit-animation-iteration-count: infinite;
+    -webkit-animation-play-state: paused;
 }
 
 .liveBg {
@@ -500,8 +502,9 @@
     -webkit-animation-duration: 7s;
     -webkit-animation-delay: 0s;
     -webkit-animation-timing-function: ease-out;
-    -webkit-animation-iteration-count: 1;
+    -webkit-animation-iteration-count: infinite;
     -webkit-transition: opacity 500ms ease-out;
+    -webkit-animation-play-state: paused;
 }
 
 @-webkit-keyframes rotateR {

diff --git a/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/js/main.js b/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/js/main.js
index b058062..90515db 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/js/main.js
+++ b/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/js/main.js
@@ -84,27 +84,26 @@ var init = function() {
 
     });
 
+    var checkAnimationConfig = function() {
+        var animation = Configuration.get("animationEnabled");
+        if (animation === undefined || animation) {
+            $(".rollRight").css("-webkit-animation-play-state", "running");
+            $(".rollLeft").css("-webkit-animation-play-state", "running");
+            $(".liveBg").css("-webkit-animation-play-state", "running");
+        } else {
+            $(".rollRight").css("-webkit-animation-play-state", "paused");
+            $(".rollLeft").css("-webkit-animation-play-state", "paused");
+            $(".liveBg").css("-webkit-animation-play-state", "paused");
+        }
+    };
+
     /* fixed webkit animation bugs */
     window.setTimeout(function() {
-        window.setInterval(function() {
-            $("#innerRing").removeClass("rollLeft");
-            $("#outerRing").removeClass("rollRight");
-            window.setTimeout(function() {
-                $("#innerRing").addClass("rollLeft");
-                $("#outerRing").addClass("rollRight");
-            }, 50);
-
-        }, 10000);
-   }, 1000);
-    window.setTimeout(function() {
-        window.setInterval(function() {
-          $('#wrapper .step9').removeClass('liveBg');
-            window.setTimeout(function() {
-                $('#wrapper .step9').addClass('liveBg');
-            }, 50);
-
-        }, 7000);
-    }, 500);
+        checkAnimationConfig();
+        Configuration.addUpdateListener(function() {
+            checkAnimationConfig();
+        });
+    }, 1000);
     /* end fixed webkit animation bugs */
 };
 

diff --git a/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/packaging/modello-homescreen.changes b/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/packaging/modello-homescreen.changes
index bb41073..815076d 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/packaging/modello-homescreen.changes
+++ b/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/packaging/modello-homescreen.changes
@@ -1,3 +1,6 @@
+* Wed Jan 07 2015 Jimmy Huang <jimmy.huang@intel.com> accepted/tizen/ivi/20141112.110519-1-g9a41e9e
+- Add support to disable/enable Homescreen animation
+
 * Tue Oct 07 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20141007.175535-1-g0b3ff06
 - Fix systemd install path on 64-bit architecture
 - use systemd macro for path.