X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=plugins%2Frange-selector.js;h=fe32b1a26276bb04a24cf4bae4a5b94a23c6966e;hb=2374e3cf3594f19d1bcdb7500c3c5290ff40aa6b;hp=09c98bb8f214c8b06af7b8db4d959a1a89489240;hpb=e1242d5b540803a1848481ce75932a85693de74c;p=dygraphs.git diff --git a/plugins/range-selector.js b/plugins/range-selector.js index 09c98bb..fe32b1a 100644 --- a/plugins/range-selector.js +++ b/plugins/range-selector.js @@ -268,7 +268,7 @@ rangeSelector.prototype.createZoomHandles_ = function() { */ rangeSelector.prototype.initInteraction_ = function() { var self = this; - var topElem = this.isIE_ ? document : window; + var topElem = document; var clientXLast = 0; var handle = null; var isZooming = false; @@ -541,11 +541,11 @@ rangeSelector.prototype.initInteraction_ = function() { rangeSelector.prototype.drawStaticLayer_ = function() { var ctx = this.bgcanvas_ctx_; ctx.clearRect(0, 0, this.canvasRect_.w, this.canvasRect_.h); - // try { + try { this.drawMiniPlot_(); - // } catch(ex) { - // Dygraph.warn(ex); - // } + } catch(ex) { + Dygraph.warn(ex); + } var margin = 0.5; this.bgcanvas_ctx_.lineWidth = 1; @@ -645,21 +645,16 @@ rangeSelector.prototype.drawMiniPlot_ = function() { */ rangeSelector.prototype.computeCombinedSeriesAndLimits_ = function() { var g = this.dygraph_; - var data = g.rawData_; var logscale = this.getOption_('logscale'); // Create a combined series (average of all series values). - var sum; - var count; - var mutipleValues; - var i, j, k; - var xVal, yVal; + var i; // TODO(danvk): short-circuit if there's only one series. var rolledSeries = []; var dataHandler = g.dataHandler_; var options = g.attributes_; - for (var i = 1; i < g.numColumns(); i++) { + for (i = 1; i < g.numColumns(); i++) { var series = dataHandler.extractSeries(g.rawData_, i, options); if (g.rollPeriod() > 1) { series = dataHandler.rollingAverage(series, g.rollPeriod(), options); @@ -672,7 +667,7 @@ rangeSelector.prototype.computeCombinedSeriesAndLimits_ = function() { for (i = 0; i < rolledSeries[0].length; i++) { var sum = 0; var count = 0; - for (j = 0; j < rolledSeries.length; j++) { + for (var j = 0; j < rolledSeries.length; j++) { var y = rolledSeries[j][i][1]; if (y === null || isNaN(y)) continue; count++; @@ -685,7 +680,7 @@ rangeSelector.prototype.computeCombinedSeriesAndLimits_ = function() { var yMin = Number.MAX_VALUE; var yMax = -Number.MAX_VALUE; for (i = 0; i < combinedSeries.length; i++) { - yVal = combinedSeries[i][1]; + var yVal = combinedSeries[i][1]; if (yVal !== null && isFinite(yVal) && (!logscale || yVal > 0)) { yMin = Math.min(yMin, yVal); yMax = Math.max(yMax, yVal);