X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph.js;h=27b1b3663b78a5c1962b9b3eb32351a31d575b15;hb=33b5c4b245bf29f3e908931bf70dde00b5fc8a51;hp=06d899a94f1c7b64fb61817cb4afbe1b5c9b015e;hpb=872a6a00621c7e18800f75a384b52b88fe751391;p=dygraphs.git diff --git a/dygraph.js b/dygraph.js index 06d899a..27b1b36 100644 --- a/dygraph.js +++ b/dygraph.js @@ -43,6 +43,9 @@ */ +// For "production" code, this gets set to false by uglifyjs. +if (typeof(DEBUG) === 'undefined') DEBUG=true; + /*jshint globalstrict: true */ /*global DygraphLayout:false, DygraphCanvasRenderer:false, DygraphOptions:false, G_vmlCanvasManager:false,ActiveXObject:false */ "use strict"; @@ -72,7 +75,7 @@ var Dygraph = function(div, data, opts, opt_fourth_param) { // Old versions of dygraphs took in the series labels as a constructor // parameter. This doesn't make sense anymore, but it's easy to continue // to support this usage. - Dygraph.warn("Using deprecated four-argument dygraph constructor"); + console.warn("Using deprecated four-argument dygraph constructor"); this.__old_init__(div, data, opts, opt_fourth_param); } else { this.__init__(div, data, opts); @@ -151,7 +154,7 @@ Dygraph.numberValueFormatter = function(x, opts, pt, g) { k_labels = Dygraph.KMB_LABELS; } if (kmg2) { - if (kmb) Dygraph.warn("Setting both labelsKMB and labelsKMG2. Pick one!"); + if (kmb) console.warn("Setting both labelsKMB and labelsKMG2. Pick one!"); k = 1024; k_labels = Dygraph.KMG2_BIG_LABELS; m_labels = Dygraph.KMG2_SMALL_LABELS; @@ -203,7 +206,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 - * labelsDateUTC option. + * labelsUTC option. * @param {Date} date The date to format * @param {number} granularity One of the Dygraph granularity constants * @param {Dygraph} opts An options view @@ -211,31 +214,22 @@ Dygraph.SHORT_MONTH_NAMES_ = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', ' * @private */ Dygraph.dateAxisLabelFormatter = function(date, granularity, opts) { - var utc = opts('labelsDateUTC'); - var year, month, day, hours, mins, secs, millis; - if (utc) { - year = date.getUTCFullYear(); - month = date.getUTCMonth(); - day = date.getUTCDate(); - hours = date.getUTCHours(); - mins = date.getUTCMinutes(); - secs = date.getUTCSeconds(); - millis = date.getUTCMilliseconds(); - } else { - year = date.getFullYear(); - month = date.getMonth(); - day = date.getDate(); - hours = date.getHours(); - mins = date.getMinutes(); - secs = date.getSeconds(); - millis = date.getMilliseconds(); - } + var utc = opts('labelsUTC'); + var accessors = utc ? Dygraph.DateAccessorsUTC : Dygraph.DateAccessorsLocal; + + var year = accessors.getFullYear(date), + month = accessors.getMonth(date), + day = accessors.getDate(date), + hours = accessors.getHours(date), + mins = accessors.getMinutes(date), + secs = accessors.getSeconds(date), + millis = accessors.getSeconds(date); + if (granularity >= Dygraph.DECADAL) { return '' + year; } else if (granularity >= Dygraph.MONTHLY) { - return Dygraph.SHORT_MONTH_NAMES_[month] + ' ' + Dygraph.zeropad(year % 100); + return Dygraph.SHORT_MONTH_NAMES_[month] + ' ' + year; } else { - // 1e-3 factor on millis missing in original implementation var frac = hours * 3600 + mins * 60 + secs + 1e-3 * millis; if (frac === 0 || granularity >= Dygraph.DAILY) { // e.g. '21Jan' (%d%b) @@ -245,16 +239,18 @@ Dygraph.dateAxisLabelFormatter = function(date, granularity, opts) { } } }; +// alias in case anyone is referencing the old method. +Dygraph.dateAxisFormatter = Dygraph.dateAxisLabelFormatter; /** - * @private * Return a string version of a JS date for a value label. This respects the - * labelsDateUTC option. + * labelsUTC option. * @param {Date} date The date to be formatted * @param {Dygraph} opts An options view + * @private */ Dygraph.dateValueFormatter = function(d, opts) { - return Dygraph.dateString_(d, opts('labelsDateUTC')); + return Dygraph.dateString_(d, opts('labelsUTC')); }; /** @@ -352,6 +348,7 @@ Dygraph.DEFAULT_ATTRS = { rangeSelectorHeight: 40, rangeSelectorPlotStrokeColor: "#808FAB", rangeSelectorPlotFillColor: "#A7B1C4", + showInRangeSelector: null, // The ordering here ensures that central lines always appear above any // fill bars/error bars. @@ -451,7 +448,7 @@ Dygraph.prototype.__init__ = function(div, file, attrs) { } if (!div) { - Dygraph.error("Constructing dygraph with a non-existent div!"); + console.error("Constructing dygraph with a non-existent div!"); return; } @@ -671,16 +668,16 @@ Dygraph.prototype.toString = function() { * @return { ... } The value of the option. */ Dygraph.prototype.attr_ = function(name, seriesName) { -// - if (typeof(Dygraph.OPTIONS_REFERENCE) === 'undefined') { - Dygraph.error('Must include options reference JS for testing'); - } else if (!Dygraph.OPTIONS_REFERENCE.hasOwnProperty(name)) { - Dygraph.error('Dygraphs is using property ' + name + ', which has no ' + - 'entry in the Dygraphs.OPTIONS_REFERENCE listing.'); - // Only log this error once. - Dygraph.OPTIONS_REFERENCE[name] = true; - } -// + if (DEBUG) { + if (typeof(Dygraph.OPTIONS_REFERENCE) === 'undefined') { + console.error('Must include options reference JS for testing'); + } else if (!Dygraph.OPTIONS_REFERENCE.hasOwnProperty(name)) { + console.error('Dygraphs is using property ' + name + ', which has no ' + + 'entry in the Dygraphs.OPTIONS_REFERENCE listing.'); + // Only log this error once. + Dygraph.OPTIONS_REFERENCE[name] = true; + } + } return seriesName ? this.attributes_.getForSeries(name, seriesName) : this.attributes_.get(name); }; @@ -1627,7 +1624,7 @@ Dygraph.prototype.doZoomXDates_ = function(minDate, maxDate) { var that = this; this.doAnimatedZoom(old_window, new_window, null, null, function() { if (that.getFunctionOption("zoomCallback")) { - that.getFunctionOption("zoomCallback")( + that.getFunctionOption("zoomCallback").call(that, minDate, maxDate, that.yAxisRanges()); } }); @@ -1660,7 +1657,7 @@ Dygraph.prototype.doZoomY_ = function(lowY, highY) { this.doAnimatedZoom(null, null, oldValueRanges, newValueRanges, function() { if (that.getFunctionOption("zoomCallback")) { var xRange = that.xAxisRange(); - that.getFunctionOption("zoomCallback")( + that.getFunctionOption("zoomCallback").call(that, xRange[0], xRange[1], that.yAxisRanges()); } }); @@ -1715,7 +1712,7 @@ Dygraph.prototype.resetZoom = function() { } this.drawGraph_(); if (this.getFunctionOption("zoomCallback")) { - this.getFunctionOption("zoomCallback")( + this.getFunctionOption("zoomCallback").call(this, minDate, maxDate, this.yAxisRanges()); } return; @@ -1758,7 +1755,7 @@ Dygraph.prototype.resetZoom = function() { } } if (that.getFunctionOption("zoomCallback")) { - that.getFunctionOption("zoomCallback")( + that.getFunctionOption("zoomCallback").call(that, minDate, maxDate, that.yAxisRanges()); } }); @@ -1995,7 +1992,7 @@ Dygraph.prototype.mouseMove_ = function(event) { var callback = this.getFunctionOption("highlightCallback"); if (callback && selectionChanged) { - callback(event, + callback.call(this, event, this.lastx_, this.selPoints_, this.lastRow_, @@ -2125,7 +2122,7 @@ Dygraph.prototype.updateSelection_ = function(opt_animFraction) { ctx.lineWidth = this.getNumericOption('strokeWidth', pt.name); ctx.strokeStyle = color; ctx.fillStyle = color; - callback(this, pt.name, ctx, canvasx, pt.canvasy, + callback.call(this, this, pt.name, ctx, canvasx, pt.canvasy, color, circleSize, pt.idx); } ctx.restore(); @@ -2208,10 +2205,10 @@ Dygraph.prototype.setSelection = function(row, opt_seriesName, opt_locked) { */ Dygraph.prototype.mouseOut_ = function(event) { if (this.getFunctionOption("unhighlightCallback")) { - this.getFunctionOption("unhighlightCallback")(event); + this.getFunctionOption("unhighlightCallback").call(this, event); } - if (this.getFunctionOption("hideOverlayOnMouseOut") && !this.lockedSet_) { + if (this.getBooleanOption("hideOverlayOnMouseOut") && !this.lockedSet_) { this.clearSelection(); } }; @@ -2544,6 +2541,7 @@ Dygraph.prototype.gatherDatasets_ = function(rolledSeries, dateWindow) { var extremes = {}; // series name -> [low, high] 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. @@ -2614,7 +2612,11 @@ Dygraph.prototype.gatherDatasets_ = function(rolledSeries, dateWindow) { seriesName, boundaryIds[seriesIdx-1][0]); if (this.getBooleanOption("stackedGraph")) { - Dygraph.stackPoints_(seriesPoints, cumulativeYval, seriesExtremes, + axisIdx = this.attributes_.axisForSeries(seriesName); + if (cumulativeYval[axisIdx] === undefined) { + cumulativeYval[axisIdx] = []; + } + Dygraph.stackPoints_(seriesPoints, cumulativeYval[axisIdx], seriesExtremes, this.getBooleanOption("stackedGraphNaNFill")); } @@ -2675,7 +2677,7 @@ Dygraph.prototype.drawGraph_ = function() { if (this.getStringOption("timingName")) { var end = new Date(); - Dygraph.info(this.getStringOption("timingName") + " - drawGraph: " + (end - start) + "ms"); + console.log(this.getStringOption("timingName") + " - drawGraph: " + (end - start) + "ms"); } }; @@ -2692,7 +2694,7 @@ Dygraph.prototype.renderGraph_ = function(is_initial_draw) { if (this.getFunctionOption('underlayCallback')) { // NOTE: we pass the dygraph object to this callback twice to avoid breaking // users who expect a deprecated form of this callback. - this.getFunctionOption('underlayCallback')( + this.getFunctionOption('underlayCallback').call(this, this.hidden_ctx_, this.layout_.getPlotArea(), this, this); } @@ -3097,7 +3099,7 @@ Dygraph.prototype.parseCSV_ = function(data) { // TODO(danvk): figure out an appropriate way to flag parse errors. vals = inFields[j].split("/"); if (vals.length != 2) { - Dygraph.error('Expected fractional "num/den" values in CSV data ' + + console.error('Expected fractional "num/den" values in CSV data ' + "but found a value '" + inFields[j] + "' on line " + (1 + i) + " ('" + line + "') which is not of this form."); fields[j] = [0, 0]; @@ -3109,7 +3111,7 @@ Dygraph.prototype.parseCSV_ = function(data) { } else if (this.getBooleanOption("errorBars")) { // If there are error bars, values are (value, stddev) pairs if (inFields.length % 2 != 1) { - Dygraph.error('Expected alternating (value, stdev.) pairs in CSV data ' + + console.error('Expected alternating (value, stdev.) pairs in CSV data ' + 'but line ' + (1 + i) + ' has an odd number of values (' + (inFields.length - 1) + "): '" + line + "'"); } @@ -3130,7 +3132,7 @@ Dygraph.prototype.parseCSV_ = function(data) { Dygraph.parseFloat_(vals[1], i, line), Dygraph.parseFloat_(vals[2], i, line) ]; } else { - Dygraph.warn('When using customBars, values must be either blank ' + + console.warn('When using customBars, values must be either blank ' + 'or "low;center;high" tuples (got "' + val + '" on line ' + (1+i)); } @@ -3147,7 +3149,7 @@ Dygraph.prototype.parseCSV_ = function(data) { } if (fields.length != expectedCols) { - Dygraph.error("Number of columns in line " + i + " (" + fields.length + + console.error("Number of columns in line " + i + " (" + fields.length + ") does not agree with number of labels (" + expectedCols + ") " + line); } @@ -3162,7 +3164,7 @@ Dygraph.prototype.parseCSV_ = function(data) { if (fields[j]) all_null = false; } if (all_null) { - Dygraph.warn("The dygraphs 'labels' option is set, but the first row " + + console.warn("The dygraphs 'labels' option is set, but the first row " + "of CSV data ('" + line + "') appears to also contain " + "labels. Will drop the CSV labels and use the option " + "labels."); @@ -3173,7 +3175,7 @@ Dygraph.prototype.parseCSV_ = function(data) { } if (outOfOrder) { - Dygraph.warn("CSV is out of order; order it correctly to speed loading."); + console.warn("CSV is out of order; order it correctly to speed loading."); ret.sort(function(a,b) { return a[0] - b[0]; }); } @@ -3191,17 +3193,17 @@ Dygraph.prototype.parseCSV_ = function(data) { Dygraph.prototype.parseArray_ = function(data) { // Peek at the first x value to see if it's numeric. if (data.length === 0) { - Dygraph.error("Can't plot empty data set"); + console.error("Can't plot empty data set"); return null; } if (data[0].length === 0) { - Dygraph.error("Data set cannot contain an empty row"); + console.error("Data set cannot contain an empty row"); return null; } var i; if (this.attr_("labels") === null) { - Dygraph.warn("Using default labels. Set labels explicitly via 'labels' " + + console.warn("Using default labels. Set labels explicitly via 'labels' " + "in the options parameter"); this.attrs_.labels = [ "X" ]; for (i = 1; i < data[0].length; i++) { @@ -3211,7 +3213,7 @@ Dygraph.prototype.parseArray_ = function(data) { } else { var num_labels = this.attr_("labels"); if (num_labels.length != data[0].length) { - Dygraph.error("Mismatch between number of labels (" + num_labels + ")" + + console.error("Mismatch between number of labels (" + num_labels + ")" + " and number of columns in array (" + data[0].length + ")"); return null; } @@ -3227,13 +3229,13 @@ Dygraph.prototype.parseArray_ = function(data) { var parsedData = Dygraph.clone(data); for (i = 0; i < data.length; i++) { if (parsedData[i].length === 0) { - Dygraph.error("Row " + (1 + i) + " of data is empty"); + console.error("Row " + (1 + i) + " of data is empty"); return null; } if (parsedData[i][0] === null || typeof(parsedData[i][0].getTime) != 'function' || isNaN(parsedData[i][0].getTime())) { - Dygraph.error("x value in row " + (1 + i) + " is not a Date"); + console.error("x value in row " + (1 + i) + " is not a Date"); return null; } parsedData[i][0] = parsedData[i][0].getTime(); @@ -3287,7 +3289,7 @@ Dygraph.prototype.parseDataTable_ = function(data) { this.attrs_.axes.x.ticker = Dygraph.numericTicks; this.attrs_.axes.x.axisLabelFormatter = this.attrs_.axes.x.valueFormatter; } else { - Dygraph.error("only 'date', 'datetime' and 'number' types are supported " + + console.error("only 'date', 'datetime' and 'number' types are supported " + "for column 1 of DataTable input (Got '" + indepType + "')"); return null; } @@ -3311,7 +3313,7 @@ Dygraph.prototype.parseDataTable_ = function(data) { } hasAnnotations = true; } else { - Dygraph.error("Only 'number' is supported as a dependent type with Gviz." + + console.error("Only 'number' is supported as a dependent type with Gviz." + " 'string' is only supported if displayAnnotations is true"); } } @@ -3333,7 +3335,7 @@ Dygraph.prototype.parseDataTable_ = function(data) { var row = []; if (typeof(data.getValue(i, 0)) === 'undefined' || data.getValue(i, 0) === null) { - Dygraph.warn("Ignoring row " + i + + console.warn("Ignoring row " + i + " of DataTable because of undefined or null first column."); continue; } @@ -3379,7 +3381,7 @@ Dygraph.prototype.parseDataTable_ = function(data) { } if (outOfOrder) { - Dygraph.warn("DataTable is out of order; order it correctly to speed loading."); + console.warn("DataTable is out of order; order it correctly to speed loading."); ret.sort(function(a,b) { return a[0] - b[0]; }); } this.rawData_ = ret; @@ -3441,7 +3443,7 @@ Dygraph.prototype.start_ = function() { req.send(null); } } else { - Dygraph.error("Unknown data format: " + (typeof data)); + console.error("Unknown data format: " + (typeof data)); } }; @@ -3532,7 +3534,7 @@ Dygraph.mapLegacyOptions_ = function(attrs) { }; var map = function(opt, axis, new_opt) { if (typeof(attrs[opt]) != 'undefined') { - Dygraph.warn("Option " + opt + " is deprecated. Use the " + + console.warn("Option " + opt + " is deprecated. Use the " + new_opt + " option for the " + axis + " axis instead. " + "(e.g. { axes : { " + axis + " : { " + new_opt + " : ... } } } " + "(see http://dygraphs.com/per-axis.html for more information."); @@ -3575,7 +3577,7 @@ Dygraph.prototype.resize = function(width, height) { this.resize_lock = true; if ((width === null) != (height === null)) { - Dygraph.warn("Dygraph.resize() should be called with zero parameters or " + + console.warn("Dygraph.resize() should be called with zero parameters or " + "two non-NULL parameters. Pretending it was zero."); width = height = null; } @@ -3638,7 +3640,7 @@ Dygraph.prototype.visibility = function() { Dygraph.prototype.setVisibility = function(num, value) { var x = this.visibility(); if (num < 0 || num >= x.length) { - Dygraph.warn("invalid series number in setVisibility: " + num); + console.warn("invalid series number in setVisibility: " + num); } else { x[num] = value; this.predraw_(); @@ -3666,7 +3668,7 @@ Dygraph.prototype.setAnnotations = function(ann, suppressDraw) { Dygraph.addAnnotationRule(); this.annotations_ = ann; if (!this.layout_) { - Dygraph.warn("Tried to setAnnotations before dygraph was ready. " + + console.warn("Tried to setAnnotations before dygraph was ready. " + "Try setting them in a ready() block. See " + "dygraphs.com/tests/annotation.html"); return; @@ -3720,7 +3722,7 @@ Dygraph.prototype.ready = function(callback) { if (this.is_initial_draw_) { this.readyFns_.push(callback); } else { - callback(this); + callback.call(this, this); } }; @@ -3763,5 +3765,5 @@ Dygraph.addAnnotationRule = function() { } } - Dygraph.warn("Unable to add default annotation CSS rule; display may be off."); + console.warn("Unable to add default annotation CSS rule; display may be off."); };