demo

From 620af96afc96e8bd6cb5025efe7ebf75811a9c0e Mon Sep 17 00:00:00 2001 From: Dan Vanderkam Date: Wed, 28 Dec 2016 11:39:10 -0500 Subject: [PATCH] Documentation / test cleanup --- .gitignore | 1 + docs/header.html | 5 +++-- docs/versions.html | 10 +++++++++- releases.json | 15 +++++++++++++++ scripts/generate-documentation.py | 2 +- scripts/generate-jsdoc.sh | 2 +- scripts/push-to-web.sh | 22 ++++++++++------------ tests/demo.html | 4 +--- tests/per-series.html | 32 -------------------------------- 9 files changed, 41 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index 121cd66..e97dd19 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ env dist coverage *.log +*.pyc diff --git a/docs/header.html b/docs/header.html index 870c84c..cc5881c 100644 --- a/docs/header.html +++ b/docs/header.html @@ -6,9 +6,10 @@ + - +

diff --git a/docs/versions.html b/docs/versions.html index e336eea..a5974b5 100644 --- a/docs/versions.html +++ b/docs/versions.html @@ -28,6 +28,14 @@ + + + diff --git a/releases.json b/releases.json index 76b58b7..24496bf 100644 --- a/releases.json +++ b/releases.json @@ -1,5 +1,20 @@ [ { + "version": "2.0.0", + "files": [ + "dygraph.min.js", + "dygraph.js", + "dygraph.css" + ] + }, + { + "version": "1.1.1", + "files": [ + "dygraph-combined.js", + "dygraph-combined-dev.js" + ] + }, + { "version": "1.1.0", "files": [ "dygraph-combined.js", diff --git a/scripts/generate-documentation.py b/scripts/generate-documentation.py index 31781b9..2b1874d 100755 --- a/scripts/generate-documentation.py +++ b/scripts/generate-documentation.py @@ -16,7 +16,7 @@ debug_tests = [] # [ 'tests/zoom.html' ] # Pull options reference JSON out of dygraph.js js = '' in_json = False -for line in file('dygraph-options-reference.js'): +for line in file('src/dygraph-options-reference.js'): if '' in line: in_json = True elif '' in line: diff --git a/scripts/generate-jsdoc.sh b/scripts/generate-jsdoc.sh index 6512fb0..fb633ca 100755 --- a/scripts/generate-jsdoc.sh +++ b/scripts/generate-jsdoc.sh @@ -7,7 +7,7 @@ echo Generating JSDoc... java -jar jsdoc-toolkit/jsrun.jar \ jsdoc-toolkit/app/run.js \ -d=jsdoc -t=jsdoc-toolkit/templates/jsdoc \ - dygraph.js \ + src/dygraph.js \ | tee /tmp/dygraphs-jsdocerrors.txt if [ -s /tmp/dygraphs-jsdocerrors.txt ]; then diff --git a/scripts/push-to-web.sh b/scripts/push-to-web.sh index 0ea59ac..db5f54f 100755 --- a/scripts/push-to-web.sh +++ b/scripts/push-to-web.sh @@ -8,18 +8,18 @@ if [ "$1" == "" ] ; then fi set -x +set -o errexit site=$1 -# Produce dygraph-combined.js and dygraph-combined-dev.js -./generate-combined.sh -./generate-combined.sh cat-dev > dygraph-combined-dev.js +# Produce dist/*.js +npm run build # Generate documentation. -./generate-documentation.py > docs/options.html +./scripts/generate-documentation.py > docs/options.html chmod a+r docs/options.html if [ -s docs/options.html ] ; then - ./generate-jsdoc.sh - ./generate-download.py > docs/download.html + ./scripts/generate-jsdoc.sh + ./scripts/generate-download.py > docs/download.html temp_dir=$(mktemp -d /tmp/dygraphs-docs.XXXX) cd docs @@ -27,20 +27,18 @@ if [ -s docs/options.html ] ; then cd .. # Make sure everything will be readable on the web. - # This is like "chmod -R a+rX", but excludes the .git directory. - find . -path ./.git -prune -o -print | xargs chmod a+rX + # This is like "chmod -R a+rX", but excludes the .git and node_modules directories. + find . -print | egrep -v '\.git|node_modules' | xargs chmod a+rX # Copy everything to the site. - rsync -avzr gallery common tests jsdoc experimental plugins datahandler polyfills extras $site \ + rsync -avzr src src/extras gallery common tests jsdoc $site \ && \ - rsync -avzr --copy-links dashed-canvas.js dygraph*.js gadget.xml thumbnail.png screenshot.png $temp_dir/* $site/ + rsync -avzr --copy-links dist/* css/* thumbnail.png screenshot.png $temp_dir/* $site/ else echo "generate-documentation.py failed" fi # Revert changes to dygraph-combined.js and docs. -make clean-combined-test -rm dygraph-combined-dev.js git checkout docs/download.html rm docs/options.html rm -rf $temp_dir diff --git a/tests/demo.html b/tests/demo.html index af01cc5..616b179 100644 --- a/tests/demo.html +++ b/tests/demo.html @@ -3,9 +3,7 @@ demo - + diff --git a/tests/per-series.html b/tests/per-series.html index a35f767..b0dd976 100644 --- a/tests/per-series.html +++ b/tests/per-series.html @@ -15,8 +15,6 @@

Chart with per-series properties with legend.

First graph, using old-style series specification.

-- 2.7.4

1.1.1

2015-06-01

Set this to the dygraph in all callbacks.
Minor bug fixes.

1.1.0

2014-12-03

Highlights include: @@ -42,7 +50,7 @@

"this" is set to the dygraph in all callbacks.

dygraphs has shrunk, because we moved some stuff into "extras" (133kbâ122kb) - + This will be the last major release to support browsers without a native <canvas> implementation. See blog post for more details.