Update Modello Common libraries; version up

Change-Id: I25499245b7e5102a15676471ed157a0504dbd6d1
Signed-off-by: Dongxing Liu <dongxing.x.liu@intel.com>

diff --git a/package/changelog b/package/changelog
index 39d29d5..7ee461f 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 3.0.20
+- Update Modello Common libraries
+== Dongxing Liu <dongxing.x.liu@intel.com> 2014-07-03
+
 * 3.0.19
 - Updated help documentation of Vehicle API
 == Wenchao Wang <wenchao.wang@intel.com> 2014-06-20

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index ff6af95..eb6f371 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:3.0.19
+Version:3.0.20
 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/js/services/carIndicator.js b/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/carIndicator.js
index 0aa50ab..c30504a 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
@@ -466,10 +466,13 @@ CarIndicator.prototype.addListener = function(aCallbackObject) {
                                        if (mapping.callBackPropertyName.toLowerCase() === prop.toLowerCase() && !mapping.subscribeCount) {
                                                mapping.subscribeCount = typeof (mapping.subscribeCount) === 'undefined' ? 0 : mapping.subscribeCount++;
 
-                                               if (typeof (tizen) !== 'undefined') {
+                                               if (typeof (tizen) !== 'undefined' && tizen.vehicle !== undefined && tizen.vehicle[subscribeName] !== undefined) {
                                                        if (!(subscribeName.toString().trim().toLowerCase() === "nightmode" && id === this._listenerIDs[0])) {
-                                                               var setUpData = tizen.vehicle[subscribeName].get(zone);
-                                                               self.onDataUpdate(setUpData, self, id);
+                                                               if (tizen.vehicle[subscribeName]){
+                                                                       var setUpData = tizen.vehicle[subscribeName].get(zone);
+                                                                       if (setUpData !== undefined)
+                                                                               self.onDataUpdate(setUpData, self, id);
+                                                               }
                                                        }
                                                        tizen.vehicle[subscribeName].subscribe(subscribeCallback, zone);
                                                } else {
@@ -493,7 +496,10 @@ CarIndicator.prototype.addListener = function(aCallbackObject) {
 CarIndicator.prototype.onDataUpdate = function(data, self, lisenersID) {
        "use strict";
        if (data !== undefined) {
-               var zone = data.zone.toString(2);
+               if (data.zone !== undefined)
+                       var zone = data.zone.toString(2);
+               else
+                       var zone = "0";
                var mapping;
 
                for ( var property in data) {