diff --git a/src/app/topology/topology.js b/src/app/topology/topology.js index 200d3a8..421fdb6 100644 --- a/src/app/topology/topology.js +++ b/src/app/topology/topology.js @@ -29,15 +29,17 @@ angular.module('ripplecharts.topology', [ var t = new Topology($http) var m = new TopologyMap($http) - function versionToColor(stable, version) { - var v = version.split('-')[1] - var s = stable ? stable.split('-')[0] : '' - var comp = v && s ? $scope.semverCompare(v, s) : '' + function versionToColor(d) { + var version = d.replace('rippled-', '') + var comp - if (!v || !stable) { + if (!$scope.stable || !$scope.semverCompare) { return 'grey' + } + + comp = $scope.semverCompare(version, $scope.stable) - } else if (comp === -1) { + if (comp === -1) { return '#c11' } else if (comp === 1) { @@ -51,12 +53,12 @@ angular.module('ripplecharts.topology', [ function updateVersionColors() { if ($scope.nodes) { $scope.nodes.forEach(function(d) { - d.new.version_color = versionToColor($scope.stable, d.new.version) + d.new.version_color = versionToColor(d.new.version) }) } - t.color(versionToColor.bind(t, $scope.stable)) - m.color(versionToColor.bind(m, $scope.stable)) + t.color(versionToColor) + m.color(versionToColor) } function updateVersionGraph(nodes) { @@ -192,7 +194,7 @@ angular.module('ripplecharts.topology', [ ]) t.update(data) t.weight(store.get('weight-mode')) - t.color(versionToColor.bind(m, $scope.stable)) + t.color(versionToColor) } else { console.log('no nodes') @@ -217,7 +219,7 @@ angular.module('ripplecharts.topology', [ m.populate(data.nodes) m.weight(store.get('weight-mode')) - m.color(versionToColor.bind(m, $scope.stable)) + m.color(versionToColor) }).catch(function(e) { console.log(e) @@ -240,6 +242,8 @@ angular.module('ripplecharts.topology', [ fetchAndShowTable(true) fetchAndShowMap(true) + $scope.color = versionToColor + // click to toggle between charts $('.switch-input').click(function() { $('.first').fadeOut(500, function() { diff --git a/src/common/versionsGraph.js b/src/common/versionsGraph.js index 12097ff..92ce24a 100644 --- a/src/common/versionsGraph.js +++ b/src/common/versionsGraph.js @@ -81,25 +81,7 @@ angular.module('versionsGraph', []) tooltip.append('div') .attr('class', 'uptime') - function versionToColor(version) { - var comp - - if (!$scope.stable || !$scope.semverCompare) { - return 'grey' - } - - comp = $scope.semverCompare(version, $scope.stable) - - if (comp === -1) { - return '#c11' - - } else if (comp === 1) { - return '#36c' - - } else { - return '#3a3' - } - } + var versionToColor = $scope.color || function() {} function hideTooltip() { tooltip.transition()