projects / profile / ivi / sdk / web-sample-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c51666a)
Updated Modello web samples from upstream 35/31735/1
authorAlice Liu <alice.liu@intel.com>
Tue, 9 Dec 2014 06:16:09 +0000 (14:16 +0800)
committerAlice Liu <alice.liu@intel.com>
Tue, 9 Dec 2014 06:16:09 +0000 (14:16 +0800)
Package version up (3.0.33).

Change-Id: I8484e00ff98c1884ad4b2384006a9d9a61bdf73f
Signed-off-by: Alice Liu <alice.liu@intel.com>
package/changelog patch | blob | history
package/pkginfo.manifest patch | blob | history
samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/js/main.js patch | blob | history
samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/packaging/modello-ambsimulator.changes patch | blob | history
samples/web/Sample/Tizen/Web App/ModelloDashboard/project/js/main.js patch | blob | history
samples/web/Sample/Tizen/Web App/ModelloDashboard/project/packaging/modello-dashboard.changes patch | blob | history
samples/web/Sample/Tizen/Web App/ModelloHVAC/project/js/main.js patch | blob | history
samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.changes patch | blob | history
samples/web/Sample/Tizen/Web App/ModelloPhone/project/js/main.js patch | blob | history
samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.changes patch | blob | history

diff --git a/package/changelog b/package/changelog
index df3d10f..3aba2d7 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 3.0.33
+* Updated Modello web samples from upstream
+== Alice Liu <alice.liu@intel.com> 2014-11-25
+
 * 3.0.32
 * Updated Modello web samples from upstream
 == Alice Liu <alice.liu@intel.com> 2014-11-25
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 2924534..62e7d87 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:3.0.32
+Version:3.0.33
 Maintainer: Alice Liu<alice.liu@intel.com>
 
 Package:ivi-3.0-web-sample
diff --git a/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/js/main.js b/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/js/main.js
index f80ff07..10bf9c0 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/js/main.js
+++ b/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/js/main.js
@@ -18,7 +18,7 @@
  * * [async.js](https://github.com/caolan/async) - simplifies asynchronouse operations with Javascript (for sample code see script [lightsDemo.js](../files/applications_ambsimulator_js_lightsDemo.js.html))
  * * [Tween.js](https://github.com/sole/tween.js/) - provides values for various mathematical functions in defined time
  * (for sample code see script [speedDemo2.js](../files/applications_ambsimulator_js_speedDemo2.js.html) or [batteryDemo.js](../files/applications_ambsimulator_js_batteryDemo.js.html))
- * * [tizen.vehicle API](https://raw.github.com/otcshare/automotive-message-broker/master/docs/amb.idl)
+ * * [navigator.vehicle API](https://raw.github.com/otcshare/automotive-message-broker/master/docs/amb.idl)
  * * {{#crossLink "Simulator/amblog:method"}}{{/crossLink}} - provides console for logging events occured during script execution
  *
  * To add additional libraries into environment add links into `<head>` section of application `index.html` file.
diff --git a/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/packaging/modello-ambsimulator.changes b/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/packaging/modello-ambsimulator.changes
index 840d512..29792d1 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/packaging/modello-ambsimulator.changes
+++ b/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/packaging/modello-ambsimulator.changes
@@ -1,3 +1,6 @@
+* Mon Dec 01 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/3.0.m14.3/ivi/20141018.100011-1-gc78f043
+- Changed to use the navigator.vehicle namespace - TC-2055
+
 * Tue Oct 07 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20141007.174646-1-g57a37aa
 - clean spec file
 - Fix for TC-1560 UI always zoomed out
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 0be0cb8..1de6754 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
@@ -1,7 +1,7 @@
 /*global Bootstrap, dashBoardControler */
 
 /**
- * DashBoard application show information about vehicle from [tizen.vehicle API](https://raw.github.com/otcshare/automotive-message-broker/master/docs/amb.idl).
+ * DashBoard application show information about vehicle from [navigator.vehicle API](https://raw.github.com/otcshare/automotive-message-broker/master/docs/amb.idl).
  * Uses mainly {{#crossLink "CarIndicator"}}{{/crossLink}} module from {{#crossLink "Bootstrap/carIndicator:property"}}{{/crossLink}}. Dashboard application uses following
  * AMB properties to show car data in display only mode:
  *
@@ -97,7 +97,7 @@ var init = function () {
         $('#bottomPanel').bottomPanel('init', 'withoutBack');
         $("#topBarIcons").topBarIconsPlugin('init');
 
-       tizen.vehicle.vehicleSpeed.get().then(
+       navigator.vehicle.vehicleSpeed.get().then(
                function(vSpeed){
                        dashBoardIndicator.onSpeedChanged(vSpeed.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 24bb5eb..26f311c 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 @@
+* 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
+
 * Tue Oct 07 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20141007.174646-1-g96b3bec
 - clean the spec file
 - Fix for TC-1560 UI always zoomed out
diff --git a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/js/main.js b/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/js/main.js
index 74e2e50..ec71843 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/js/main.js
+++ b/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/js/main.js
@@ -2,7 +2,7 @@
 
 /**
  * Heat, Ventilation and Air Conditioning provides UI controls to operate this subystem of the car from
- * [tizen.vehicle API](https://raw.github.com/otcshare/automotive-message-broker/master/docs/amb.idl).
+ * [navigator.vehicle API](https://raw.github.com/otcshare/automotive-message-broker/master/docs/amb.idl).
  * Uses mainly {{#crossLink "CarIndicator"}}{{/crossLink}} module from {{#crossLink "Bootstrap/carIndicator:property"}}{{/crossLink}}.
  *
  * Application directly controls following AMB properties:
@@ -192,4 +192,4 @@ $(function() {
        "use strict";
        // debug mode - window.setTimeout("init()", 20000);
        init();
-});
\ No newline at end of file
+});
diff --git a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.changes b/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.changes
index 27f6446..d0f6a1a 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.changes
+++ b/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.changes
@@ -1,3 +1,6 @@
+* Mon Dec 01 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/3.0.m14.3/ivi/20141018.100009-1-gce7f5a8
+- Changed to use the navigator.vehicle namespace - TC-2055
+
 * Thu Oct 16 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20141008.200057-1-g86327ab
 - Fix for TC-1468.  Also enabling buttons to be pressed as a temporary workaround
 
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 45ebadf..328b8b2 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
@@ -476,6 +476,8 @@ function acceptCall(contact) {
                 tizen.phone.answerCall(function(result) {
                     console.log(result.message);
                 });
+
+                CallDuration.startWatch();
             } else if (callStatus === "DISCONNECTED".toLowerCase()) {
 
                 var callNumber = contact.phoneNumbers[0] && contact.phoneNumbers[0].number ? contact.phoneNumbers[0].number : "";
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 32f8b8e..f37d026 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 @@
+* 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
+
 * 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
 
Domain: SDK / Uncategorized;