projects / dygraphs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 627e054)
Documentation / test cleanup
authorDan Vanderkam <danvk@sidewalklabs.com>
Wed, 28 Dec 2016 16:39:10 +0000 (11:39 -0500)
committerDan Vanderkam <danvk@sidewalklabs.com>
Wed, 28 Dec 2016 16:39:10 +0000 (11:39 -0500)
.gitignore patch | blob | blame | history
docs/header.html patch | blob | blame | history
docs/versions.html patch | blob | blame | history
releases.json patch | blob | blame | history
scripts/generate-documentation.py patch | blob | blame | history
scripts/generate-jsdoc.sh patch | blob | blame | history
scripts/push-to-web.sh patch | blob | blame | history
tests/demo.html patch | blob | blame | history
tests/per-series.html patch | blob | blame | history

diff --git a/.gitignore b/.gitignore
index 121cd66..e97dd19 100644 (file)
--- 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 (file)
--- a/docs/header.html
+++ b/docs/header.html
@@ -6,9 +6,10 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
     <link rel="stylesheet" href="bootstrap.min.css">
     <link rel="stylesheet" href="site.css">
+    <link rel="stylesheet" href="dygraph.css">
 
     <script src="bootstrap.min.js"></script>
-    <script type="text/javascript" src="dygraph-combined.js"></script> 
+    <script type="text/javascript" src="dygraph.min.js"></script>
   </head>
   <body>
     <!--
@@ -28,7 +29,7 @@
 
       <h1 class="navbar-brand"><a href="/">dygraphs</a></h1>
 
-      
+
       <!-- Place everything within .navbar-collapse to hide it until above 768px -->
       <div class="nav-collapse collapse navbar-responsive-collapse">
 
diff --git a/docs/versions.html b/docs/versions.html
index e336eea..a5974b5 100644 (file)
--- a/docs/versions.html
+++ b/docs/versions.html
@@ -28,6 +28,14 @@
 
 <table class="versions">
   <tr>
+    <td>1.1.1<p class="date">2015-06-01</p></td>
+    <td class="notes">
+      <ul>
+        <li>Set <code>this</code> to the dygraph in all callbacks.</li>
+        <li>Minor bug fixes.</li>
+      </ul>
+    </td>
+
     <td>1.1.0<p class="date">2014-12-03</p></td>
     <td class="notes">
       Highlights include:
@@ -42,7 +50,7 @@
         <li>"this" is set to the dygraph in all callbacks.
         <li>dygraphs has shrunk, because we moved some stuff into "extras" (133kb→122kb)
       </ul>
-            
+
       This will be the last major release to support browsers without a native &lt;canvas&gt; implementation. See <a href="http://blog.dygraphs.com/2014/12/dygraphs-110.html">blog post</a> for more details.
     </td>
   </tr>
diff --git a/releases.json b/releases.json
index 76b58b7..24496bf 100644 (file)
--- 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 (executable)
--- 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 '<JSON>' in line:
     in_json = True
   elif '</JSON>' in line:
diff --git a/scripts/generate-jsdoc.sh b/scripts/generate-jsdoc.sh
index 6512fb0..fb633ca 100755 (executable)
--- 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 (executable)
--- 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 (file)
--- a/tests/demo.html
+++ b/tests/demo.html
@@ -3,9 +3,7 @@
   <head>
     <link rel="stylesheet" href="../css/dygraph.css">
     <title>demo</title>
-    <!--
-    <script type="text/javascript" src="../dist/dygraph.js"></script>
-    -->
+
     <script type="text/javascript" src="../dist/dygraph.js"></script>
   </head>
   <body>
diff --git a/tests/per-series.html b/tests/per-series.html
index a35f767..b0dd976 100644 (file)
--- a/tests/per-series.html
+++ b/tests/per-series.html
@@ -15,8 +15,6 @@
     <div id="demodiv"></div>
     <h2>Chart with per-series properties with legend.</h2>
     <div id="demodiv2"></div>
-    <h2>First graph, using old-style series specification.</h2>
-    <div id="demodiv3"></div>
     <script type="text/javascript">
       data = function() {
         var zp = function(x) { if (x < 10) return "0"+x; else return x; };
@@ -96,36 +94,6 @@
                 }
               }
           );
-      g3 = new Dygraph(
-              document.getElementById("demodiv3"),
-              data,
-              {
-                strokeWidth: 2,
-                series: {
-                  'parabola': {
-                    strokeWidth: 0.0,
-                    drawPoints: true,
-                    pointSize: 4,
-                    highlightCircleSize: 6
-                  },
-                  'line': {
-                    strokeWidth: 1.0,
-                    drawPoints: true,
-                    pointSize: 1.5
-                  },
-                  'sine wave': {
-                    strokeWidth: 3,
-                    highlightCircleSize: 10
-                  },
-                  'sine wave2': {
-                    strokePattern: [10, 2, 5, 2],
-                    strokeWidth: 2,
-                    highlightCircleSize: 3
-                  }
-                }
-              }
-          );
-
     </script>
 </body>
 </html>
danvk/dygraphs fork supporting touch events