status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2251 from hashicorp/b-tomography-js-error 

Fixes JS exception when there are no coordinates present.
This commit is contained in:
James Phillips 2016-08-08 17:39:09 -07:00 committed by GitHub
parent 161c7b993c f23786cd5a
commit 3a21d4b48d
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
command/agent/bindata_assetfs.go
View File

File diff suppressed because one or more lines are too long

7
ui/javascripts/app/routes.js
View File

@ -311,12 +311,19 @@ App.NodesShowRoute = App.BaseRoute.extend({
var n = distances.length; var n = distances.length;
var halfN = Math.floor(n / 2); var halfN = Math.floor(n / 2);
var median; var median;
if (n > 0) {
if (n % 2) { if (n % 2) {
// odd // odd
median = distances[halfN].distance; median = distances[halfN].distance;
} else { } else {
median = (distances[halfN - 1].distance + distances[halfN].distance) / 2; median = (distances[halfN - 1].distance + distances[halfN].distance) / 2;
} }
} else {
median = 0;
min = 0;
max = 0;
}
// Return a promise hash of the node and nodes // Return a promise hash of the node and nodes
return Ember.RSVP.hash({ return Ember.RSVP.hash({