X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph.js;h=b4e16e34ffec96318e24585c2446c33c31b31318;hb=1ac31d4e1a292b0355974db9e62a5f1338b278fc;hp=1204271d0c93dfb877458c6768a4d75785819dcf;hpb=285a6bda6e2d77336fb2ae2cc904039a35e8e755;p=dygraphs.git diff --git a/dygraph.js b/dygraph.js index 1204271..b4e16e3 100644 --- a/dygraph.js +++ b/dygraph.js @@ -94,7 +94,11 @@ Dygraph.DEFAULT_ATTRS = { strokeWidth: 1.0, - // TODO(danvk): default padding + axisTickSize: 3, + axisLabelFontSize: 14, + xAxisLabelWidth: 50, + yAxisLabelWidth: 50, + rightGap: 5, showRoller: false, xValueFormatter: Dygraph.dateString_, @@ -149,7 +153,10 @@ Dygraph.prototype.__init__ = function(div, file, attrs) { this.dateWindow_ = attrs.dateWindow || null; this.valueRange_ = attrs.valueRange || null; this.wilsonInterval_ = attrs.wilsonInterval || true; - this.customBars_ = attrs.customBars || false; + + // Clear the div. This ensure that, if multiple dygraphs are passed the same + // div, then only one will be drawn. + div.innerHTML = ""; // If the div isn't already sized then give it a default size. if (div.style.width == '') { @@ -185,29 +192,27 @@ Dygraph.prototype.__init__ = function(div, file, attrs) { // Create the PlotKit grapher // TODO(danvk): why does the Layout need its own set of options? this.layoutOptions_ = { 'errorBars': (this.attr_("errorBars") || - this.customBars_), + this.attr_("customBars")), 'xOriginIsZero': false }; MochiKit.Base.update(this.layoutOptions_, this.attrs_); MochiKit.Base.update(this.layoutOptions_, this.user_attrs_); - this.layout_ = new DygraphLayout(this.layoutOptions_); + this.layout_ = new DygraphLayout(this, this.layoutOptions_); // TODO(danvk): why does the Renderer need its own set of options? this.renderOptions_ = { colorScheme: this.colors_, strokeColor: null, - strokeWidth: this.attr_("strokeWidth"), - axisLabelFontSize: 14, axisLineWidth: Dygraph.AXIS_LINE_WIDTH }; MochiKit.Base.update(this.renderOptions_, this.attrs_); MochiKit.Base.update(this.renderOptions_, this.user_attrs_); - this.plotter_ = new DygraphCanvasRenderer(this.hidden_, this.layout_, + this.plotter_ = new DygraphCanvasRenderer(this, + this.hidden_, this.layout_, this.renderOptions_); this.createStatusMessage_(); this.createRollInterface_(); this.createDragInterface_(); - // connect(window, 'onload', this, function(e) { this.start_(); }); this.start_(); }; @@ -256,7 +261,19 @@ Dygraph.prototype.error = function(message) { */ Dygraph.prototype.rollPeriod = function() { return this.rollPeriod_; -} +}; + +Dygraph.addEvent = function(el, evt, fn) { + var normed_fn = function(e) { + if (!e) var e = window.event; + fn(e); + }; + if (window.addEventListener) { // Mozilla, Netscape, Firefox + el.addEventListener(evt, normed_fn, false); + } else { // IE + el.attachEvent('on' + evt, normed_fn); + } +}; /** * Generates interface elements for the Dygraph: a containing div, a div to @@ -268,27 +285,34 @@ Dygraph.prototype.createInterface_ = function() { // Create the all-enclosing graph div var enclosing = this.maindiv_; - this.graphDiv = MochiKit.DOM.DIV( { style: { 'width': this.width_ + "px", - 'height': this.height_ + "px" - }}); - appendChildNodes(enclosing, this.graphDiv); + this.graphDiv = document.createElement("div"); + this.graphDiv.style.width = this.width_ + "px"; + this.graphDiv.style.height = this.height_ + "px"; + enclosing.appendChild(this.graphDiv); - // Create the canvas to store - var canvas = MochiKit.DOM.CANVAS; - this.canvas_ = canvas( { style: { 'position': 'absolute' }, - width: this.width_, - height: this.height_}); - appendChildNodes(this.graphDiv, this.canvas_); + // Create the canvas for interactive parts of the chart. + this.canvas_ = document.createElement("canvas"); + this.canvas_.style.position = "absolute"; + this.canvas_.width = this.width_; + this.canvas_.height = this.height_; + this.graphDiv.appendChild(this.canvas_); + // ... and for static parts of the chart. this.hidden_ = this.createPlotKitCanvas_(this.canvas_); - connect(this.hidden_, 'onmousemove', this, function(e) { this.mouseMove_(e) }); - connect(this.hidden_, 'onmouseout', this, function(e) { this.mouseOut_(e) }); + + var dygraph = this; + Dygraph.addEvent(this.hidden_, 'mousemove', function(e) { + dygraph.mouseMove_(e); + }); + Dygraph.addEvent(this.hidden_, 'mouseout', function(e) { + dygraph.mouseOut_(e); + }); } /** * Creates the canvas containing the PlotKit graph. Only plotkit ever draws on * this particular canvas. All Dygraph work is done on this.canvas_. - * @param {Object} canvas The Dygraph canvas to over which to overlay the plot + * @param {Object} canvas The Dygraph canvas over which to overlay the plot * @return {Object} The newly-created canvas * @private */ @@ -299,10 +323,42 @@ Dygraph.prototype.createPlotKitCanvas_ = function(canvas) { h.style.left = canvas.style.left; h.width = this.width_; h.height = this.height_; - MochiKit.DOM.appendChildNodes(this.graphDiv, h); + this.graphDiv.appendChild(h); return h; }; +// Taken from MochiKit.Color +Dygraph.hsvToRGB = function (hue, saturation, value) { + var red; + var green; + var blue; + if (saturation === 0) { + red = value; + green = value; + blue = value; + } else { + var i = Math.floor(hue * 6); + var f = (hue * 6) - i; + var p = value * (1 - saturation); + var q = value * (1 - (saturation * f)); + var t = value * (1 - (saturation * (1 - f))); + switch (i) { + case 1: red = q; green = value; blue = p; break; + case 2: red = p; green = value; blue = t; break; + case 3: red = p; green = q; blue = value; break; + case 4: red = t; green = p; blue = value; break; + case 5: red = value; green = p; blue = q; break; + case 6: // fall through + case 0: red = value; green = t; blue = p; break; + } + } + red = Math.floor(255 * red + 0.5); + green = Math.floor(255 * green + 0.5); + blue = Math.floor(255 * blue + 0.5); + return 'rgb(' + red + ',' + green + ',' + blue + ')'; +}; + + /** * Generate a set of distinct colors for the data series. This is done with a * color wheel. Saturation/Value are customizable, and the hue is @@ -321,12 +377,12 @@ Dygraph.prototype.setColors_ = function() { var val = this.attr_('colorValue') || 0.5; for (var i = 1; i <= num; i++) { var hue = (1.0*i/(1+num)); - this.colors_.push( MochiKit.Color.Color.fromHSV(hue, sat, val) ); + this.colors_.push( Dygraph.hsvToRGB(hue, sat, val) ); } } else { for (var i = 0; i < num; i++) { var colorStr = colors[i % colors.length]; - this.colors_.push( MochiKit.Color.Color.fromString(colorStr) ); + this.colors_.push(colorStr); } } @@ -337,6 +393,34 @@ Dygraph.prototype.setColors_ = function() { MochiKit.Base.update(this.layoutOptions_, this.attrs_); } +// The following functions are from quirksmode.org +// http://www.quirksmode.org/js/findpos.html +Dygraph.findPosX = function(obj) { + var curleft = 0; + if (obj.offsetParent) { + while (obj.offsetParent) { + curleft += obj.offsetLeft; + obj = obj.offsetParent; + } + } + else if (obj.x) + curleft += obj.x; + return curleft; +}; + +Dygraph.findPosY = function(obj) { + var curtop = 0; + if (obj.offsetParent) { + while (obj.offsetParent) { + curtop += obj.offsetTop; + obj = obj.offsetParent; + } + } + else if (obj.y) + curtop += obj.y; + return curtop; +}; + /** * Create the div that contains information on the selected point(s) * This goes in the top right of the canvas, unless an external div has already @@ -346,19 +430,22 @@ Dygraph.prototype.setColors_ = function() { Dygraph.prototype.createStatusMessage_ = function(){ if (!this.attr_("labelsDiv")) { var divWidth = this.attr_('labelsDivWidth'); - var messagestyle = { "style": { + var messagestyle = { "position": "absolute", "fontSize": "14px", "zIndex": 10, "width": divWidth + "px", "top": "0px", - "left": this.width_ - divWidth + "px", + "left": (this.width_ - divWidth - 2) + "px", "background": "white", "textAlign": "left", - "overflow": "hidden"}}; - MochiKit.Base.update(messagestyle["style"], this.attr_('labelsDivStyles')); - var div = MochiKit.DOM.DIV(messagestyle); - MochiKit.DOM.appendChildNodes(this.graphDiv, div); + "overflow": "hidden"}; + MochiKit.Base.update(messagestyle, this.attr_('labelsDivStyles')); + var div = document.createElement("div"); + for (var name in messagestyle) { + div.style[name] = messagestyle[name]; + } + this.graphDiv.appendChild(div); this.attrs_.labelsDiv = div; } }; @@ -369,28 +456,56 @@ Dygraph.prototype.createStatusMessage_ = function(){ * @private */ Dygraph.prototype.createRollInterface_ = function() { - var padding = this.plotter_.options.padding; var display = this.attr_('showRoller') ? "block" : "none"; - var textAttr = { "type": "text", - "size": "2", - "value": this.rollPeriod_, - "style": { "position": "absolute", - "zIndex": 10, - "top": (this.height_ - 25 - padding.bottom) + "px", - "left": (padding.left+1) + "px", - "display": display } + var textAttr = { "position": "absolute", + "zIndex": 10, + "top": (this.plotter_.area.h - 25) + "px", + "left": (this.plotter_.area.x + 1) + "px", + "display": display }; - var roller = MochiKit.DOM.INPUT(textAttr); + var roller = document.createElement("input"); + roller.type = "text"; + roller.size = "2"; + roller.value = this.rollPeriod_; + for (var name in textAttr) { + roller.style[name] = textAttr[name]; + } + var pa = this.graphDiv; - MochiKit.DOM.appendChildNodes(pa, roller); - connect(roller, 'onchange', this, - function() { this.adjustRoll(roller.value); }); + pa.appendChild(roller); + var dygraph = this; + roller.onchange = function() { dygraph.adjustRoll(roller.value); }; return roller; -} +}; + +// These functions are taken from MochiKit.Signal +Dygraph.pageX = function(e) { + if (e.pageX) { + return (!e.pageX || e.pageX < 0) ? 0 : e.pageX; + } else { + var de = document; + var b = document.body; + return e.clientX + + (de.scrollLeft || b.scrollLeft) - + (de.clientLeft || 0); + } +}; + +Dygraph.pageY = function(e) { + if (e.pageY) { + return (!e.pageY || e.pageY < 0) ? 0 : e.pageY; + } else { + var de = document; + var b = document.body; + return e.clientY + + (de.scrollTop || b.scrollTop) - + (de.clientTop || 0); + } +}; /** * Set up all the mouse handlers needed to capture dragging behavior for zoom - * events. Uses MochiKit.Signal to attach all the event handlers. + * events. * @private */ Dygraph.prototype.createDragInterface_ = function() { @@ -407,11 +522,11 @@ Dygraph.prototype.createDragInterface_ = function() { // Utility function to convert page-wide coordinates to canvas coords var px = 0; var py = 0; - var getX = function(e) { return e.mouse().page.x - px }; - var getY = function(e) { return e.mouse().page.y - py }; + var getX = function(e) { return Dygraph.pageX(e) - px }; + var getY = function(e) { return Dygraph.pageX(e) - py }; // Draw zoom rectangles when the mouse is down and the user moves around - connect(this.hidden_, 'onmousemove', function(event) { + Dygraph.addEvent(this.hidden_, 'mousemove', function(event) { if (mouseDown) { dragEndX = getX(event); dragEndY = getY(event); @@ -422,17 +537,17 @@ Dygraph.prototype.createDragInterface_ = function() { }); // Track the beginning of drag events - connect(this.hidden_, 'onmousedown', function(event) { + Dygraph.addEvent(this.hidden_, 'mousedown', function(event) { mouseDown = true; - px = PlotKit.Base.findPosX(self.canvas_); - py = PlotKit.Base.findPosY(self.canvas_); + px = Dygraph.findPosX(self.canvas_); + py = Dygraph.findPosY(self.canvas_); dragStartX = getX(event); dragStartY = getY(event); }); // If the user releases the mouse button during a drag, but not over the // canvas, then it doesn't count as a zooming action. - connect(document, 'onmouseup', this, function(event) { + Dygraph.addEvent(document, 'mouseup', function(event) { if (mouseDown) { mouseDown = false; dragStartX = null; @@ -441,7 +556,7 @@ Dygraph.prototype.createDragInterface_ = function() { }); // Temporarily cancel the dragging event when the mouse leaves the graph - connect(this.hidden_, 'onmouseout', this, function(event) { + Dygraph.addEvent(this.hidden_, 'mouseout', function(event) { if (mouseDown) { dragEndX = null; dragEndY = null; @@ -450,7 +565,7 @@ Dygraph.prototype.createDragInterface_ = function() { // If the mouse is released on the canvas during a drag event, then it's a // zoom. Only do the zoom if it's over a large enough area (>= 10 pixels) - connect(this.hidden_, 'onmouseup', this, function(event) { + Dygraph.addEvent(this.hidden_, 'mouseup', function(event) { if (mouseDown) { mouseDown = false; dragEndX = getX(event); @@ -480,7 +595,7 @@ Dygraph.prototype.createDragInterface_ = function() { }); // Double-clicking zooms back out - connect(this.hidden_, 'ondblclick', this, function(event) { + Dygraph.addEvent(this.hidden_, 'dblclick', function(event) { self.dateWindow_ = null; self.drawGraph_(self.rawData_); var minDate = self.rawData_[0][0]; @@ -559,7 +674,7 @@ Dygraph.prototype.doZoom_ = function(lowX, highX) { * @private */ Dygraph.prototype.mouseMove_ = function(event) { - var canvasx = event.mouse().page.x - PlotKit.Base.findPosX(this.hidden_); + var canvasx = Dygraph.pageX(event) - Dygraph.findPosX(this.hidden_); var points = this.layout_.points; var lastx = -1; @@ -596,6 +711,8 @@ Dygraph.prototype.mouseMove_ = function(event) { ctx.clearRect(px - circleSize - 1, 0, 2 * circleSize + 2, this.height_); } + var isOK = function(x) { return x && !isNaN(x); }; + if (selPoints.length > 0) { var canvasx = selPoints[0].canvasx; @@ -603,11 +720,13 @@ Dygraph.prototype.mouseMove_ = function(event) { var replace = this.attr_('xValueFormatter')(lastx, this) + ":"; var clen = this.colors_.length; for (var i = 0; i < selPoints.length; i++) { + if (!isOK(selPoints[i].canvasy)) continue; if (this.attr_("labelsSeparateLines")) { replace += "
"; } var point = selPoints[i]; - replace += " " + var c = new RGBColor(this.colors_[i%clen]); + replace += " " + point.name + ":" + this.round_(point.yval, 2); } @@ -619,8 +738,9 @@ Dygraph.prototype.mouseMove_ = function(event) { // Draw colored circles over the center of each selected point ctx.save() for (var i = 0; i < selPoints.length; i++) { + if (!isOK(selPoints[i%clen].canvasy)) continue; ctx.beginPath(); - ctx.fillStyle = this.colors_[i%clen].toRGBString(); + ctx.fillStyle = this.colors_[i%clen]; ctx.arc(canvasx, selPoints[i%clen].canvasy, circleSize, 0, 360, false); ctx.fill(); } @@ -714,7 +834,7 @@ Dygraph.prototype.loadedEvent_ = function(data) { }; Dygraph.prototype.months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; Dygraph.prototype.quarters = ["Jan", "Apr", "Jul", "Oct"]; /** @@ -943,6 +1063,46 @@ Dygraph.prototype.addYTicks_ = function(minY, maxY) { yTicks: ticks } ); }; +// Computes the range of the data series (including confidence intervals). +// series is either [ [x1, y1], [x2, y2], ... ] or +// [ [x1, [y1, dev_low, dev_high]], [x2, [y2, dev_low, dev_high]], ... +// Returns [low, high] +Dygraph.prototype.extremeValues_ = function(series) { + var minY = null, maxY = null; + + var bars = this.attr_("errorBars") || this.attr_("customBars"); + if (bars) { + // With custom bars, maxY is the max of the high values. + for (var j = 0; j < series.length; j++) { + var y = series[j][1][0]; + if (!y) continue; + var low = y - series[j][1][1]; + var high = y + series[j][1][2]; + if (low > y) low = y; // this can happen with custom bars, + if (high < y) high = y; // e.g. in tests/custom-bars.html + if (maxY == null || high > maxY) { + maxY = high; + } + if (minY == null || low < minY) { + minY = low; + } + } + } else { + for (var j = 0; j < series.length; j++) { + var y = series[j][1]; + if (!y) continue; + if (maxY == null || y > maxY) { + maxY = y; + } + if (minY == null || y < minY) { + minY = y; + } + } + } + + return [minY, maxY]; +}; + /** * Update the graph with new data. Data is in the format * [ [date1, val1, val2, ...], [date2, val1, val2, ...] if errorBars=false @@ -952,9 +1112,10 @@ Dygraph.prototype.addYTicks_ = function(minY, maxY) { * @private */ Dygraph.prototype.drawGraph_ = function(data) { - var maxY = null; + var minY = null, maxY = null; this.layout_.removeAllDatasets(); this.setColors_(); + this.attrs_['pointSize'] = 0.5 * this.attr_('highlightCircleSize'); // Loop over all fields in the dataset for (var i = 1; i < data[0].length; i++) { @@ -966,7 +1127,7 @@ Dygraph.prototype.drawGraph_ = function(data) { series = this.rollingAverage(series, this.rollPeriod_); // Prune down to the desired range, if necessary (for zooming) - var bars = this.attr_("errorBars") || this.customBars_; + var bars = this.attr_("errorBars") || this.attr_("customBars"); if (this.dateWindow_) { var low = this.dateWindow_[0]; var high= this.dateWindow_[1]; @@ -974,32 +1135,17 @@ Dygraph.prototype.drawGraph_ = function(data) { for (var k = 0; k < series.length; k++) { if (series[k][0] >= low && series[k][0] <= high) { pruned.push(series[k]); - var y = bars ? series[k][1][0] : series[k][1]; - if (maxY == null || y > maxY) maxY = y; } } series = pruned; - } else { - if (!this.customBars_) { - for (var j = 0; j < series.length; j++) { - var y = bars ? series[j][1][0] : series[j][1]; - if (maxY == null || y > maxY) { - maxY = bars ? y + series[j][1][1] : y; - } - } - } else { - // With custom bars, maxY is the max of the high values. - for (var j = 0; j < series.length; j++) { - var y = series[j][1][0]; - var high = series[j][1][2]; - if (high > y) y = high; - if (maxY == null || y > maxY) { - maxY = y; - } - } - } } + var extremes = this.extremeValues_(series); + var thisMinY = extremes[0]; + var thisMaxY = extremes[1]; + if (!minY || thisMinY < minY) minY = thisMinY; + if (!maxY || thisMaxY > maxY) maxY = thisMaxY; + if (bars) { var vals = []; for (var j=0; j= 0) minAxisY = 0; + if (maxAxisY > 0 && maxY <= 0) maxAxisY = 0; + + if (this.attr_("includeZero")) { + if (maxY < 0) maxAxisY = 0; + if (minY > 0) minAxisY = 0; + } + + this.addYTicks_(minAxisY, maxAxisY); } this.addXTicks_(); @@ -1087,7 +1244,7 @@ Dygraph.prototype.rollingAverage = function(originalData, rollPeriod) { rollingData[i] = [date, mult * value]; } } - } else if (this.customBars_) { + } else if (this.attr_("customBars")) { var low = 0; var mid = 0; var high = 0; @@ -1117,46 +1274,45 @@ Dygraph.prototype.rollingAverage = function(originalData, rollPeriod) { // there is not enough data to roll over the full number of days var num_init_points = Math.min(rollPeriod - 1, originalData.length - 2); if (!this.attr_("errorBars")){ - for (var i = 0; i < num_init_points; i++) { - var sum = 0; - for (var j = 0; j < i + 1; j++) - sum += originalData[j][1]; - rollingData[i] = [originalData[i][0], sum / (i + 1)]; + if (rollPeriod == 1) { + return originalData; } - // Calculate the rolling average for the remaining points - for (var i = Math.min(rollPeriod - 1, originalData.length - 2); - i < originalData.length; - i++) { + + for (var i = 0; i < originalData.length; i++) { var sum = 0; - for (var j = i - rollPeriod + 1; j < i + 1; j++) + var num_ok = 0; + for (var j = Math.max(0, i - rollPeriod + 1); j < i + 1; j++) { + var y = originalData[j][1]; + if (!y || isNaN(y)) continue; + num_ok++; sum += originalData[j][1]; - rollingData[i] = [originalData[i][0], sum / rollPeriod]; + } + if (num_ok) { + rollingData[i] = [originalData[i][0], sum / num_ok]; + } else { + rollingData[i] = [originalData[i][0], null]; + } } + } else { - for (var i = 0; i < num_init_points; i++) { + for (var i = 0; i < originalData.length; i++) { var sum = 0; var variance = 0; - for (var j = 0; j < i + 1; j++) { + var num_ok = 0; + for (var j = Math.max(0, i - rollPeriod + 1); j < i + 1; j++) { + var y = originalData[j][1][0]; + if (!y || isNaN(y)) continue; + num_ok++; sum += originalData[j][1][0]; variance += Math.pow(originalData[j][1][1], 2); } - var stddev = Math.sqrt(variance)/(i+1); - rollingData[i] = [originalData[i][0], - [sum/(i+1), sigma * stddev, sigma * stddev]]; - } - // Calculate the rolling average for the remaining points - for (var i = Math.min(rollPeriod - 1, originalData.length - 2); - i < originalData.length; - i++) { - var sum = 0; - var variance = 0; - for (var j = i - rollPeriod + 1; j < i + 1; j++) { - sum += originalData[j][1][0]; - variance += Math.pow(originalData[j][1][1], 2); + if (num_ok) { + var stddev = Math.sqrt(variance) / num_ok; + rollingData[i] = [originalData[i][0], + [sum / num_ok, sigma * stddev, sigma * stddev]]; + } else { + rollingData[i] = [originalData[i][0], [null, null, null]]; } - var stddev = Math.sqrt(variance) / rollPeriod; - rollingData[i] = [originalData[i][0], - [sum / rollPeriod, sigma * stddev, sigma * stddev]]; } } } @@ -1281,7 +1437,7 @@ Dygraph.prototype.parseCSV_ = function(data) { for (var j = 1; j < inFields.length; j += 2) fields[(j + 1) / 2] = [parseFloat(inFields[j]), parseFloat(inFields[j + 1])]; - } else if (this.customBars_) { + } else if (this.attr_("customBars")) { // Bars are a low;center;high tuple for (var j = 1; j < inFields.length; j++) { var vals = inFields[j].split(";"); @@ -1386,12 +1542,12 @@ Dygraph.prototype.parseDataTable_ = function(data) { this.attrs_.xValueFormatter = Dygraph.dateString_; this.attrs_.xValueParser = Dygraph.dateParser; this.attrs_.xTicker = Dygraph.dateTicker; - } else if (indepType != 'number') { + } else if (indepType == 'number') { this.attrs_.xValueFormatter = function(x) { return x; }; this.attrs_.xValueParser = function(x) { return parseFloat(x); }; this.attrs_.xTicker = Dygraph.numericTicks; } else { - this.error("only 'date' and 'number' types are supported for column 1" + + this.error("only 'date' and 'number' types are supported for column 1 " + "of DataTable input (Got '" + indepType + "')"); return null; } @@ -1399,6 +1555,7 @@ Dygraph.prototype.parseDataTable_ = function(data) { var ret = []; for (var i = 0; i < rows; i++) { var row = []; + if (!data.getValue(i, 0)) continue; if (indepType == 'date') { row.push(data.getValue(i, 0).getTime()); } else { @@ -1462,9 +1619,6 @@ Dygraph.prototype.start_ = function() { */ Dygraph.prototype.updateOptions = function(attrs) { // TODO(danvk): this is a mess. Rethink this function. - if (attrs.customBars) { - this.customBars_ = attrs.customBars; - } if (attrs.rollPeriod) { this.rollPeriod_ = attrs.rollPeriod; }