Skip to content

Upgrade to d3.js 7.9.0 #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jelly wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade to d3.js 7.9.0 #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion main/templatetags/cdn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def jquery_tablesorter():

@register.simple_tag
def d3js():
version = '3.5.0'
version = '7.9.0'
filename = f'd3-{version}.min.js'
link = staticfiles_storage.url(filename)
return format_html('<script type="text/javascript" src="{link}"></script>', link=link)
Expand Down
16 changes: 8 additions & 8 deletions mirrors/static/mirror_status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function draw_graphs(location_url, log_url, container_id) {
log_data = data[1].value;

/* use the same color selection for a given URL in every graph */
const color = d3.scale.category10();
const color = d3.scaleOrdinal(d3.schemeCategory10);

for (const [_key, value] of Object.entries(loc_data.locations)) {
mirror_status(container_id, value, log_data, color);
Expand All @@ -28,10 +28,10 @@ function mirror_status(container_id, check_loc, log_data, color) {
const width = rects.width - margin.left - margin.right;
const height = rects.height - margin.top - margin.bottom;

const x = d3.time.scale.utc().range([0, width]);
const y = d3.scale.linear().range([height, 0]);
const x_axis = d3.svg.axis().scale(x).orient("bottom");
const y_axis = d3.svg.axis().scale(y).orient("left");
const x = d3.scaleUtc().range([0, width]);
const y = d3.scaleLinear().range([height, 0]);
const x_axis = d3.axisBottom(x);
const y_axis = d3.axisLeft(y);

/* remove any existing graph first if we are redrawing after resize */
d3.select(chart_id).select("svg").remove();
Expand All @@ -44,7 +44,7 @@ function mirror_status(container_id, check_loc, log_data, color) {
x.domain([
d3.min(data, function(c) { return d3.min(c.logs, function(v) { return v.check_time; }); }),
d3.max(data, function(c) { return d3.max(c.logs, function(v) { return v.check_time; }); })
]).nice(d3.time.hour);
]).nice(d3.timeHour);
y.domain([
0,
d3.max(data, function(c) { return d3.max(c.logs, function(v) { return v.duration; }); })
Expand Down Expand Up @@ -73,8 +73,8 @@ function mirror_status(container_id, check_loc, log_data, color) {
.style("text-anchor", "end")
.text("Duration (seconds)");

const line = d3.svg.line()
.interpolate("basis")
const line = d3.line()
.curve(d3.curveBasis)
.x(function(d) { return x(d.check_time); })
.y(function(d) { return y(d.duration); });

Expand Down
Loading
Loading