Merge pull request #27 from cubedro/develop

fixed arrival updating to NaN
10 years ago · ce3022d06a
parent 6e654a9b11 51ab249429
commit ce3022d06a
1 changed files with 6 additions and 2 deletions
--- a/public/js/controllers.js
+++ b/public/js/controllers.js
@ -69,8 +69,12 @@ function StatsCtrl($scope, $filter, socket, _, toastr) {
 				break;

 			case "update":
-				if(typeof $scope.nodes[findIndex({id: data.id})].stats !== 'undefined' && typeof $scope.nodes[findIndex({id: data.id})].stats.block !== 'undefined' && $scope.nodes[findIndex({id: data.id})].stats.block.number != data.stats.block.number){
-					data.stats.block.when = (new Date()).getTime() - data.stats.block.arrival;
+				if(typeof $scope.nodes[findIndex({id: data.id})].stats !== 'undefined' && typeof $scope.nodes[findIndex({id: data.id})].stats.block !== 'undefined'){
+					if($scope.nodes[findIndex({id: data.id})].stats.block.number != data.stats.block.number){
+						data.stats.block.when = (new Date()).getTime() - data.stats.block.arrival;
+					} else {
+						data.stats.block.when = $scope.nodes[findIndex({id: data.id})].stats.block.when;
+					}
 				}
 				$scope.nodes[findIndex({id: data.id})].stats = data.stats;
 				break;