actualite lunar est parti - trad - corr

[website.git] / assets / bw_graphs.js

diff --git a/assets/bw_graphs.js b/assets/bw_graphs.js
index b9c3d9df5b54ba2ba1c66054e38209170837ea44..80e8cd0239e7cfbcdeeeb0f4257394832adf6224 100644 (file)
--- a/assets/bw_graphs.js
+++ b/assets/bw_graphs.js
@@ -38,8 +38,7 @@ BwDrawer.write_stack = d3.layout.stack()
 BwDrawer.onionoo_url = "https://onionoo.torproject.org/bandwidth?type=relay&contact=adminsys@nos-oignons.net";
 
 BwDrawer.periods = [
-    { id: "1_month", label: L10n.t_1_month },
-    { id: "3_months", label: L10n.t_3_months },
+    { id: "6_months", label: L10n.t_6_months },
     { id: "1_year", label: L10n.t_1_year },
     { id: "5_years", label: L10n.t_5_years },
   ];
@@ -63,12 +62,11 @@ BwDrawer.color.range(nos_oignons_relays.map(function(r) {return r.color}));
 
 BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
   // Purge non running relays
-  raw_data.relays.forEach(function(r, i) {
-    if (typeof r.read_history === 'undefined' || typeof r.write_history === 'undefined') {
-      raw_data.relays.splice(i, 1);
-    }
+  raw_data.relays = raw_data.relays.filter(function(r) {
+    return typeof r.read_history !== 'undefined' && typeof r.write_history !== 'undefined';
   });
 
+
   var update_period;
 
   var svg = d3.select(selector).append("svg")
@@ -85,10 +83,10 @@ BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
     var radio = div.append("input")
       .attr("type", "radio")
       .attr("name", "period")
-      .attr("id", "period_" + p.id)
+      .attr("id", "bw_period_" + p.id)
       .on("click", function() { update_period(p.id); });
     div.append("label")
-      .attr("for", "period_" + p.id)
+      .attr("for", "bw_period_" + p.id)
       .text(p.label);
     if (p.id == BwDrawer.periods[0].id) {
       radio.attr("checked", true);