grassrootseconomics/ethstats-server
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #133 from cubedro/develop

Browse Source 
Fixed pinned bug when reconnecting node
This commit is contained in:
Marian OANCΞA 2015-05-19 03:16:54 +03:00
commit 2f74766a76
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/js/netstats.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/netstats.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

13
public/js/controllers.js
View File

@ -135,6 +135,9 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, socket, _, toastr)
else else
toastr['info']("Node "+ $scope.nodes[findIndex({id: data.id})].info.name +" reconnected!", "Node is back!"); toastr['info']("Node "+ $scope.nodes[findIndex({id: data.id})].info.name +" reconnected!", "Node is back!");
$scope.$apply();
makePeerPropagationChart($scope.nodes[findIndex({id: data.id})]);
break; break;
case "update": case "update":
@ -168,6 +171,9 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, socket, _, toastr)
case "info": case "info":
$scope.nodes[findIndex({id: data.id})].info = data.info; $scope.nodes[findIndex({id: data.id})].info = data.info;
if(_.isUndefined($scope.nodes[findIndex({id: data.id})].pinned))
$scope.nodes[findIndex({id: data.id})].pinned = false;
break; break;
case "blockPropagationChart": case "blockPropagationChart":
@ -294,8 +300,13 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, socket, _, toastr)
return true; return true;
} }
if( !_.isUndefined($scope.nodes[index].pinned)) {
data.pinned = $scope.nodes[index].pinned
} else {
data.pinned = false;
}
$scope.nodes[index] = data; $scope.nodes[index] = data;
makePeerPropagationChart($scope.nodes[index]);
return false; return false;
} }