X-Git-Url: https://nos-oignons.net/gitweb/website.git/blobdiff_plain/9355bff4da880bbe76c415c3cf830157b1517172..b4bc57a321ff09d627a481d53354a24cca9db587:/assets/pie_graphs.js diff --git a/assets/pie_graphs.js b/assets/pie_graphs.js index 4fb9f51..5349961 100644 --- a/assets/pie_graphs.js +++ b/assets/pie_graphs.js @@ -37,33 +37,34 @@ PieDrawer.prototype.draw = function() { .text(L10n.loading); var field_getter = this.getField; - d3.json(PieDrawer.onionoo_url + "&fields=fingerprint," + this.getFieldName(), function(error, raw_data) { - var frac_nos_oignons = 0; - raw_data['relays'].forEach(function(d) { - nos_oignons_relays.forEach(function(r) { - if (r.fingerprint == d.fingerprint) { - var value = field_getter(d); - if (value) { - frac_nos_oignons += value; + d3.json(PieDrawer.onionoo_url + "&fields=fingerprint," + this.getFieldName()) + .then(function(raw_data) { + var frac_nos_oignons = 0; + raw_data['relays'].forEach(function(d) { + nos_oignons_relays.forEach(function(r) { + if (r.fingerprint == d.fingerprint) { + var value = field_getter(d); + if (value) { + frac_nos_oignons += value; + } } - } + }); }); - }); - var frac_others = 1 - frac_nos_oignons; + var frac_others = 1 - frac_nos_oignons; - data = [ { name: L10n.nos_oignons, frac: frac_nos_oignons, color: PieDrawer.color_nos_oignons, }, - { name: L10n.others, frac: frac_others, color: PieDrawer.color_others }, ]; + data = [ { name: L10n.nos_oignons, frac: frac_nos_oignons, color: PieDrawer.color_nos_oignons, }, + { name: L10n.others, frac: frac_others, color: PieDrawer.color_others }, ]; - text.text(PieDrawer.formatPercent(data[0].frac)); + text.text(PieDrawer.formatPercent(data[0].frac)); - var g = svg.selectAll(".arc") - .data(PieDrawer.pie(data)) - .enter().append("g") - .attr("class", "arc"); + var g = svg.selectAll(".arc") + .data(PieDrawer.pie(data)) + .enter().append("g") + .attr("class", "arc"); - g.append("path") - .attr("d", PieDrawer.arc) - .style("fill", function(d) { return d.data.color; }); + g.append("path") + .attr("d", PieDrawer.arc) + .style("fill", function(d) { return d.data.color; }); }); }