Skip to content

Commit

Permalink
remove local copy of vendor/d3 (#613)
Browse files Browse the repository at this point in the history 
Removed the local git syncd copy of d3.js since it is already a dependency in
both the package.json and bower.json

Updated examples to use the copy from node_modules to maintain consistency with
the unit tests
  • Loading branch information
@sebasmurphy
sebasmurphy committed Mar 30, 2020
1 parent 3be2c0c commit 438f4b2
Show file tree
Hide file tree
Showing 44 changed files with 40 additions and 7,080 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package-lock.json

# Dependency directories
node_modules
vendor

# Coverage directory used by tools like istanbul
coverage
2 changes: 1 addition & 1 deletion examples/ajax.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/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
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/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
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/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/colors.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>

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

Expand Down
2 changes: 1 addition & 1 deletion examples/drag_zoom.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../rickshaw.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/extensions.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion examples/fixed.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../rickshaw.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/formatter.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/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
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>

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

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion examples/inconsistent.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>

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

Expand Down
2 changes: 1 addition & 1 deletion examples/jsonp.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/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/lineplot.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>

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

Expand Down
2 changes: 1 addition & 1 deletion examples/lines.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>

<script src="../rickshaw.js"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion examples/logscale.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../rickshaw.js"></script>

<style>
Expand Down
2 changes: 1 addition & 1 deletion examples/milliseconds.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../rickshaw.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/multi.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/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
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>

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

Expand Down
2 changes: 1 addition & 1 deletion examples/refresh.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../rickshaw.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/resize.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../rickshaw.js"></script>

<div id="chart"></div>
Expand Down
2 changes: 1 addition & 1 deletion examples/scaled.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../rickshaw.js"></script>
<style type="text/css">
#axis0 {
Expand Down
2 changes: 1 addition & 1 deletion examples/scatterplot.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
</style>

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

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

Expand Down
2 changes: 1 addition & 1 deletion examples/series.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/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
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/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
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>

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

Expand Down
2 changes: 1 addition & 1 deletion examples/sparse.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>

<script src="../rickshaw.js"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion examples/start.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html>
<script src="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../rickshaw.min.js"></script>

<div id="chart"></div>
Expand Down
2 changes: 1 addition & 1 deletion examples/status.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/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 Down
2 changes: 1 addition & 1 deletion examples/stops.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<link type="text/css" rel="stylesheet" href="../src/css/detail.css">
<link type="text/css" rel="stylesheet" href="../src/css/legend.css">

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

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

Expand Down
2 changes: 1 addition & 1 deletion examples/timescale.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>

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

Expand Down
2 changes: 1 addition & 1 deletion examples/x_axis.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../rickshaw.js"></script>

<style>
Expand Down
2 changes: 1 addition & 1 deletion examples/y_axis.html
View file
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="../vendor/d3.v3.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>

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

Expand Down
3 changes: 1 addition & 2 deletions tutorial/example_01.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<!doctype>
<script src="../vendor/d3.min.js"></script>
<script src="../vendor/d3.layout.min.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../rickshaw.min.js"></script>

<div id="chart"></div>
Expand Down
3 changes: 1 addition & 2 deletions tutorial/example_02.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<!doctype>
<script src="../vendor/d3.min.js"></script>
<script src="../vendor/d3.layout.min.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../rickshaw.min.js"></script>

<div id="chart"></div>
Expand Down
3 changes: 1 addition & 2 deletions tutorial/example_03.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<!doctype>
<link rel="stylesheet" href="../rickshaw.min.css">
<script src="../vendor/d3.min.js"></script>
<script src="../vendor/d3.layout.min.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../rickshaw.min.js"></script>

<div id="chart"></div>
Expand Down
3 changes: 1 addition & 2 deletions tutorial/example_04.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<!doctype>
<link type="text/css" rel="stylesheet" href="../rickshaw.min.css">
<script src="../vendor/d3.min.js"></script>
<script src="../vendor/d3.layout.min.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../rickshaw.min.js"></script>

<style>
Expand Down
3 changes: 1 addition & 2 deletions tutorial/example_05.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<!doctype>
<link type="text/css" rel="stylesheet" href="../rickshaw.min.css">
<script src="../vendor/d3.min.js"></script>
<script src="../vendor/d3.layout.min.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../rickshaw.min.js"></script>

<style>
Expand Down
3 changes: 1 addition & 2 deletions tutorial/example_06.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<!doctype>
<link type="text/css" rel="stylesheet" href="../rickshaw.min.css">
<script src="../vendor/d3.min.js"></script>
<script src="../vendor/d3.layout.min.js"></script>
<script src="../node_modules/d3/d3.min.js"></script>
<script src="../rickshaw.min.js"></script>

<style>
Expand Down
3 changes: 1 addition & 2 deletions tutorial/example_07.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<!doctype>
<link type="text/css" rel="stylesheet" href="../rickshaw.min.css">
<script src="../vendor/d3.min.js"></script>
<script src="../vendor/d3.layout.min.js"></script>
<script src="../node_modules//d3/d3.min.js"></script>
<script src="../rickshaw.min.js"></script>

<style>
Expand Down
1 change: 0 additions & 1 deletion vendor/d3.layout.min.js
View file

This file was deleted.

2 changes: 0 additions & 2 deletions vendor/d3.min.js
View file

This file was deleted.

Loading

0 comments on commit 438f4b2

Please sign in to comment.