diff --git a/platform/features/scrolling/res/templates/scrolling.html b/platform/features/scrolling/res/templates/scrolling.html index 2d5d19fabc..629c3472cd 100644 --- a/platform/features/scrolling/res/templates/scrolling.html +++ b/platform/features/scrolling/res/templates/scrolling.html @@ -38,8 +38,9 @@ - - {{cell}} + + {{cell.text}} diff --git a/platform/features/scrolling/src/DomainColumn.js b/platform/features/scrolling/src/DomainColumn.js index 95a6222553..27d6d583a3 100644 --- a/platform/features/scrolling/src/DomainColumn.js +++ b/platform/features/scrolling/src/DomainColumn.js @@ -55,9 +55,11 @@ define( * @returns {string} the text to display */ getValue: function (domainObject, data, index) { - return telemetryFormatter.formatDomainValue( - data.getDomainValue(index, domainMetadata.key) - ); + return { + text: telemetryFormatter.formatDomainValue( + data.getDomainValue(index, domainMetadata.key) + ) + }; } }; } diff --git a/platform/features/scrolling/src/NameColumn.js b/platform/features/scrolling/src/NameColumn.js index 59b172428a..6420c44439 100644 --- a/platform/features/scrolling/src/NameColumn.js +++ b/platform/features/scrolling/src/NameColumn.js @@ -50,7 +50,9 @@ define( * @returns {string} the text to display */ getValue: function (domainObject) { - return domainObject.getModel().name; + return { + text: domainObject.getModel().name + }; } }; } diff --git a/platform/features/scrolling/src/RangeColumn.js b/platform/features/scrolling/src/RangeColumn.js index 9180b2e2a9..f8b39bd2af 100644 --- a/platform/features/scrolling/src/RangeColumn.js +++ b/platform/features/scrolling/src/RangeColumn.js @@ -58,13 +58,11 @@ define( var range = rangeMetadata.key, limit = domainObject.getCapability('limit'), value = data.getRangeValue(index, range), - cell = telemetryFormatter.formatRangeValue(value); + alarm = limit.evaluate(value, range); return { - cssClass: limit && limit.evaluate(value, range), - toString: function () { - return cell; - } + cssClass: alarm && alarm.cssClass, + text: telemetryFormatter.formatRangeValue(value) }; } }; diff --git a/platform/features/scrolling/src/ScrollingListPopulator.js b/platform/features/scrolling/src/ScrollingListPopulator.js index 982615d2d6..466a2ad27d 100644 --- a/platform/features/scrolling/src/ScrollingListPopulator.js +++ b/platform/features/scrolling/src/ScrollingListPopulator.js @@ -142,7 +142,7 @@ define( // column object itself) return values.map(function (value) { return columns.map(function (column) { - column.getValue( + return column.getValue( objects[value.objectIndex], datas[value.objectIndex], value.pointIndex