From 7553f1e614b3593cd531a4f01e212b2d7344e0b0 Mon Sep 17 00:00:00 2001 From: Brian Jones Date: Mon, 20 Oct 2014 16:35:42 -0700 Subject: [PATCH] Fix for TC-1777. Makes sure to check the interface as well as attribute name Change-Id: Ib863365b316c1910f21c50f1bb9b975f6a40f490 --- js/services/carIndicator.js | 7 ++++--- packaging/modello-common.changes | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/js/services/carIndicator.js b/js/services/carIndicator.js index 2b3a84d..6e9b07c 100644 --- a/js/services/carIndicator.js +++ b/js/services/carIndicator.js @@ -525,10 +525,11 @@ CarIndicator.prototype.onDataUpdate = function(data, self, lisenersID) { for ( var property in data) { if (data.hasOwnProperty(property)) { mapping = undefined; - if (property !== "time" && property !== "zone" && property.search("Sequence") === -1) { + if (property !== "time" && property !== "zone" && property !== "interfaceName" && property.search("Sequence") === -1) { for ( var element in self._mappingTable) { - if (self._mappingTable.hasOwnProperty(element)) { - if (self._mappingTable[element].attributeName.toLowerCase() === property.toLowerCase()) { + if (self._mappingTable.hasOwnProperty(element) && self._mappingTable[element].interfaceName !== undefined) { + if (self._mappingTable[element].interfaceName.toLowerCase() === data.interfaceName.toLowerCase() && + self._mappingTable[element].attributeName.toLowerCase() === property.toLowerCase()) { /* jshint bitwise: false */ if (!(zone ^ self._mappingTable[element].zone)) { /* jshint bitwise: true */ diff --git a/packaging/modello-common.changes b/packaging/modello-common.changes index 4fa8f2b..6adb4ab 100644 --- a/packaging/modello-common.changes +++ b/packaging/modello-common.changes @@ -1,3 +1,6 @@ +* Mon Oct 20 2014 Brian Jones submit/tizen_ivi/20141016.183406-1-g64442e3 +- Fix for TC-1777. Makes sure to check the interface as well as attribute name + * Thu Oct 16 2014 Brian Jones submit/tizen_ivi/20141016.164956-1-g9a44462 - Removing zones for now, plus a AMB subscribe fix -- 2.7.4