From 0bdf246383e35eef8270555398515785eb38668c Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Fri, 24 Mar 2017 12:36:53 +0200 Subject: [PATCH] Fixed bug with dashboard editing. Add IE support. --- ui/src/app/api/data-aggregator.js | 8 ++--- ui/src/app/api/datasource.service.js | 10 +++---- ui/src/app/api/device.service.js | 6 ++-- ui/src/app/api/telemetry-websocket.service.js | 4 +-- ui/src/app/api/user.service.js | 10 ++----- ui/src/app/app.js | 2 ++ ui/src/app/components/dashboard.tpl.html | 1 - .../components/details-sidenav.directive.js | 2 +- ui/src/app/components/grid.tpl.html | 2 +- ui/src/app/components/widget.controller.js | 10 +++---- ui/src/app/dashboard/dashboard.tpl.html | 5 ++-- .../attribute/attribute-table.directive.js | 2 +- ui/src/app/ie.support.js | 29 +++++++++++++++++++ ui/src/app/layout/home.tpl.html | 4 +-- ui/src/app/widget/lib/flot-widget.js | 16 +++++----- ui/src/app/widget/lib/google-map.js | 2 +- ui/src/app/widget/lib/map-widget.js | 12 ++++---- ui/src/app/widget/widget-editor.controller.js | 4 +-- 18 files changed, 77 insertions(+), 52 deletions(-) create mode 100644 ui/src/app/ie.support.js diff --git a/ui/src/app/api/data-aggregator.js b/ui/src/app/api/data-aggregator.js index 01c23c8c4f..ec415369b9 100644 --- a/ui/src/app/api/data-aggregator.js +++ b/ui/src/app/api/data-aggregator.js @@ -20,7 +20,7 @@ export default class DataAggregator { this.onDataCb = onDataCb; this.tsKeyNames = tsKeyNames; this.dataBuffer = {}; - for (var k in tsKeyNames) { + for (var k = 0; k < tsKeyNames.length; k++) { this.dataBuffer[tsKeyNames[k]] = []; } this.startTs = startTs; @@ -143,7 +143,7 @@ export default class DataAggregator { } updateData() { - for (var k in this.tsKeyNames) { + for (var k = 0; k < this.tsKeyNames.length; k++) { this.dataBuffer[this.tsKeyNames[k]] = []; } for (var key in this.aggregationMap) { @@ -193,7 +193,7 @@ function processAggregatedData(data, isCount, noAggregation) { aggregationMap[key] = aggKeyData; } var keyData = data[key]; - for (var i in keyData) { + for (var i = 0; i < keyData.length; i++) { var kvPair = keyData[i]; var timestamp = kvPair[0]; var value = convertValue(kvPair[1], noAggregation); @@ -217,7 +217,7 @@ function updateAggregatedData(aggregationMap, isCount, noAggregation, aggFunctio aggregationMap[key] = aggKeyData; } var keyData = data[key]; - for (var i in keyData) { + for (var i = 0; i < keyData.length; i++) { var kvPair = keyData[i]; var timestamp = kvPair[0]; var value = convertValue(kvPair[1], noAggregation); diff --git a/ui/src/app/api/datasource.service.js b/ui/src/app/api/datasource.service.js index 2d561c8901..6041cbd946 100644 --- a/ui/src/app/api/datasource.service.js +++ b/ui/src/app/api/datasource.service.js @@ -44,7 +44,7 @@ function DatasourceService($timeout, $filter, $log, telemetryWebsocketService, t } var subscriptionDataKeys = []; - for (var d in datasource.dataKeys) { + for (var d = 0; d < datasource.dataKeys.length; d++) { var dataKey = datasource.dataKeys[d]; var subscriptionDataKey = { name: dataKey.name, @@ -295,7 +295,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic } subscriber.onReconnected = function() { var newSubsTw = null; - for (var i2 in listeners) { + for (var i2 = 0; i2 < listeners.length; i2++) { var listener = listeners[i2]; if (!newSubsTw) { newSubsTw = listener.updateRealtimeSubscription(); @@ -454,7 +454,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic var value = dataKey.func(time, prevSeries[1]); series.push(value); datasourceData[dataKey.key].data = [series]; - for (var i in listeners) { + for (var i = 0; i < listeners.length; i++) { var listener = listeners[i]; listener.dataUpdated(datasourceData[dataKey.key], listener.datasourceIndex, @@ -566,7 +566,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic } if (datasourceSubscription.type === types.widgetType.timeseries.value) { var series, time, value; - for (var i in keyData) { + for (var i = 0; i < keyData.length; i++) { series = keyData[i]; time = series[0]; value = convertValue(series[1]); @@ -593,7 +593,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic } if (update) { datasourceData[datasourceKey].data = data; - for (var i2 in listeners) { + for (var i2 = 0; i2 < listeners.length; i2++) { var listener = listeners[i2]; if (angular.isFunction(listener)) continue; diff --git a/ui/src/app/api/device.service.js b/ui/src/app/api/device.service.js index 60ccad3ea7..2c4a100ec4 100644 --- a/ui/src/app/api/device.service.js +++ b/ui/src/app/api/device.service.js @@ -160,7 +160,7 @@ function DeviceService($http, $q, $filter, userService, telemetryWebsocketServic function devicesToDevicesInfo(devices) { var devicesInfo = []; - for (var d in devices) { + for (var d = 0; d < devices.length; d++) { devicesInfo.push(deviceToDeviceInfo(devices[d])); } return devicesInfo; @@ -376,7 +376,7 @@ function DeviceService($http, $q, $filter, userService, telemetryWebsocketServic if (query) { var dataKeys = response.data; var lowercaseQuery = angular.lowercase(query); - for (var i in dataKeys) { + for (var i=0; i
    -
  • widget.select-widgets-bundle
    -
    diff --git a/ui/src/app/device/attribute/attribute-table.directive.js b/ui/src/app/device/attribute/attribute-table.directive.js index 954242e3fb..560a4dc10f 100644 --- a/ui/src/app/device/attribute/attribute-table.directive.js +++ b/ui/src/app/device/attribute/attribute-table.directive.js @@ -275,7 +275,7 @@ export default function AttributeTableDirective($compile, $templateCache, $rootS dataKeys: [] } var i = 0; - for (var attr in scope.selectedAttributes) { + for (var attr =0; attr < scope.selectedAttributes.length;attr++) { var attribute = scope.selectedAttributes[attr]; var dataKey = { name: attribute.key, diff --git a/ui/src/app/ie.support.js b/ui/src/app/ie.support.js new file mode 100644 index 0000000000..f540a303c2 --- /dev/null +++ b/ui/src/app/ie.support.js @@ -0,0 +1,29 @@ +/* + * Copyright © 2016-2017 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +(function () { + if (!String.prototype.startsWith) { + String.prototype.startsWith = function(searchString, position) { + position = position || 0; + return this.indexOf(searchString, position) === position; + }; + } + if (!String.prototype.endsWith) { + String.prototype.endsWith = function (suffix) { + return this.indexOf(suffix, this.length - suffix.length) !== -1; + }; + } +})(); \ No newline at end of file diff --git a/ui/src/app/layout/home.tpl.html b/ui/src/app/layout/home.tpl.html index c259b2fe05..31c8e7fad9 100644 --- a/ui/src/app/layout/home.tpl.html +++ b/ui/src/app/layout/home.tpl.html @@ -25,8 +25,8 @@ md-is-locked-open="vm.isLockSidenav" layout="column">
    - -
    + +
    diff --git a/ui/src/app/widget/lib/flot-widget.js b/ui/src/app/widget/lib/flot-widget.js index 6f8530f914..446881de8b 100644 --- a/ui/src/app/widget/lib/flot-widget.js +++ b/ui/src/app/widget/lib/flot-widget.js @@ -33,7 +33,7 @@ export default class TbFlot { this.chartType = chartType || 'line'; var colors = []; - for (var i in ctx.data) { + for (var i = 0; i < ctx.data.length; i++) { var series = ctx.data[i]; colors.push(series.dataKey.color); var keySettings = series.dataKey.settings; @@ -61,7 +61,7 @@ export default class TbFlot { } ctx.tooltip = $('#flot-series-tooltip'); if (ctx.tooltip.length === 0) { - ctx.tooltip = $("
    "); + ctx.tooltip = $("
    "); ctx.tooltip.css({ fontSize: "12px", fontFamily: "Roboto", @@ -85,7 +85,7 @@ export default class TbFlot { divElement.css({ display: "flex", alignItems: "center", - justifyContent: "center" + justifyContent: "flex-start" }); var lineSpan = $(''); lineSpan.css({ @@ -147,7 +147,7 @@ export default class TbFlot { fontWeight: "700" }); content += dateDiv.prop('outerHTML'); - for (var i in hoverInfo.seriesHover) { + for (var i = 0; i < hoverInfo.seriesHover.length; i++) { var seriesHoverInfo = hoverInfo.seriesHover[i]; if (tbFlot.ctx.tooltipIndividual && seriesHoverInfo.index !== seriesIndex) { continue; @@ -333,7 +333,7 @@ export default class TbFlot { this.ctx.pieData = angular.copy(this.ctx.data); this.ctx.pieRenderedData = []; this.ctx.pieTargetData = []; - for (i in this.ctx.data) { + for (i = 0; i < this.ctx.data.length; i++) { this.ctx.pieTargetData[i] = (this.ctx.data[i].data && this.ctx.data[i].data[0]) ? this.ctx.data[i].data[0][1] : 0; } @@ -929,7 +929,7 @@ export default class TbFlot { } pieDataRendered() { - for (var i in this.ctx.pieTargetData) { + for (var i = 0; i < this.ctx.pieTargetData.length; i++) { var value = this.ctx.pieTargetData[i] ? this.ctx.pieTargetData[i] : 0; this.ctx.pieRenderedData[i] = value; if (!this.ctx.pieData[i].data[0]) { @@ -943,7 +943,7 @@ export default class TbFlot { if (start) { this.finishPieDataAnimation(); this.ctx.pieAnimationStartTime = this.ctx.pieAnimationLastTime = Date.now(); - for (var i in this.ctx.data) { + for (var i = 0; i < this.ctx.data.length; i++) { this.ctx.pieTargetData[i] = (this.ctx.data[i].data && this.ctx.data[i].data[0]) ? this.ctx.data[i].data[0][1] : 0; } @@ -968,7 +968,7 @@ export default class TbFlot { this.finishPieDataAnimation(); } else { if (elapsed >= 40) { - for (var i in this.ctx.pieTargetData) { + for (var i = 0; i < this.ctx.pieTargetData.length; i++) { var prevValue = this.ctx.pieRenderedData[i]; var targetValue = this.ctx.pieTargetData[i]; var value = prevValue + (targetValue - prevValue) * progress; diff --git a/ui/src/app/widget/lib/google-map.js b/ui/src/app/widget/lib/google-map.js index ef9d61b4d2..9722839541 100644 --- a/ui/src/app/widget/lib/google-map.js +++ b/ui/src/app/widget/lib/google-map.js @@ -91,7 +91,7 @@ export default class TbGoogleMap { function success() { gmGlobals.gmApiKeys[tbMap.apiKey].loaded = true; initGoogleMap(); - for (var p in gmGlobals.gmApiKeys[tbMap.apiKey].pendingInits) { + for (var p = 0; p < gmGlobals.gmApiKeys[tbMap.apiKey].pendingInits.length; p++) { var pendingInit = gmGlobals.gmApiKeys[tbMap.apiKey].pendingInits[p]; pendingInit(); } diff --git a/ui/src/app/widget/lib/map-widget.js b/ui/src/app/widget/lib/map-widget.js index fdb7f1192b..be7b118f8c 100644 --- a/ui/src/app/widget/lib/map-widget.js +++ b/ui/src/app/widget/lib/map-widget.js @@ -364,7 +364,7 @@ export default class TbMapWidget { var bounds = tbMap.map.createBounds(); tbMap.locations = []; var dataMap = toLabelValueMap(data); - for (var l in tbMap.locationsSettings) { + for (var l=0; l < tbMap.locationsSettings.length; l++) { var locationSettings = tbMap.locationsSettings[l]; var latIndex = -1; var lngIndex = -1; @@ -398,7 +398,7 @@ export default class TbMapWidget { var locationsChanged = false; var bounds = tbMap.map.createBounds(); var dataMap = toLabelValueMap(data); - for (var p in tbMap.locations) { + for (var p = 0; p < tbMap.locations.length; p++) { var location = tbMap.locations[p]; locationsChanged |= updateLocation(location, data, dataMap); if (location.polyline) { @@ -421,11 +421,11 @@ export default class TbMapWidget { } } var tooltips = this.map.getTooltips(); - for (var t in tooltips) { + for (var t=0; t < tooltips.length; t++) { var tooltip = tooltips[t]; var text = tooltip.pattern; var replaceInfo = tooltip.replaceInfo; - for (var v in replaceInfo.variables) { + for (var v = 0; v < replaceInfo.variables.length; v++) { var variableInfo = replaceInfo.variables[v]; var txtVal = ''; if (variableInfo.dataKeyIndex > -1) { @@ -451,11 +451,11 @@ export default class TbMapWidget { this.map.invalidateSize(); if (this.locations && this.locations.size > 0) { var bounds = this.map.createBounds(); - for (var m in this.markers) { + for (var m = 0; m < this.markers.length; m++) { this.map.extendBoundsWithMarker(bounds, this.markers[m]); } if (this.polylines) { - for (var p in this.polylines) { + for (var p = 0; p < this.polylines.length; p++) { this.map.extendBounds(bounds, this.polylines[p]); } } diff --git a/ui/src/app/widget/widget-editor.controller.js b/ui/src/app/widget/widget-editor.controller.js index f51043525a..24f8fc7182 100644 --- a/ui/src/app/widget/widget-editor.controller.js +++ b/ui/src/app/widget/widget-editor.controller.js @@ -343,7 +343,7 @@ export default function WidgetEditorController(widgetService, userService, types } }; } - for (var i in config.datasources) { + for (var i = 0; i < config.datasources.length; i++) { var datasource = config.datasources[i]; datasource.type = vm.widget.type; if (vm.widget.type !== types.widgetType.timeseries.value && datasource.intervalSec) { @@ -455,7 +455,7 @@ export default function WidgetEditorController(widgetService, userService, types } function onDividerDrag() { - for (var i in ace_editors) { + for (var i = 0; i < ace_editors.length; i++) { var ace = ace_editors[i]; ace.resize(); ace.renderer.updateFull();