Skip to content
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

Jump to bottom

Upgrade to d3 5.x #629

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Upgrade to d3 5.x #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73c066f
upgrade to d3 5.x
cesine Mar 30, 2020
4a6d35a
two more vendor refs
cesine Mar 30, 2020
4c11d6a
d3.scale.linear -> d3.scaleLinear
cesine Mar 30, 2020
373ea6f
flatten d3 modules
cesine Mar 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/ajax.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/graph.css">
<link type="text/css" rel="stylesheet" href="css/lines.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/angular.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ <h3 class="text-muted">AngularJS Example</h3>
</rickshaw-chart>
</div>

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>
<script src="../rickshaw.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.5/angular.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/bars.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<head>
<link type="text/css" rel="stylesheet" href="../src/css/graph.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.15/jquery-ui.min.js"></script>
Expand Down
12 changes: 6 additions & 6 deletions examples/colors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/graph.css">
<link type="text/css" rel="stylesheet" href="css/lines.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="../rickshaw.min.js"></script>

Expand Down Expand Up @@ -30,11 +30,11 @@
<script>

var schemes = [
'spectrum14',
'colorwheel',
'spectrum14',
'colorwheel',
'cool',
'spectrum2000',
'spectrum2001',
'spectrum2000',
'spectrum2001',
'classic9',
'munin'
];
Expand Down Expand Up @@ -73,7 +73,7 @@
color: palette.color()
} );
} );

var graph = new Rickshaw.Graph( {
element: element,
series: series
Expand Down
2 changes: 1 addition & 1 deletion examples/drag_zoom.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<link type="text/css" rel="stylesheet" href="../rickshaw.css">
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>
<script src="../rickshaw.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/extensions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/legend.css">
<link type="text/css" rel="stylesheet" href="css/extensions.css?v=2">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script>
Expand Down
4 changes: 2 additions & 2 deletions examples/fixed.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/legend.css">
<link type="text/css" rel="stylesheet" href="css/extensions.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>
<script src="../rickshaw.js"></script>
</head>
<body>
Expand All @@ -28,7 +28,7 @@
timeInterval: tv,
maxDataPoints: 100,
timeBase: new Date().getTime() / 1000
})
})
} );

graph.render();
Expand Down
2 changes: 1 addition & 1 deletion examples/formatter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/legend.css">
<link type="text/css" rel="stylesheet" href="css/lines.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.15/jquery-ui.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/gaps.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<link type="text/css" rel="stylesheet" href="css/lines.css">
<link type="text/css" rel="stylesheet" href="../rickshaw.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="../rickshaw.js"></script>

Expand Down
8 changes: 4 additions & 4 deletions examples/hover.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<link type="text/css" rel="stylesheet" href="../src/css/detail.css">
<link type="text/css" rel="stylesheet" href="../src/css/legend.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>

<script src="../rickshaw.js"></script>

<style>
body {
font-family: Arial, sans-serif
body {
font-family: Arial, sans-serif
}
#chart_container {
width: 960px;
Expand Down Expand Up @@ -123,7 +123,7 @@
}
});

var hover = new Hover( { graph: graph } );
var hover = new Hover( { graph: graph } );

</script>

Expand Down
2 changes: 1 addition & 1 deletion examples/inconsistent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<link type="text/css" rel="stylesheet" href="css/lines.css">
<link type="text/css" rel="stylesheet" href="../rickshaw.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="../rickshaw.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/jsonp.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/graph.css">
<link type="text/css" rel="stylesheet" href="css/lines.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js"></script>

Expand Down
4 changes: 2 additions & 2 deletions examples/legend.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<link type="text/css" rel="stylesheet" href="../src/css/legend.css">
<link type="text/css" rel="stylesheet" href="css/lines.css">

<script src="../vendor/d3.min.js"></script>
<script src="../vendor/d3.layout.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.layout.min.js"></script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.15/jquery-ui.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/lineplot.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<link type="text/css" rel="stylesheet" href="../rickshaw.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="../rickshaw.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/lines.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/legend.css">
<link type="text/css" rel="stylesheet" href="css/lines.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="../rickshaw.js"></script>
</head>
Expand Down
6 changes: 3 additions & 3 deletions examples/logscale.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<link type="text/css" rel="stylesheet" href="css/lines.css">
<link type="text/css" rel="stylesheet" href="../src/css/detail.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>
<script src="../rickshaw.js"></script>

<style>
Expand Down Expand Up @@ -52,8 +52,8 @@
max = Math.max(max, series[0][i].y);
}

