X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-options.js;h=6889a09b9265c991ab47212ae01fc28877dd4ad1;hb=794e4d006192940a44e2678cb570392017dc9361;hp=78b556b48917f8f345a030a48308404423d516bd;hpb=36db726360ab1f9ddb7a1fe5528d6c073c5f85a5;p=dygraphs.git diff --git a/dygraph-options.js b/dygraph-options.js index 78b556b..6889a09 100644 --- a/dygraph-options.js +++ b/dygraph-options.js @@ -1,4 +1,10 @@ /** + * @license + * Copyright 2011 Dan Vanderkam (danvdk@gmail.com) + * MIT-licensed (http://opensource.org/licenses/MIT) + */ + +/** * @fileoverview DygraphOptions is responsible for parsing and returning information about options. * * Still tightly coupled to Dygraphs, we could remove some of that, you know. @@ -84,7 +90,7 @@ DygraphOptions.axisToIndex_ = function(axis) { /** * Reparses options that are all related to series. This typically occurs when - * options are either updated, or source data has been made avaialble. + * options are either updated, or source data has been made available. * * TODO(konigsberg): The method name is kind of weak; fix. */ @@ -94,7 +100,7 @@ DygraphOptions.prototype.reparseSeries = function() { return; // -- can't do more for now, will parse after getting the labels. } - this.labels = labels.slice(1); + this.labels_ = labels.slice(1); this.yAxes_ = [ { series : [], options : {}} ]; // Always one axis at least. this.xAxis_ = { options : {} }; @@ -127,8 +133,8 @@ DygraphOptions.prototype.reparseSeries = function() { 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]; + for (var idx = 0; idx < this.labels_.length; idx++) { + var seriesName = this.labels_[idx]; var optionsForSeries = this.user_[seriesName] || {}; @@ -149,8 +155,8 @@ DygraphOptions.prototype.reparseSeries = function() { // 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]; + for (var idx = 0; idx < this.labels_.length; idx++) { + var seriesName = this.labels_[idx]; var optionsForSeries = this.series_[seriesName]["options"]; var axis = optionsForSeries["axis"]; @@ -166,8 +172,8 @@ DygraphOptions.prototype.reparseSeries = function() { } } } else { - for (var idx = 0; idx < this.labels.length; idx++) { - var seriesName = this.labels[idx]; + 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"]); @@ -199,7 +205,7 @@ DygraphOptions.prototype.reparseSeries = function() { */ DygraphOptions.prototype.get = function(name) { var result = this.getGlobalUser_(name); - if (result != null) { + if (result !== null) { return result; } return this.getGlobalDefault_(name); @@ -237,7 +243,7 @@ DygraphOptions.prototype.getForAxis = function(name, axis) { // Since axis can be a number or a string, straighten everything out here. if (typeof(axis) == 'number') { axisIdx = axis; - axisString = axisIdx == 0 ? "y" : "y2"; + axisString = axisIdx === 0 ? "y" : "y2"; } else { if (axis == "y1") { axis = "y"; } // Standardize on 'y'. Is this bad? I think so. if (axis == "y") { @@ -264,7 +270,7 @@ DygraphOptions.prototype.getForAxis = function(name, axis) { // User-specified global options second. var result = this.getGlobalUser_(name); - if (result != null) { + if (result !== null) { return result; }