projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BUG FIX: Fixed indentation in respect to the jslint rules.
[dygraphs.git]
/
plugins
/
range-selector.js
diff --git
a/plugins/range-selector.js
b/plugins/range-selector.js
index
fd5d791
..
797140c
100644
(file)
--- a/
plugins/range-selector.js
+++ b/
plugins/range-selector.js
@@
-1,8
+1,9
@@
/**
* @license
/**
* @license
- * Copyright 201
3
Paul Felix (paul.eric.felix@gmail.com)
+ * Copyright 201
1
Paul Felix (paul.eric.felix@gmail.com)
* MIT-licensed (http://opensource.org/licenses/MIT)
*/
* MIT-licensed (http://opensource.org/licenses/MIT)
*/
+/*global Dygraph:false,TouchEvent:false */
/**
* @fileoverview This file contains the RangeSelector plugin used to provide
/**
* @fileoverview This file contains the RangeSelector plugin used to provide
@@
-15,9
+16,10
@@
Dygraph.Plugins.RangeSelector = (function() {
/*global Dygraph:false */
"use strict";
/*global Dygraph:false */
"use strict";
-var NOT_CREATED = 0;
-var CREATED = 1<<0;
-var ADDED_TO_GRAPH = 1<<1;
+// Range selector status values
+var NOT_CREATED = 0; // Range selector interface has not been created
+var CREATED = 1 << 0; // Range selector interface has been created
+var ADDED_TO_GRAPH = 1 << 1; // Range selector elements have been added to the graph
var rangeSelector = function() {
this.isIE_ = /MSIE/.test(navigator.userAgent) && !window.opera;
var rangeSelector = function() {
this.isIE_ = /MSIE/.test(navigator.userAgent) && !window.opera;
@@
-32,9
+34,10
@@
rangeSelector.prototype.toString = function() {
rangeSelector.prototype.activate = function(dygraph) {
this.dygraph_ = dygraph;
rangeSelector.prototype.activate = function(dygraph) {
this.dygraph_ = dygraph;
- this.layout_ = this.dygraph_.layout_;
+ this.layout_ = dygraph.layout_;
+ this.graphDiv_ = dygraph.graphDiv;
this.isUsingExcanvas_ = dygraph.isUsingExcanvas_;
this.isUsingExcanvas_ = dygraph.isUsingExcanvas_;
- if (this.
attr
_('showRangeSelector')) {
+ if (this.
getOption
_('showRangeSelector')) {
this.createInterface_();
}
return {
this.createInterface_();
}
return {
@@
-56,8
+59,12
@@
rangeSelector.prototype.destroy = function() {
// Private methods
//------------------------------------------------------------------
// Private methods
//------------------------------------------------------------------
-rangeSelector.prototype.attr_ = function(name) {
- return this.dygraph_.attr_(name);
+rangeSelector.prototype.getOption_ = function(name) {
+ return this.dygraph_.getOption(name);
+};
+
+rangeSelector.prototype.setDefaultOption_ = function(name, value) {
+ return this.dygraph_.attrs_[name] = value;
};
/**
};
/**
@@
-73,9
+80,9
@@
rangeSelector.prototype.createInterface_ = function() {
this.initInteraction_();
// Range selector and animatedZooms have a bad interaction. See issue 359.
this.initInteraction_();
// Range selector and animatedZooms have a bad interaction. See issue 359.
- if (this.
attr
_('animatedZooms')) {
- this.dygraph_.warn('
You should not set animatedZooms=true when using the range selector
.');
- this.dygraph_.
attrs_.animatedZooms = false
;
+ if (this.
getOption
_('animatedZooms')) {
+ this.dygraph_.warn('
Animated zooms and range selector are not compatible; disabling animatedZooms
.');
+ this.dygraph_.
updateOptions({animatedZooms: false}, true)
;
}
this.addToGraph_();
}
this.addToGraph_();
@@
-87,7
+94,7
@@
rangeSelector.prototype.createInterface_ = function() {
* Adds the range selector to the graph.
*/
rangeSelector.prototype.addToGraph_ = function() {
* Adds the range selector to the graph.
*/
rangeSelector.prototype.addToGraph_ = function() {
- var graphDiv = this.
dygraph_.graphDiv
;
+ var graphDiv = this.
graphDiv_
;
graphDiv.appendChild(this.bgcanvas_);
graphDiv.appendChild(this.fgcanvas_);
graphDiv.appendChild(this.leftZoomHandle_);
graphDiv.appendChild(this.bgcanvas_);
graphDiv.appendChild(this.fgcanvas_);
graphDiv.appendChild(this.leftZoomHandle_);
@@
-100,7
+107,7
@@
rangeSelector.prototype.addToGraph_ = function() {
* Removes the range selector from the graph.
*/
rangeSelector.prototype.removeFromGraph_ = function() {
* Removes the range selector from the graph.
*/
rangeSelector.prototype.removeFromGraph_ = function() {
- var graphDiv = this.
dygraph_.graphDiv
;
+ var graphDiv = this.
graphDiv_
;
graphDiv.removeChild(this.bgcanvas_);
graphDiv.removeChild(this.fgcanvas_);
graphDiv.removeChild(this.leftZoomHandle_);
graphDiv.removeChild(this.bgcanvas_);
graphDiv.removeChild(this.fgcanvas_);
graphDiv.removeChild(this.leftZoomHandle_);
@@
-113,8
+120,8
@@
rangeSelector.prototype.removeFromGraph_ = function() {
* Called by Layout to allow range selector to reserve its space.
*/
rangeSelector.prototype.reserveSpace_ = function(e) {
* Called by Layout to allow range selector to reserve its space.
*/
rangeSelector.prototype.reserveSpace_ = function(e) {
- if (this.
attr
_('showRangeSelector')) {
- e.reserveSpaceBottom(this.
attr
_('rangeSelectorHeight') + 4);
+ if (this.
getOption
_('showRangeSelector')) {
+ e.reserveSpaceBottom(this.
getOption
_('rangeSelectorHeight') + 4);
}
};
}
};
@@
-123,7
+130,7
@@
rangeSelector.prototype.reserveSpace_ = function(e) {
* Renders the static portion of the range selector at the predraw stage.
*/
rangeSelector.prototype.renderStaticLayer_ = function() {
* Renders the static portion of the range selector at the predraw stage.
*/
rangeSelector.prototype.renderStaticLayer_ = function() {
- if (!this.
isEnabled
_()) {
+ if (!this.
updateInterfaceStatus
_()) {
return;
}
this.resize_();
return;
}
this.resize_();
@@
-135,7
+142,7
@@
rangeSelector.prototype.renderStaticLayer_ = function() {
* Renders the interactive portion of the range selector after the chart has been drawn.
*/
rangeSelector.prototype.renderInteractiveLayer_ = function() {
* Renders the interactive portion of the range selector after the chart has been drawn.
*/
rangeSelector.prototype.renderInteractiveLayer_ = function() {
- if (!this.
isEnabled
_() || this.isChangingRange_) {
+ if (!this.
updateInterfaceStatus
_() || this.isChangingRange_) {
return;
}
this.placeZoomHandles_();
return;
}
this.placeZoomHandles_();
@@
-144,10
+151,10
@@
rangeSelector.prototype.renderInteractiveLayer_ = function() {
/**
* @private
/**
* @private
- * Check to see if the range selector is enabled
and needs to be created or added to graph
.
+ * Check to see if the range selector is enabled
/disabled and update interface accordingly
.
*/
*/
-rangeSelector.prototype.
isEnabled
_ = function() {
- var enabled = this.
attr
_('showRangeSelector');
+rangeSelector.prototype.
updateInterfaceStatus
_ = function() {
+ var enabled = this.
getOption
_('showRangeSelector');
if (enabled) {
if (!(this.status_ & CREATED)) {
this.createInterface_();
if (enabled) {
if (!(this.status_ & CREATED)) {
this.createInterface_();
@@
-160,7
+167,7
@@
rangeSelector.prototype.isEnabled_ = function() {
setTimeout(function() { dygraph.width_ = 0; dygraph.resize(); }, 1);
}
return enabled;
setTimeout(function() { dygraph.width_ = 0; dygraph.resize(); }, 1);
}
return enabled;
-}
+}
;
/**
* @private
/**
* @private
@@
-177,12
+184,12
@@
rangeSelector.prototype.resize_ = function() {
}
var plotArea = this.layout_.getPlotArea();
}
var plotArea = this.layout_.getPlotArea();
- var xAxisLabelHeight = this.
attr_('xAxisHeight') || (this.attr_('axisLabelFontSize') + 2 * this.attr
_('axisTickSize'));
+ var xAxisLabelHeight = this.
getOption_('xAxisHeight') || (this.getOption_('axisLabelFontSize') + 2 * this.getOption
_('axisTickSize'));
this.canvasRect_ = {
x: plotArea.x,
y: plotArea.y + plotArea.h + xAxisLabelHeight + 4,
w: plotArea.w,
this.canvasRect_ = {
x: plotArea.x,
y: plotArea.y + plotArea.h + xAxisLabelHeight + 4,
w: plotArea.w,
- h: this.
attr
_('rangeSelectorHeight')
+ h: this.
getOption
_('rangeSelectorHeight')
};
setElementRect(this.bgcanvas_, this.canvasRect_);
};
setElementRect(this.bgcanvas_, this.canvasRect_);
@@
-514,9
+521,8
@@
rangeSelector.prototype.initInteraction_ = function() {
}
};
}
};
- this.dygraph_.attrs_.interactionModel =
- Dygraph.Interaction.dragIsPanInteractionModel;
- this.dygraph_.attrs_.panEdgeFraction = 0.0001;
+ this.setDefaultOption_('interactionModel', Dygraph.Interaction.dragIsPanInteractionModel);
+ this.setDefaultOption_('panEdgeFraction', 0.0001);
var dragStartEvent = window.opera ? 'mousedown' : 'dragstart';
this.dygraph_.addEvent(this.leftZoomHandle_, dragStartEvent, onZoomStart);
var dragStartEvent = window.opera ? 'mousedown' : 'dragstart';
this.dygraph_.addEvent(this.leftZoomHandle_, dragStartEvent, onZoomStart);
@@
-567,13
+573,13
@@
rangeSelector.prototype.drawStaticLayer_ = function() {
* Draws the mini plot in the background canvas.
*/
rangeSelector.prototype.drawMiniPlot_ = function() {
* Draws the mini plot in the background canvas.
*/
rangeSelector.prototype.drawMiniPlot_ = function() {
- var fillStyle = this.
attr
_('rangeSelectorPlotFillColor');
- var strokeStyle = this.
attr
_('rangeSelectorPlotStrokeColor');
+ var fillStyle = this.
getOption
_('rangeSelectorPlotFillColor');
+ var strokeStyle = this.
getOption
_('rangeSelectorPlotStrokeColor');
if (!fillStyle && !strokeStyle) {
return;
}
if (!fillStyle && !strokeStyle) {
return;
}
- var stepPlot = this.
attr
_('stepPlot');
+ var stepPlot = this.
getOption
_('stepPlot');
var combinedSeriesData = this.computeCombinedSeriesAndLimits_();
var yRange = combinedSeriesData.yMax - combinedSeriesData.yMin;
var combinedSeriesData = this.computeCombinedSeriesAndLimits_();
var yRange = combinedSeriesData.yMax - combinedSeriesData.yMin;
@@
-646,7
+652,7
@@
rangeSelector.prototype.drawMiniPlot_ = function() {
*/
rangeSelector.prototype.computeCombinedSeriesAndLimits_ = function() {
var data = this.dygraph_.rawData_;
*/
rangeSelector.prototype.computeCombinedSeriesAndLimits_ = function() {
var data = this.dygraph_.rawData_;
- var logscale = this.
attr
_('logscale');
+ var logscale = this.
getOption
_('logscale');
// Create a combined series (average of all series values).
var combinedSeries = [];
// Create a combined series (average of all series values).
var combinedSeries = [];
@@
-841,8
+847,8
@@
rangeSelector.prototype.drawInteractiveLayer_ = function() {
*/
rangeSelector.prototype.getZoomHandleStatus_ = function() {
var halfHandleWidth = this.leftZoomHandle_.width/2;
*/
rangeSelector.prototype.getZoomHandleStatus_ = function() {
var halfHandleWidth = this.leftZoomHandle_.width/2;
- var leftHandlePos = parse
Int(this.leftZoomHandle_.style.left, 10
) + halfHandleWidth;
- var rightHandlePos = parse
Int(this.rightZoomHandle_.style.left, 10
) + halfHandleWidth;
+ var leftHandlePos = parse
Float(this.leftZoomHandle_.style.left
) + halfHandleWidth;
+ var rightHandlePos = parse
Float(this.rightZoomHandle_.style.left
) + halfHandleWidth;
return {
leftHandlePos: leftHandlePos,
rightHandlePos: rightHandlePos,
return {
leftHandlePos: leftHandlePos,
rightHandlePos: rightHandlePos,