blob42
/
nvd3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/novus/nvd3

Browse Source 
Conflicts:
	examples/parallelCoordinates.html
master-patched
Tyler Wolf 11 years ago
parent 4107b774bc 8071617d74
commit bd7d5b2363
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File

2
README.md
Unescape Escape View File

@ -33,7 +33,7 @@ Without UglifyJS, you won't get the minified version when running make.
**We ask that you DO NOT minify pull requests...
If you need to minify please build pull request in separate branch, and
merge and minify in yout master.
merge and minify in your master.
## (Officially) Supported Browsers

39
examples/parallelCoordinates.html
Unescape Escape View File

@ -1,12 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<link type="text/css" rel="stylesheet" href="../lib/nv.d3.css">
<link type="text/css" rel="stylesheet" href="../src/nv.d3.private.css">
<script type="text/javascript" src="../lib/d3.v2.min.js"></script>
<script type="text/javascript" src="../lib/nv.d3.js"></script>
<script type="text/javascript" src="../src/nv.d3.utils.js"></script>
<style>
<head>
<link href="../src/nv.d3.css" rel="stylesheet" type="text/css">
<script src="http://code.jquery.com/jquery-1.9.1.min.js"></script>>
<script src="../lib/d3.v2.js"></script>
<script src="../nv.d3.js"></script>
<script type="text/javascript" src="../src/utils.js"></script>
<style>
body {
overflow-y: scroll;
@ -52,28 +52,23 @@ svg {
.axis text {
text-shadow: 0 1px 0 #fff;
}
</style>
</head>
<body>
<div id="chart1" class="chart">
<svg></svg>
</div>
</style>
</head>
<body>
<div id="chart1" class="chart">
<svg></svg>
</div>
<script type="text/javascript" src="../src/models/parallelCoordinates.js"></script>
<script>
<script type="text/javascript" src="../src/models/parallelCoordinates.js"></script>
<script>
var chart;
nv.addGraph(function() {
chart = nv.models.parallelCoordinates()
.dimensions(["economy (mpg)", "cylinders", "displacement (cc)", "power (hp)", "weight (lb)", "0-60 mph (s)", "year"])
.width(600)
.height(400);
.dimensions(["economy (mpg)", "cylinders", "displacement (cc)", "power (hp)", "weight (lb)", "0-60 mph (s)", "year"]);
d3.select('#chart1 svg')
.datum(data)
@ -83,6 +78,8 @@ svg {
nv.log(e);
});
nv.utils.windowResize(chart.update);
return chart;
});

Write Preview
Loading…
Cancel
Save