Updated Modello Common libraries

Package version up (3.0.29).

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

diff --git a/package/changelog b/package/changelog
index 9cf0536..746e8f5 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 3.0.29
+- Updated Modello Common libraries
+== Alice Liu <alice.liu@intel.com> 2014-09-23
+
 * 3.0.28
 - Updated Modello Common libraries
 == Alice Liu <alice.liu@intel.com> 2014-09-12

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 5e00d5f..5e8e547 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:3.0.28
+Version:3.0.29
 Maintainer: Wenchao Wang<wenchao.wang@intel.com>
 
 Package:ivi-3.0-web-add-ons

diff --git a/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/incomingCall/incomingCall.js b/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/incomingCall/incomingCall.js
index ca3a6b6..c9b1aac 100644 (file)
--- a/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/incomingCall/incomingCall.js
+++ b/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/incomingCall/incomingCall.js
@@ -82,18 +82,18 @@ IncomingCall.prototype.hide = function() {
        }
 };
 /**
- * Method accepts incoming call. If application where call is accepted isn't Phone application (`intelPoc15.phone`), then launches Phone application.
- * If apllication where call is accepted is Phone application (`intelPoc15.phone`), call {{#crossLink "Phone/acceptCall:method"}}{{/crossLink}} method.
+ * Method accepts incoming call. If application where call is accepted isn't Phone application (`Modello009.Phone`), then launches Phone application.
+ * If apllication where call is accepted is Phone application (`Modello009.Phone`), call {{#crossLink "Phone/acceptCall:method"}}{{/crossLink}} method.
  * @method acceptIncommingCall
  */
 IncomingCall.prototype.acceptIncommingCall = function() {
        "use strict";
        /* todo add call to phone application */
        this.hide();
-       var appId = getAppByID('intelPoc15.phone');
+       var appId = getAppByID('Modello009.Phone');
        /* if app isn't phone */
        if (!appId.running) {
-               launchApplication('intelPoc15.phone');
+               launchApplication('Modello009.Phone');
                /* if app is phone */
        } else {
                if (typeof(tizen) !== 'undefined' && tizen.phone) {

diff --git a/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/topBarIcons/topBarIcons.js b/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/topBarIcons/topBarIcons.js
index ce7d0b2..579c9ff 100644 (file)
--- a/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/topBarIcons/topBarIcons.js
+++ b/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/topBarIcons/topBarIcons.js
@@ -219,7 +219,7 @@ function launchApplication(id) {
                                        for (i = 0; i < list.length; i++) {
                                                var app = list[i];
                                                var subName = app.name.substr(7);
-                                               subName = subName.replace(/\./g, "_").replace(/\ /g, "_");
+                                               subName = subName.replace(/\./g, "").replace(/\ /g, "");
                                                if (app.name.indexOf('Modello') >= 0) {
                                                        var newApp = {
                                                                id: app.id,

diff --git a/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/bootstrap.js b/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/bootstrap.js
index 645e910..91cbc58 100644 (file)
--- a/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/bootstrap.js
+++ b/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/bootstrap.js
@@ -151,7 +151,7 @@ Bootstrap.prototype.initIncomingCall = function(callback) {
                                                if (typeof(tizen) !== 'undefined' && tizen.phone) {
                                                        tizen.phone.addCallChangedListener(function(result) {
                                                                /* global getAppByID */
-                                                               var appId = getAppByID('intelPoc15.phone');
+                                                               var appId = getAppByID('Modello009.Phone');
 
                                                                var contact;
                                                                var activeCall = tizen.phone.activeCall();
@@ -183,7 +183,7 @@ Bootstrap.prototype.initIncomingCall = function(callback) {
                                                                        case "DIALING".toLowerCase():
                                                                                if (!appId.running) {
                                                                                        /*global launchApplication*/
-                                                                                       launchApplication('intelPoc15.phone');
+                                                                                       launchApplication('Modello009.Phone');
                                                                                }
                                                                                break;
                                                                        case "INCOMING".toLowerCase():

diff --git a/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/carIndicator.js b/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/carIndicator.js
index 3b96afd..6b6a326 100644 (file)
--- a/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/carIndicator.js
+++ b/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/carIndicator.js
@@ -88,6 +88,11 @@ var CarIndicator = function() {
        console.info("Starting up service CarIndicator");
 };
 
+if (typeof Zone !== 'function')
+{
+       window.Zone = function(){return undefined;};
+}
+
 function parseInteger(value) {
        "use strict";
        return parseInt(value, 10);
@@ -459,14 +464,14 @@ CarIndicator.prototype.addListener = function(aCallbackObject) {
                                        var zone = mapping.zone;
                                        var subscribeName = signal;
 
-                                       if (mapping.subscribeName !== undefined) {
+                                       if (mapping.subscribeName !== "undefined") {
                                                subscribeName = mapping.subscribeName;
                                        }
 
                                        if (mapping.callBackPropertyName.toLowerCase() === prop.toLowerCase() && !mapping.subscribeCount) {
-                                               mapping.subscribeCount = typeof (mapping.subscribeCount) === 'undefined' ? 0 : mapping.subscribeCount++;
+                                               mapping.subscribeCount = typeof (mapping.subscribeCount) === "undefined" ? 0 : mapping.subscribeCount++;
 
-                                               if (typeof (tizen) !== 'undefined' && tizen.vehicle !== undefined && tizen.vehicle[subscribeName] !== undefined) {
+                                               if (typeof (tizen.vehicle[subscribeName]) !== "undefined") {
                                                        if (!(subscribeName.toString().trim().toLowerCase() === "nightmode" && id === this._listenerIDs[0])) {
                                                                if (tizen.vehicle[subscribeName]){
                                                                        var setUpData = tizen.vehicle[subscribeName].get(zone);
@@ -474,13 +479,13 @@ CarIndicator.prototype.addListener = function(aCallbackObject) {
                                                                                self.onDataUpdate(setUpData, self, id);
                                                                }
                                                        }
-                                                       if (typeof (tizen.vehicle[subscribeName].subscribe) !== undefined)
+                                                       if (typeof (tizen.vehicle[subscribeName].subscribe) !== "undefined")
                                                        {
                                                                console.log("Modello: Subscribing to AMB signal - " + subscribeName);
                                                                tizen.vehicle[subscribeName].subscribe(subscribeCallback, zone);
                                                        }
                                                } else {
-                                                       if (tizen.vehicle[subscribeName] === undefined)
+                                                       if (typeof (tizen.vehicle[subscribeName]) === "undefined")
                                                                console.warn(subscribeName + " is not available to subscribe to");
                                                        else
                                                                console.warn("Tizen API is not available, cannot subscribe to signal", signal);