diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-15 01:31:43 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-15 01:31:43 -0500 |
| commit | ce8338cdc419a63afa105d239fc3ca60870e6125 (patch) | |
| tree | 356427b8da1ab024ac18ef2ca8254a2a9f63a6e7 | |
| parent | e32f40db184d892540d6dd711e02912aead8d2b8 (diff) | |
| parent | 14c51a5bd86384510071829ba0b0cfb515e924e5 (diff) | |
Merge commit '14c51a5' (Update to d3 2.8.1)parabolaweb-2012-11-15
is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
| -rw-r--r-- | templates/visualize/index.html | 4 | ||||
| -rw-r--r-- | visualize/static/.gitignore | 8 | ||||
| -rw-r--r-- | visualize/static/Makefile | 5 |
3 files changed, 5 insertions, 12 deletions
diff --git a/templates/visualize/index.html b/templates/visualize/index.html index c4b38a7d..75194291 100644 --- a/templates/visualize/index.html +++ b/templates/visualize/index.html @@ -28,9 +28,7 @@ <div id="visualize-keys" class="visualize-chart"></div> </div> {% load cdn %}{% jquery %} -<script type="text/javascript" src="{{ STATIC_URL }}d3.min.js"></script> -<script type="text/javascript" src="{{ STATIC_URL }}d3.geom.min.js"></script> -<script type="text/javascript" src="{{ STATIC_URL }}d3.layout.min.js"></script> +<script type="text/javascript" src="{{ STATIC_URL }}d3.v2.min.js"></script> <script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script> <script type="text/javascript" src="{{ STATIC_URL }}visualize.js"></script> <script type="text/javascript"> diff --git a/visualize/static/.gitignore b/visualize/static/.gitignore index 7a61b9ef..ecb2b9c4 100644 --- a/visualize/static/.gitignore +++ b/visualize/static/.gitignore @@ -1,7 +1,3 @@ .d3 -d3.geom.js -d3.geom.min.js -d3.js -d3.layout.js -d3.layout.min.js -d3.min.js +d3.v2.js +d3.v2.min.js diff --git a/visualize/static/Makefile b/visualize/static/Makefile index 92340883..4fa99a20 100644 --- a/visualize/static/Makefile +++ b/visualize/static/Makefile @@ -1,7 +1,6 @@ -d3version=2.7.2 +d3version=2.8.1 -_targets=d3.js d3.layout.js d3.geom.js -targets=$(_targets) $(patsubst %.js,%.min.js,$(_targets)) +targets=d3.v2.js d3.v2.min.js gitignore=.d3 # Force creating the d3 directory before we even evaluate how to make d3.js |