From: Robert Konigsberg Date: Sat, 6 Dec 2014 16:21:56 +0000 (-0500) Subject: Merge branch 'master' into kberg-work X-Git-Tag: v2.0.0~83^2~1 X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=05f0c949e08dc94bb8cbaab4502a9e7c547c6d81;hp=bfb3e0a44ba7eb76704389cd1515db9995944d41;p=dygraphs.git Merge branch 'master' into kberg-work Conflicts: auto_tests/tests/multiple_axes-old.js --- diff --git a/auto_tests/misc/local.html b/auto_tests/misc/local.html index 6549d66..37bda4e 100644 --- a/auto_tests/misc/local.html +++ b/auto_tests/misc/local.html @@ -35,7 +35,6 @@ - diff --git a/auto_tests/tests/per_series.js b/auto_tests/tests/per_series.js index d451b64..b1b672e 100644 --- a/auto_tests/tests/per_series.js +++ b/auto_tests/tests/per_series.js @@ -55,20 +55,6 @@ perSeriesTestCase.prototype.testPerSeriesFill = function() { assertEquals([255,0,0,38], sampler.colorAtCoordinate(6.5, 0.5)); }; -perSeriesTestCase.prototype.testOldStyleSeries = function() { - var opts = { - pointSize : 5, - Y: { pointSize : 4 }, - }; - var graph = document.getElementById("graph"); - var data = "X,Y,Z\n1,0,0\n"; - g = new Dygraph(graph, data, opts); - - assertEquals(5, g.getOption("pointSize")); - assertEquals(4, g.getOption("pointSize", "Y")); - assertEquals(5, g.getOption("pointSize", "Z")); -}; - perSeriesTestCase.prototype.testNewStyleSeries = function() { var opts = { pointSize : 5, @@ -85,29 +71,6 @@ perSeriesTestCase.prototype.testNewStyleSeries = function() { assertEquals(5, g.getOption("pointSize", "Z")); }; -perSeriesTestCase.prototype.testNewStyleSeriesTrumpsOldStyle = function() { - var opts = { - pointSize : 5, - Z : { pointSize : 6 }, - series : { - Y: { pointSize : 4 } - }, - }; - var graph = document.getElementById("graph"); - var data = "X,Y,Z\n1,0,0\n"; - g = new Dygraph(graph, data, opts); - - assertEquals(5, g.getOption("pointSize")); - assertEquals(4, g.getOption("pointSize", "Y")); - assertEquals(5, g.getOption("pointSize", "Z")); - - // Erase the series object, and Z will become visible again. - g.updateOptions({ series : undefined }); - assertEquals(5, g.getOption("pointSize")); - assertEquals(6, g.getOption("pointSize", "Z")); - assertEquals(5, g.getOption("pointSize", "Y")); -}; - // TODO(konigsberg): move to multiple_axes.js perSeriesTestCase.prototype.testAxisInNewSeries = function() { var opts = { diff --git a/auto_tests/tests/range_tests.js b/auto_tests/tests/range_tests.js index c652af7..051c1e3 100644 --- a/auto_tests/tests/range_tests.js +++ b/auto_tests/tests/range_tests.js @@ -228,45 +228,6 @@ RangeTestCase.prototype.testIncludeZeroPerAxis = function() { assertEquals([44, 116], g.yAxisRange(1)); } - -/** - * Verify that includeZero range is properly specified per axis with old axis options. - */ -RangeTestCase.prototype.testIncludeZeroPerAxisOld = function() { - var g = new Dygraph("graph", - 'X,A,B\n' + - '0,50,50\n' + - '50,110,110\n', - { - drawPoints: true, - pointSize: 5, - - A: { - pointSize: 10 - }, - B: { - axis: {} - }, - axes: { - 'y': { includeZero: true }, - 'y2': { includeZero: false } - } - }); - - assertEquals([0, 121], g.yAxisRange(0)); - assertEquals([44, 116], g.yAxisRange(1)); - - g.updateOptions({ - axes: { - 'y': { includeZero: false }, - 'y2': { includeZero: true } - } - }); - - assertEquals([44, 116], g.yAxisRange(0)); - assertEquals([0, 121], g.yAxisRange(1)); -} - /** * Verify that very large Y ranges don't break things. */ diff --git a/dygraph-options-reference.js b/dygraph-options-reference.js index e140784..1a81390 100644 --- a/dygraph-options-reference.js +++ b/dygraph-options-reference.js @@ -759,7 +759,7 @@ Dygraph.OPTIONS_REFERENCE = // "default": "null", "labels": ["Series"], "type": "Object", - "description": "Defines per-series options. Its keys match the y-axis label names, and the values are dictionaries themselves that contain options specific to that series. When this option is missing, it falls back on the old-style of per-series options comingled with global options." + "description": "Defines per-series options. Its keys match the y-axis label names, and the values are dictionaries themselves that contain options specific to that series." }, "plugins": { "default": "[]", diff --git a/dygraph-options.js b/dygraph-options.js index fd6876a..d21ccc1 100644 --- a/dygraph-options.js +++ b/dygraph-options.js @@ -135,16 +135,7 @@ DygraphOptions.prototype.reparseSeries = function() { this.xAxis_ = { options : {} }; this.series_ = {}; - // Traditionally, per-series options were specified right up there with the options. For instance - // { - // labels: [ "X", "foo", "bar" ], - // pointSize: 3, - // foo : {}, // options for foo - // bar : {} // options for bar - // } - // - // Moving forward, series really should be specified in the series element, separating them. - // like so: + // Series are specified in the series element: // // { // labels: [ "X", "foo", "bar" ], @@ -155,67 +146,23 @@ DygraphOptions.prototype.reparseSeries = function() { // } // } // - // So, if series is found, it's expected to contain per-series data, otherwise we fall - // back. - var oldStyleSeries = !this.user_["series"]; - - if (oldStyleSeries) { - var axisId = 0; // 0-offset; there's always one. - // Go through once, add all the series, and for those with {} axis options, add a new axis. - for (var idx = 0; idx < this.labels_.length; idx++) { - var seriesName = this.labels_[idx]; - - var optionsForSeries = this.user_[seriesName] || {}; - - var yAxis = 0; - var axis = optionsForSeries["axis"]; - if (typeof(axis) == 'object') { - yAxis = ++axisId; - this.yAxes_[yAxis] = { series : [ seriesName ], options : axis }; - } - - // Associate series without axis options with axis 0. - if (!axis) { // undefined - this.yAxes_[0].series.push(seriesName); - } - - this.series_[seriesName] = { idx: idx, yAxis: yAxis, options : optionsForSeries }; - } - - // Go through one more time and assign series to an axis defined by another - // series, e.g. { 'Y1: { axis: {} }, 'Y2': { axis: 'Y1' } } - for (var idx = 0; idx < this.labels_.length; idx++) { - var seriesName = this.labels_[idx]; - var optionsForSeries = this.series_[seriesName]["options"]; - var axis = optionsForSeries["axis"]; - - if (typeof(axis) == 'string') { - if (!this.series_.hasOwnProperty(axis)) { - console.error("Series " + seriesName + " wants to share a y-axis with " + - "series " + axis + ", which does not define its own axis."); - return; - } - var yAxis = this.series_[axis].yAxis; - this.series_[seriesName].yAxis = yAxis; - this.yAxes_[yAxis].series.push(seriesName); - } - } - } else { - for (var idx = 0; idx < this.labels_.length; idx++) { - var seriesName = this.labels_[idx]; - var optionsForSeries = this.user_.series[seriesName] || {}; - var yAxis = DygraphOptions.axisToIndex_(optionsForSeries["axis"]); - - this.series_[seriesName] = { - idx: idx, - yAxis: yAxis, - options : optionsForSeries }; - - if (!this.yAxes_[yAxis]) { - this.yAxes_[yAxis] = { series : [ seriesName ], options : {} }; - } else { - this.yAxes_[yAxis].series.push(seriesName); - } + // So, if series is found, it's expected to contain per-series data, otherwise set a + // default. + var seriesDict = this.user_.series || {}; + for (var idx = 0; idx < this.labels_.length; idx++) { + var seriesName = this.labels_[idx]; + var optionsForSeries = seriesDict[seriesName] || {}; + var yAxis = DygraphOptions.axisToIndex_(optionsForSeries["axis"]); + + this.series_[seriesName] = { + idx: idx, + yAxis: yAxis, + options : optionsForSeries }; + + if (!this.yAxes_[yAxis]) { + this.yAxes_[yAxis] = { series : [ seriesName ], options : {} }; + } else { + this.yAxes_[yAxis].series.push(seriesName); } }