Commit 98e8340885efef33b60f93a13f4e20ac8d34406d

Authored by Andrew Shvayka
Committed by GitHub
2 parents b502a195 980fc6a5

Merge pull request #84 from OutOfBedlam/PR/compat_ie

exception check (for IE)
@@ -546,7 +546,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic @@ -546,7 +546,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic
546 var keyData = sourceData[keyName]; 546 var keyData = sourceData[keyName];
547 var key = keyName + '_' + type; 547 var key = keyName + '_' + type;
548 var dataKeyList = dataKeys[key]; 548 var dataKeyList = dataKeys[key];
549 - for (var keyIndex = 0; keyIndex < dataKeyList.length; keyIndex++) { 549 + for (var keyIndex = 0; dataKeyList && keyIndex < dataKeyList.length; keyIndex++) {
550 var datasourceKey = key + "_" + keyIndex; 550 var datasourceKey = key + "_" + keyIndex;
551 if (datasourceData[datasourceKey].data) { 551 if (datasourceData[datasourceKey].data) {
552 var dataKey = dataKeyList[keyIndex]; 552 var dataKey = dataKeyList[keyIndex];
@@ -595,6 +595,8 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic @@ -595,6 +595,8 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic
595 datasourceData[datasourceKey].data = data; 595 datasourceData[datasourceKey].data = data;
596 for (var i2 in listeners) { 596 for (var i2 in listeners) {
597 var listener = listeners[i2]; 597 var listener = listeners[i2];
  598 + if (angular.isFunction(listener))
  599 + continue;
598 listener.dataUpdated(datasourceData[datasourceKey], 600 listener.dataUpdated(datasourceData[datasourceKey],
599 listener.datasourceIndex, 601 listener.datasourceIndex,
600 dataKey.index, apply); 602 dataKey.index, apply);
@@ -605,4 +607,3 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic @@ -605,4 +607,3 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic
605 } 607 }
606 } 608 }
607 } 609 }
608 -  
@@ -158,6 +158,8 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, toas @@ -158,6 +158,8 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, toas
158 158
159 function resolveRefreshTokenQueue(data) { 159 function resolveRefreshTokenQueue(data) {
160 for (var q in refreshTokenQueue) { 160 for (var q in refreshTokenQueue) {
  161 + if (isNaN(q))
  162 + continue;
161 refreshTokenQueue[q].resolve(data); 163 refreshTokenQueue[q].resolve(data);
162 } 164 }
163 refreshTokenQueue = []; 165 refreshTokenQueue = [];
@@ -165,6 +167,8 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, toas @@ -165,6 +167,8 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, toas
165 167
166 function rejectRefreshTokenQueue(message) { 168 function rejectRefreshTokenQueue(message) {
167 for (var q in refreshTokenQueue) { 169 for (var q in refreshTokenQueue) {
  170 + if (isNaN(q))
  171 + continue;
168 refreshTokenQueue[q].reject(message); 172 refreshTokenQueue[q].reject(message);
169 } 173 }
170 refreshTokenQueue = []; 174 refreshTokenQueue = [];
@@ -483,6 +483,8 @@ function WidgetService($rootScope, $http, $q, $filter, $ocLazyLoad, $window, typ @@ -483,6 +483,8 @@ function WidgetService($rootScope, $http, $q, $filter, $ocLazyLoad, $window, typ
483 var fetchQueue = widgetsInfoFetchQueue[key]; 483 var fetchQueue = widgetsInfoFetchQueue[key];
484 if (fetchQueue) { 484 if (fetchQueue) {
485 for (var q in fetchQueue) { 485 for (var q in fetchQueue) {
  486 + if (isNaN(q))
  487 + continue;
486 fetchQueue[q].resolve(widgetInfo); 488 fetchQueue[q].resolve(widgetInfo);
487 } 489 }
488 delete widgetsInfoFetchQueue[key]; 490 delete widgetsInfoFetchQueue[key];
@@ -807,6 +807,8 @@ export default function WidgetController($scope, $timeout, $window, $element, $q @@ -807,6 +807,8 @@ export default function WidgetController($scope, $timeout, $window, $element, $q
807 var index = 0; 807 var index = 0;
808 for (var i in widgetContext.datasources) { 808 for (var i in widgetContext.datasources) {
809 var datasource = widgetContext.datasources[i]; 809 var datasource = widgetContext.datasources[i];
  810 + if (angular.isFunction(datasource))
  811 + continue;
810 var deviceId = null; 812 var deviceId = null;
811 if (datasource.type === types.datasourceType.device && datasource.deviceAliasId) { 813 if (datasource.type === types.datasourceType.device && datasource.deviceAliasId) {
812 if (aliasesInfo.deviceAliases[datasource.deviceAliasId]) { 814 if (aliasesInfo.deviceAliases[datasource.deviceAliasId]) {