OptiRTC · darcyparker · Mar 4, 2021 · Jan 21, 2016 · Feb 8, 2016 · Feb 8, 2016
diff --git a/CONTRIBUTING.md → .github/CONTRIBUTING.md b/CONTRIBUTING.md → .github/CONTRIBUTING.md
@@ -7,13 +7,13 @@ It also helps if you include the non-compacted version of the JS on your
 page. For instance, instead of doing this:
 
 ```html
-<script type="text/javascript" src="dygraph-combined.js"></script>
+<script type="text/javascript" src="dygraph.min.js"></script>
 ```
 
 do this:
 
 ```html
-<script type="text/javascript" src="dygraph-combined.dev.js"></script>
+<script type="text/javascript" src="dygraph.js"></script>
 ```
 
 This makes error messages and debugging simpler. The jsfiddle does this automatically.

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,20 @@
+Filing a bug report? Please include the following:
+
+1. Link to a page which demonstrates the problem, preferably a jsfiddle (use http://dygraphs.com/fiddle as a template)
+2. Browser and Operating System that exhibit the problem
+3. Version of dygraphs that you're using
+
+It also helps if you include the non-compacted version of the JS on your
+page. For instance, instead of doing this:
+
+```html
+<script type="text/javascript" src="dygraph.min.js"></script>
+```
+
+do this:
+
+```html
+<script type="text/javascript" src="dygraph.js"></script>
+```
+
+This makes error messages and debugging simpler. The jsfiddle does this automatically.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,14 @@
+Please read the guide to making dygraphs changes:
+http://dygraphs.com/changes.html
+
+Pull Requests will only be accepted if:
+
+- You clearly explain what you're adding and why you believe it's an
+  improvement. For example: "Fixes issue #123".
+- You adhere to the style of the rest of the dygraphs code base.
+- You write an `auto_test` for the code that you're adding.
+
+Be sure to document any new options you add. Also be aware that PRs which add
+options are likely to be rejected. dygraphs already has many options. If you
+can fit your feature into one of those or implement it as a plugin, it will be
+more likely to get merged.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ env
 dist
 coverage
 *.log
+*.pyc
+src-es5
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "6"
 
 sudo: false  # Use container-based architecture
 script: >

diff --git a/DEVELOP.md b/DEVELOP.md
@@ -6,6 +6,10 @@ This is a step-by-step guide explaining how to do it.
 
 ### How-to
 
+To install dependencies, run
+
+    npm install
+
 To build dygraphs, run
 
     npm run build

diff --git a/README.md b/README.md
@@ -7,24 +7,23 @@ The dygraphs JavaScript library produces interactive, zoomable charts of time se
 
 Learn more about it at [dygraphs.com](http://www.dygraphs.com).
 
-Get help with dygraphs on
-[Stack Overflow](http://stackoverflow.com/questions/tagged/dygraphs) (preferred) and 
-[Google Groups](http://groups.google.com/group/dygraphs-users)
+Get help with dygraphs by browsing the  on [Stack Overflow][] (preferred) and [Google Groups][].
 
 ## Features
 * Plots time series without using an external server or Flash
-* Supports [error bands](http://dygraphs.com/tests/legend-values.html) around data series
-* Interactive [pan and zoom](http://dygraphs.com/tests/link-interaction.html)
-* Displays values [on mouseover](http://dygraphs.com/tests/legend-values.html)
-* Adjustable [averaging period](http://dygraphs.com/tests/temperature-sf-ny.html)
-* Extensive set of [options](http://www.dygraphs.com/options.html) for customization.
-* Compatible with the [Google Visualization API](http://dygraphs.com/data.html#datatable)
+* Supports [error bands][] around data series
+* Interactive [pan and zoom][]
+* Displays values [on mouseover][]
+* Adjustable [averaging period][]
+* Extensive set of [options][] for customization.
+* Compatible with the [Google Visualization API][gviz]
 
 ## Minimal Example
 ```html
 <html>
 <head>
-<script type="text/javascript" src="dygraph-combined.js"></script>
+<script type="text/javascript" src="dygraph.js"></script>
+<link rel="stylesheet" href="dygraph.css" />
 </head>
 <body>
 <div id="graphdiv"></div>
@@ -42,9 +41,27 @@ Get help with dygraphs on
 </html>
 ```
 
-Learn more by reading [the tutorial](http://www.dygraphs.com/tutorial.html) and
-seeing demonstrations of what dygraphs can do in the
-[gallery](http://www.dygraphs.com/gallery).
+Learn more by reading [the tutorial][] and seeing demonstrations of what
+dygraphs can do in the [gallery][]. You can get `dygraph.js` and `dygraph.css`
+from [cdnjs][] or [from NPM][npm] (see below).
+
+## Usage with a module loader
+
+Get dygraphs from NPM:
+
+    npm install dygraphs
+
+You'll find pre-built JS & CSS files in `node_modules/dygraphs/dist`. If you're
+using a module bundler like browserify or webpack, you can import dygraphs:
+
+```js
+import Dygraph from 'dygraphs';
+// or: const Dygraph = require('dygraphs');
+
+const g = new Dygraph('graphdiv', data, { /* options */ });
+```
+
+Check out the [dygraphs-es6 repo][] for a fully-worked example.
 
 ## Development
 
@@ -59,3 +76,17 @@ Read more about the dygraphs development process in the [developer guide](/DEVEL
 
 ## License(s)
 dygraphs is available under the MIT license, included in LICENSE.txt.
+
+[cdnjs]: https://cdnjs.com/libraries/dygraph
+[the tutorial]: http://www.dygraphs.com/tutorial.html
+[gallery]: http://www.dygraphs.com/gallery
+[error bands]: http://dygraphs.com/tests/legend-values.html
+[pan and zoom]: http://dygraphs.com/tests/link-interaction.html
+[on mouseover]: http://dygraphs.com/tests/legend-values.html
+[averaging period]: http://dygraphs.com/tests/temperature-sf-ny.html
+[options]: http://www.dygraphs.com/options.html
+[Stack Overflow]: http://stackoverflow.com/questions/tagged/dygraphs?sort=votes&pageSize=50
+[Google Groups]: http://groups.google.com/group/dygraphs-users
+[gviz]: http://dygraphs.com/data.html#datatable
+[npm]: https://www.npmjs.com/package/dygraphs
+[dygraphs-es6 repo]: https://github.com/danvk/dygraphs-es6
diff --git a/auto_tests/coverage.html b/auto_tests/coverage.html
@@ -3,14 +3,12 @@
   <meta charset="utf-8">
   <title>dygraphs tests</title>
   <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+  <link rel="stylesheet" href="../css/dygraph.css" />
 </head>
 <body>
   <div id="graph"></div>
   <div id="mocha"></div>
 
-  <!-- Polyfills for PhantomJS -->
-  <script src="../node_modules/babel-core/browser-polyfill.js"></script>
-
   <!-- Mocha -->
   <script src="../node_modules/mocha/mocha.js"></script>
   <script src="../node_modules/chai/chai.js"></script>

diff --git a/auto_tests/data/out-of-order-dates.csv b/auto_tests/data/out-of-order-dates.csv
@@ -0,0 +1,9 @@
+Date,r17,r82,r83,r9
+2013-10-17T21:00:00Z,,,,9
+2014-05-29T18:00:00Z,,,,9
+2013-10-17T21:00:00Z,17,,,
+2014-05-29T17:00:00Z,17,,,
+2014-05-29T18:00:00Z,,82,,
+2014-05-29T18:00:00Z,,,83,
+2014-10-11T04:00:00Z,,,83,
+2015-05-22T04:00:00Z,,82,,
diff --git a/auto_tests/data/out-of-order.csv b/auto_tests/data/out-of-order.csv
@@ -0,0 +1,5 @@
+X,Y1,Y2
+0,0,0
+1,1,1
+3,3,9
+2,2,4
diff --git a/auto_tests/data/sample.csv b/auto_tests/data/sample.csv
@@ -0,0 +1,5 @@
+X,Y1,Y2
+0,0,0
+1,1,1
+2,2,4
+3,3,9
diff --git a/auto_tests/runner.html b/auto_tests/runner.html
@@ -3,14 +3,12 @@
   <meta charset="utf-8">
   <title>dygraphs tests</title>
   <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+  <link rel="stylesheet" href="../css/dygraph.css" />
 </head>
 <body>
   <div id="graph"></div>
   <div id="mocha"></div>
 
-  <!-- Polyfills for PhantomJS -->
-  <script src="../node_modules/babel-core/browser-polyfill.js"></script>
-
   <!-- Mocha -->
   <script src="../node_modules/mocha/mocha.js"></script>
   <script src="../node_modules/chai/chai.js"></script>

diff --git a/auto_tests/tests/axis_labels.js b/auto_tests/tests/axis_labels.js
@@ -687,6 +687,33 @@ it('testLogScale', function() {
   assert.deepEqual(['0','200','400','600','800','1000'], Util.getYLabels());
 });
 
+/**
+ * Verify that log scale axis range works with yRangePad.
+ *
+ * This is a regression test for https://github.com/danvk/dygraphs/issues/661 .
+ */
+it('testLogScalePad', function() {
+  var g = new Dygraph("graph",
+                      [[0, 1e-5], [1, 0.25], [2, 1], [3, 3], [4, 10]], {
+                        width: 250,
+                        height: 130,
+                        logscale: true,
+                        yRangePad: 30,
+                        axes: {y: {valueRange: [1, 10]}},
+                        labels: ['X', 'Y']
+                      });
+  var nonEmptyLabels = Util.getYLabels().filter(function(x) { return x.length > 0; });
+  assert.deepEqual(['1', '7', '30'], nonEmptyLabels);
+
+  g.updateOptions({ yRangePad: 10, axes: {y: {valueRange: [0.25005, 3]}} });
+  nonEmptyLabels = Util.getYLabels().filter(function(x) { return x.length > 0; });
+  assert.deepEqual(['0.4', '1', '3'], nonEmptyLabels);
+
+  g.updateOptions({ axes: {y: {valueRange: [0.01, 3]}} });
+  nonEmptyLabels = Util.getYLabels().filter(function(x) { return x.length > 0; });
+  assert.deepEqual(['0.01','0.1','0.7','5'], nonEmptyLabels);
+});
+
 /**
  * Verify that include zero range is properly specified.
  */
@@ -771,75 +798,6 @@ it('testAxisLabelFontSizeNull', function() {
   assertFontSize(document.querySelectorAll(".dygraph-axis-label-y"), "14px");
 });
 
-it('testAxisLabelColor', function() {
-  var graph = document.getElementById("graph");
-  var g = new Dygraph(graph, simpleData, {});
-
-  // Be sure we're dealing with a black default.
-  assert.equal("black", DEFAULT_ATTRS.axisLabelColor);
-
-  var assertColor = function(selector, expected) {
-    Util.assertStyleOfChildren(selector, "color", expected);
-  }
-
-  assertColor(document.querySelectorAll(".dygraph-axis-label-x"), "rgb(0, 0, 0)");
-  assertColor(document.querySelectorAll(".dygraph-axis-label-y"), "rgb(0, 0, 0)");
-
-  g.updateOptions({ axisLabelColor : "red"});
-  assertColor(document.querySelectorAll(".dygraph-axis-label-x"), "rgb(255, 0, 0)"); 
-  assertColor(document.querySelectorAll(".dygraph-axis-label-y"), "rgb(255, 0, 0)"); 
-
-  g.updateOptions({
-    axisLabelColor : null,
-    axes : { 
-      x : { axisLabelColor : "blue" },
-    }   
-  }); 
-
-  assertColor(document.querySelectorAll(".dygraph-axis-label-x"), "rgb(0, 0, 255)"); 
-  assertColor(document.querySelectorAll(".dygraph-axis-label-y"), "rgb(0, 0, 0)");
-
-  g.updateOptions({
-    axes : { 
-      y : { axisLabelColor : "green" },
-    }   
-  }); 
-
-  assertColor(document.querySelectorAll(".dygraph-axis-label-x"), "rgb(0, 0, 255)"); 
-  assertColor(document.querySelectorAll(".dygraph-axis-label-y"), "rgb(0, 128, 0)"); 
-
-  g.updateOptions({
-    series : { 
-      Y2 : { axis : "y2" } // copy y2 series to y2 axis.
-    },  
-    axes : { 
-      y2 : { axisLabelColor : "yellow" },
-    }   
-  }); 
-
-  assertColor(document.querySelectorAll(".dygraph-axis-label-x"), "rgb(0, 0, 255)"); 
-  assertColor(document.querySelectorAll(".dygraph-axis-label-y1"), "rgb(0, 128, 0)"); 
-  assertColor(document.querySelectorAll(".dygraph-axis-label-y2"), "rgb(255, 255, 0)"); 
-});
-
-it('testAxisLabelColorNull', function() {
-  var graph = document.getElementById("graph");
-  var g = new Dygraph(graph, simpleData,
-    {
-      axisLabelColor: null
-    });
-
-  var assertColor = function(selector, expected) {
-    Util.assertStyleOfChildren(selector, "color", expected);
-  }
-
-  // Be sure we're dealing with a 14-point default.
-  assert.equal(14, DEFAULT_ATTRS.axisLabelFontSize);
-
-  assertColor(document.querySelectorAll(".dygraph-axis-label-x"), "rgb(0, 0, 0)");
-  assertColor(document.querySelectorAll(".dygraph-axis-label-y"), "rgb(0, 0, 0)");
-});
-
 /*
  * This test shows that the label formatter overrides labelsKMB for all values.
  */

diff --git a/auto_tests/tests/data_api.js b/auto_tests/tests/data_api.js
@@ -4,6 +4,7 @@
  * @author danvdk@gmail.com (Dan Vanderkam)
  */
 import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
 describe("data-api", function() {
 
 cleanupAfterEach();
@@ -99,4 +100,21 @@ it('testGetRowForXDuplicates', function() {
   assert.equal(5, g.getRowForX(9));
 });
 
+// indexFromSeriesName should return a value even if the series is invisible
+// In 1.1.1, if you request the last set and it's invisible, the method returns undefined.
+it('testIndexFromSetNameOnInvisibleSet', function() {
+
+  var localOpts = utils.clone(opts);
+  localOpts.visibility = [true, false];
+
+  var g = new Dygraph(graphDiv, [
+    "x,y1,y2",
+    "1,1,1",
+    "2,2,2",
+    "3,3,3"
+  ].join('\n'), localOpts);
+
+  assert.equal(2, g.indexFromSetName("y2"));
+});
+
 });
diff --git a/auto_tests/tests/data_types.js b/auto_tests/tests/data_types.js
@@ -0,0 +1,34 @@
+/** 
+ * @fileoverview Test cases for DygraphOptions.
+ */
+
+import Dygraph from '../../src/dygraph';
+
+describe("dygraph-data-types", function() {
+
+  cleanupAfterEach();
+
+  var graph;
+
+  beforeEach(function() {
+    graph = document.getElementById("graph");
+  });
+
+  /*
+   * Test to ensure ints are correctly interpreted as ints and not as dates
+   */
+  it('testNumberOfData', function() {
+    var opts = {
+      width: 480,
+      height: 320
+    };
+    var data = "x	y\n" +
+      "20033000	1\n" +
+      "20034000	2\n" +
+      "20035000	3\n" +
+      "20036000	4";
+
+    var g = new Dygraph(graph, data, opts);
+    assert.deepEqual(4, g.rawData_.length); 
+  });
+});
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,5 @@ env @@
     dist
     coverage
     *.log
+    *.pyc
+    src-es5