var logScale = d3.scale.log().domain([min/4, max]);
var linearScale = d3.scale.linear().domain([min, max]).range(logScale.range());
var logScale = d3.scaleLog().domain([min/4, max]);
var linearScale = d3.scaleLinear().domain([min, max]).range(logScale.range());
var graph = new Rickshaw.Graph( {
element: document.getElementById("chart"),
renderer: 'line',
Expand Down
2 changes: 1 addition & 1 deletion examples/milliseconds.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype>
<head>
<link type="text/css" rel="stylesheet" href="../rickshaw.css">
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>
<script src="../rickshaw.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/multi.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<link type="text/css" rel="stylesheet" href="../rickshaw.css">
<link type="text/css" rel="stylesheet" href="css/lines.css">
<link type="text/css" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css">
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.15/jquery-ui.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/negative.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/graph.css">
<link type="text/css" rel="stylesheet" href="css/lines.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="../rickshaw.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/refresh.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js"></script>

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>
<script src="../rickshaw.js"></script>
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions examples/resize.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/graph.css">
<link type="text/css" rel="stylesheet" href="css/lines.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>
<script src="../rickshaw.js"></script>

<div id="chart"></div>
Expand Down Expand Up @@ -44,7 +44,7 @@
element: document.getElementById('preview')
});

window.addEventListener('resize', resize);
window.addEventListener('resize', resize);
resize();

</script>
6 changes: 3 additions & 3 deletions examples/scaled.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/detail.css">
<link type="text/css" rel="stylesheet" href="css/lines.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>
<script src="../rickshaw.js"></script>
<style type="text/css">
#axis0 {
Expand Down Expand Up @@ -56,9 +56,9 @@
max = Math.max(max, point.y);
}
if (_k === 0) {
scales.push(d3.scale.linear().domain([min, max]).nice());
scales.push(d3.scaleLinear().domain([min, max]).nice());
} else {
scales.push(d3.scale.pow().domain([min, max]).nice());
scales.push(d3.scalePow().domain([min, max]).nice());
}
}

Expand Down
2 changes: 1 addition & 1 deletion examples/scatterplot.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
</style>

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="../rickshaw.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/series.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/legend.css">
<link type="text/css" rel="stylesheet" href="css/extensions.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.15/jquery-ui.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/shared_slider.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<link type="text/css" rel="stylesheet" href="../rickshaw.css">
<link type="text/css" rel="stylesheet" href="css/lines.css">
<link type="text/css" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css">
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.15/jquery-ui.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/simple.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/graph.css">
<link type="text/css" rel="stylesheet" href="css/lines.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="../rickshaw.min.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/socket.io/socket.io.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/graph.css">
<link type="text/css" rel="stylesheet" href="../examples/css/lines.css">

<script src="../vendor/d3.v2.js"></script>
<script src="../../node_modules/d3/dist/d3.min.js"></script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js"></script>
<script src="/socket.io/socket.io.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/sparse.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/legend.css">
<link type="text/css" rel="stylesheet" href="css/lines.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>

<script src="../rickshaw.js"></script>
</head>
Expand Down
18 changes: 9 additions & 9 deletions examples/start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<!doctype html>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>
<script src="../rickshaw.min.js"></script>

<div id="chart"></div>

<script>

var graph = new Rickshaw.Graph( {
element: document.querySelector("#chart"),
width: 500,
height: 200,
element: document.querySelector("#chart"),
width: 500,
height: 200,
series: [{
color: 'steelblue',
data: [
{ x: 0, y: 40 },
{ x: 1, y: 49 },
{ x: 2, y: 38 },
{ x: 3, y: 30 },
data: [
{ x: 0, y: 40 },
{ x: 1, y: 49 },
{ x: 2, y: 38 },
{ x: 3, y: 30 },
{ x: 4, y: 32 } ]
}]
});
Expand Down
6 changes: 3 additions & 3 deletions examples/status.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/legend.css">
<link type="text/css" rel="stylesheet" href="css/extensions.css">

<script src="../node_modules/d3/d3.min.js"></script>
<script src="../node_modules/d3/dist/d3.min.js"></script>
<script src="../rickshaw.min.js"></script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
Expand All @@ -24,8 +24,8 @@
renderer: 'bar',
onData: function(d) { return transformData(d) },
onComplete: function(w) {
var legend = new Rickshaw.Graph.Legend( {
element: document.querySelector('#legend'),
var legend = new Rickshaw.Graph.Legend( {
element: document.querySelector('#legend'),
graph: w.graph
} );
}
Expand Down