dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

exception check (for IE)

Browse Source
This commit is contained in:
Kim. GuWon 2017-03-17 15:06:53 +09:00 committed by Kwon, Yeong-Eon
parent 315757ff8e
commit 980fc6a5c6
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/src/app/api/datasource.service.js
View File

@ -546,7 +546,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic
var keyData = sourceData[keyName]; var keyData = sourceData[keyName];
var key = keyName + '_' + type; var key = keyName + '_' + type;
var dataKeyList = dataKeys[key]; var dataKeyList = dataKeys[key];
for (var keyIndex = 0; keyIndex < dataKeyList.length; keyIndex++) { for (var keyIndex = 0; dataKeyList && keyIndex < dataKeyList.length; keyIndex++) {
var datasourceKey = key + "_" + keyIndex; var datasourceKey = key + "_" + keyIndex;
if (datasourceData[datasourceKey].data) { if (datasourceData[datasourceKey].data) {
var dataKey = dataKeyList[keyIndex]; var dataKey = dataKeyList[keyIndex];
@ -595,6 +595,8 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic
datasourceData[datasourceKey].data = data; datasourceData[datasourceKey].data = data;
for (var i2 in listeners) { for (var i2 in listeners) {
var listener = listeners[i2]; var listener = listeners[i2];
if (angular.isFunction(listener))
continue;
listener.dataUpdated(datasourceData[datasourceKey], listener.dataUpdated(datasourceData[datasourceKey],
listener.datasourceIndex, listener.datasourceIndex,
dataKey.index, apply); dataKey.index, apply);
@ -605,4 +607,3 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic
} }
} }
} }

4
ui/src/app/api/user.service.js
View File

@ -158,6 +158,8 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, toas
function resolveRefreshTokenQueue(data) { function resolveRefreshTokenQueue(data) {
for (var q in refreshTokenQueue) { for (var q in refreshTokenQueue) {
if (isNaN(q))
continue;
refreshTokenQueue[q].resolve(data); refreshTokenQueue[q].resolve(data);
} }
refreshTokenQueue = []; refreshTokenQueue = [];
@ -165,6 +167,8 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, toas
function rejectRefreshTokenQueue(message) { function rejectRefreshTokenQueue(message) {
for (var q in refreshTokenQueue) { for (var q in refreshTokenQueue) {
if (isNaN(q))
continue;
refreshTokenQueue[q].reject(message); refreshTokenQueue[q].reject(message);
} }
refreshTokenQueue = []; refreshTokenQueue = [];

2
ui/src/app/api/widget.service.js
View File

@ -483,6 +483,8 @@ function WidgetService($rootScope, $http, $q, $filter, $ocLazyLoad, $window, typ
var fetchQueue = widgetsInfoFetchQueue[key]; var fetchQueue = widgetsInfoFetchQueue[key];
if (fetchQueue) { if (fetchQueue) {
for (var q in fetchQueue) { for (var q in fetchQueue) {
if (isNaN(q))
continue;
fetchQueue[q].resolve(widgetInfo); fetchQueue[q].resolve(widgetInfo);
} }
delete widgetsInfoFetchQueue[key]; delete widgetsInfoFetchQueue[key];

2
ui/src/app/components/widget.controller.js
View File

@ -807,6 +807,8 @@ export default function WidgetController($scope, $timeout, $window, $element, $q
var index = 0; var index = 0;
for (var i in widgetContext.datasources) { for (var i in widgetContext.datasources) {
var datasource = widgetContext.datasources[i]; var datasource = widgetContext.datasources[i];
if (angular.isFunction(datasource))
continue;
var deviceId = null; var deviceId = null;
if (datasource.type === types.datasourceType.device && datasource.deviceAliasId) { if (datasource.type === types.datasourceType.device && datasource.deviceAliasId) {
if (aliasesInfo.deviceAliases[datasource.deviceAliasId]) { if (aliasesInfo.deviceAliases[datasource.deviceAliasId]) {