projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
copy over lots of changes from "shrink" branch.
[dygraphs.git]
/
plugins
/
range-selector.js
diff --git
a/plugins/range-selector.js
b/plugins/range-selector.js
index
f00a87d
..
438528c
100644
(file)
--- a/
plugins/range-selector.js
+++ b/
plugins/range-selector.js
@@
-74,7
+74,7
@@
rangeSelector.prototype.createInterface_ = function() {
// Range selector and animatedZooms have a bad interaction. See issue 359.
if (this.getOption_('animatedZooms')) {
// Range selector and animatedZooms have a bad interaction. See issue 359.
if (this.getOption_('animatedZooms')) {
-
this.dygraph_
.warn('Animated zooms and range selector are not compatible; disabling animatedZooms.');
+
Dygraph
.warn('Animated zooms and range selector are not compatible; disabling animatedZooms.');
this.dygraph_.updateOptions({animatedZooms: false}, true);
}
this.dygraph_.updateOptions({animatedZooms: false}, true);
}
@@
-176,7
+176,11
@@
rangeSelector.prototype.resize_ = function() {
}
var plotArea = this.dygraph_.layout_.getPlotArea();
}
var plotArea = this.dygraph_.layout_.getPlotArea();
- var xAxisLabelHeight = this.getOption_('xAxisHeight') || (this.getOption_('axisLabelFontSize') + 2 * this.getOption_('axisTickSize'));
+
+ var xAxisLabelHeight = 0;
+ if (this.dygraph_.getOptionForAxis('drawAxis', 'x')) {
+ xAxisLabelHeight = this.getOption_('xAxisHeight') || (this.getOption_('axisLabelFontSize') + 2 * this.getOption_('axisTickSize'));
+ }
this.canvasRect_ = {
x: plotArea.x,
y: plotArea.y + plotArea.h + xAxisLabelHeight + 4,
this.canvasRect_ = {
x: plotArea.x,
y: plotArea.y + plotArea.h + xAxisLabelHeight + 4,