X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-options.js;h=98ef35fde3825f7b59e74707717292f90df10d84;hb=335011fd4473f55aaaceb69726d15e0063373149;hp=0f90086cb9abed450124304c55293f0fe0aa2851;hpb=a56954fa618870272634c92a82b895b634d9772d;p=dygraphs.git diff --git a/dygraph-options.js b/dygraph-options.js index 0f90086..98ef35f 100644 --- a/dygraph-options.js +++ b/dygraph-options.js @@ -290,11 +290,13 @@ DygraphOptions.prototype.getForAxis = function(name, axis) { } // User-specified global options second. - var result = this.getGlobalUser_(name); - if (result !== null) { - return result; + // But, hack, ignore globally-specified 'logscale' for 'x' axis declaration. + if (!(axis === 'x' && name === 'logscale')) { + var result = this.getGlobalUser_(name); + if (result !== null) { + return result; + } } - // Default axis options third. var defaultAxisOptions = Dygraph.DEFAULT_ATTRS.axes[axisString]; if (defaultAxisOptions.hasOwnProperty(name)) { @@ -370,15 +372,6 @@ DygraphOptions.prototype.seriesNames = function() { return this.labels_; }; -/* Are we using this? */ -/** - * Return the index of the specified series. - * @param {string} series the series name. - */ -DygraphOptions.prototype.indexOfSeries = function(series) { - return this.series_[series].idx; -}; - return DygraphOptions; })();