X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph.js;h=49ae2e55a94ae64913dc53faaee8627f83cf3faf;hb=fb24d32c887622ecb16c61006e07c7fad31fefdf;hp=2966316ef101ebb965c2bd6e554f8578d8e4d72e;hpb=05f0c949e08dc94bb8cbaab4502a9e7c547c6d81;p=dygraphs.git diff --git a/dygraph.js b/dygraph.js index 2966316..49ae2e5 100644 --- a/dygraph.js +++ b/dygraph.js @@ -190,7 +190,7 @@ Dygraph.numberValueFormatter = function(x, opts) { * @private */ Dygraph.numberAxisLabelFormatter = function(x, granularity, opts) { - return Dygraph.numberValueFormatter(x, opts); + return Dygraph.numberValueFormatter.call(this, x, opts); }; /** @@ -203,7 +203,7 @@ Dygraph.SHORT_MONTH_NAMES_ = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', ' /** * Convert a JS date to a string appropriate to display on an axis that - * is displaying values at the stated granularity. This respects the + * is displaying values at the stated granularity. This respects the * labelsUTC option. * @param {Date} date The date to format * @param {number} granularity One of the Dygraph granularity constants @@ -241,7 +241,7 @@ Dygraph.dateAxisLabelFormatter = function(date, granularity, opts) { Dygraph.dateAxisFormatter = Dygraph.dateAxisLabelFormatter; /** - * Return a string version of a JS date for a value label. This respects the + * Return a string version of a JS date for a value label. This respects the * labelsUTC option. * @param {Date} date The date to be formatted * @param {Dygraph} opts An options view @@ -336,7 +336,14 @@ Dygraph.DEFAULT_ATTRS = { showRangeSelector: false, rangeSelectorHeight: 40, rangeSelectorPlotStrokeColor: "#808FAB", + rangeSelectorPlotFillGradientColor: "white", rangeSelectorPlotFillColor: "#A7B1C4", + rangeSelectorBackgroundStrokeColor: "gray", + rangeSelectorBackgroundLineWidth: 1, + rangeSelectorPlotLineWidth:1.5, + rangeSelectorForegroundStrokeColor: "black", + rangeSelectorForegroundLineWidth: 1, + rangeSelectorAlpha: 0.6, showInRangeSelector: null, // The ordering here ensures that central lines always appear above any @@ -1986,7 +1993,7 @@ Dygraph.prototype.mouseMove_ = function(event) { }; /** - * Fetch left offset from the specified set index or if not passed, the + * Fetch left offset from the specified set index or if not passed, the * first defined boundaryIds record (see bug #236). * @private */ @@ -2042,6 +2049,7 @@ Dygraph.prototype.animateSelection_ = function(direction) { Dygraph.prototype.updateSelection_ = function(opt_animFraction) { /*var defaultPrevented = */ this.cascadeEvents_('select', { + selectedRow: this.lastRow_, selectedX: this.lastx_, selectedPoints: this.selPoints_ }); @@ -2322,7 +2330,7 @@ Dygraph.prototype.getHandlerClass_ = function() { */ Dygraph.prototype.predraw_ = function() { var start = new Date(); - + // Create the correct dataHandler this.dataHandler_ = new (this.getHandlerClass_())(); @@ -2360,7 +2368,7 @@ Dygraph.prototype.predraw_ = function() { if (this.rollPeriod_ > 1) { series = this.dataHandler_.rollingAverage(series, this.rollPeriod_, this.attributes_); } - + this.rolledSeries_.push(series); } @@ -2519,7 +2527,7 @@ Dygraph.prototype.gatherDatasets_ = function(rolledSeries, dateWindow) { var seriesIdx, sampleIdx; var firstIdx, lastIdx; var axisIdx; - + // Loop over the fields (series). Go from the last to the first, // because if they're stacked that's how we accumulate the values. var num_series = rolledSeries.length - 1; @@ -2537,7 +2545,7 @@ Dygraph.prototype.gatherDatasets_ = function(rolledSeries, dateWindow) { // TODO(danvk): do binary search instead of linear search. // TODO(danvk): pass firstIdx and lastIdx directly to the renderer. - firstIdx = null; + firstIdx = null; lastIdx = null; for (sampleIdx = 0; sampleIdx < series.length; sampleIdx++) { if (series[sampleIdx][0] >= low && firstIdx === null) { @@ -2571,9 +2579,9 @@ Dygraph.prototype.gatherDatasets_ = function(rolledSeries, dateWindow) { if (correctedLastIdx !== lastIdx) { lastIdx = correctedLastIdx; } - + boundaryIds[seriesIdx-1] = [firstIdx, lastIdx]; - + // .slice's end is exclusive, we want to include lastIdx. series = series.slice(firstIdx, lastIdx + 1); } else { @@ -2582,10 +2590,10 @@ Dygraph.prototype.gatherDatasets_ = function(rolledSeries, dateWindow) { } var seriesName = this.attr_("labels")[seriesIdx]; - var seriesExtremes = this.dataHandler_.getExtremeYValues(series, + var seriesExtremes = this.dataHandler_.getExtremeYValues(series, dateWindow, this.getBooleanOption("stepPlot",seriesName)); - var seriesPoints = this.dataHandler_.seriesToPoints(series, + var seriesPoints = this.dataHandler_.seriesToPoints(series, seriesName, boundaryIds[seriesIdx-1][0]); if (this.getBooleanOption("stackedGraph")) { @@ -2800,7 +2808,7 @@ Dygraph.prototype.computeYAxisRanges_ = function(extremes) { }; var numAxes = this.attributes_.numAxes(); var ypadCompat, span, series, ypad; - + var p_axis; // Compute extreme values, a span and tick marks for each axis. @@ -2926,8 +2934,8 @@ Dygraph.prototype.computeYAxisRanges_ = function(extremes) { } else { axis.computedValueRange = axis.extremeRange; } - - + + if (independentTicks) { axis.independentTicks = independentTicks; var opts = this.optionsViewForAxis_('y' + (i ? '2' : '')); @@ -2949,7 +2957,7 @@ Dygraph.prototype.computeYAxisRanges_ = function(extremes) { // independent ticks, then that is permissible as well. for (var i = 0; i < numAxes; i++) { var axis = this.axes_[i]; - + if (!axis.independentTicks) { var opts = this.optionsViewForAxis_('y' + (i ? '2' : '')); var ticker = opts('ticker');