projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move plugins/unzoom.js -> extras/unzoom.js
[dygraphs.git]
/
dygraph.js
diff --git
a/dygraph.js
b/dygraph.js
index
f0ced90
..
ecbbca7
100644
(file)
--- a/
dygraph.js
+++ b/
dygraph.js
@@
-44,7
+44,7
@@
*/
/*jshint globalstrict: true */
*/
/*jshint globalstrict: true */
-/*global DygraphLayout:false, DygraphCanvasRenderer:false, G_vmlCanvasManager:false */
+/*global DygraphLayout:false, DygraphCanvasRenderer:false,
DygraphOptions:false,
G_vmlCanvasManager:false */
"use strict";
/**
"use strict";
/**
@@
-599,7
+599,8
@@
Dygraph.prototype.getOption = function(name, opt_seriesName) {
Dygraph.prototype.getOptionForAxis = function(name, axis) {
return this.attributes_.getForAxis(name, axis);
Dygraph.prototype.getOptionForAxis = function(name, axis) {
return this.attributes_.getForAxis(name, axis);
-}
+};
+
/**
* @private
* @param String} axis The name of the axis (i.e. 'x', 'y' or 'y2')
/**
* @private
* @param String} axis The name of the axis (i.e. 'x', 'y' or 'y2')
@@
-1684,7
+1685,6
@@
Dygraph.prototype.findStackedPoint = function(domX, domY) {
var row = this.findClosestRow(domX);
var boundary = this.getLeftBoundary_();
var rowIdx = row - boundary;
var row = this.findClosestRow(domX);
var boundary = this.getLeftBoundary_();
var rowIdx = row - boundary;
- var sets = this.layout_.points;
var closestPoint, closestSeries;
for (var setIdx = 0; setIdx < this.layout_.datasets.length; ++setIdx) {
var points = this.layout_.points[setIdx];
var closestPoint, closestSeries;
for (var setIdx = 0; setIdx < this.layout_.datasets.length; ++setIdx) {
var points = this.layout_.points[setIdx];
@@
-1835,7
+1835,8
@@
Dygraph.prototype.animateSelection_ = function(direction) {
* @private
*/
Dygraph.prototype.updateSelection_ = function(opt_animFraction) {
* @private
*/
Dygraph.prototype.updateSelection_ = function(opt_animFraction) {
- var defaultPrevented = this.cascadeEvents_('select', {
+ /*var defaultPrevented = */
+ this.cascadeEvents_('select', {
selectedX: this.lastx_,
selectedPoints: this.selPoints_
});
selectedX: this.lastx_,
selectedPoints: this.selPoints_
});
@@
-2409,10
+2410,9
@@
Dygraph.prototype.renderGraph_ = function(is_initial_draw) {
* indices are into the axes_ array.
*/
Dygraph.prototype.computeYAxes_ = function() {
* indices are into the axes_ array.
*/
Dygraph.prototype.computeYAxes_ = function() {
-
// Preserve valueWindow settings if they exist, and if the user hasn't
// specified a new valueRange.
// Preserve valueWindow settings if they exist, and if the user hasn't
// specified a new valueRange.
- var
i, valueWindows, seriesName
, axis, index, opts, v;
+ var
valueWindows
, axis, index, opts, v;
if (this.axes_ !== undefined && this.user_attrs_.hasOwnProperty("valueRange") === false) {
valueWindows = [];
for (index = 0; index < this.axes_.length; index++) {
if (this.axes_ !== undefined && this.user_attrs_.hasOwnProperty("valueRange") === false) {
valueWindows = [];
for (index = 0; index < this.axes_.length; index++) {
@@
-2499,7
+2499,7
@@
Dygraph.prototype.computeYAxisRanges_ = function(extremes) {
var includeZero = this.attributes_.getForAxis("includeZero", i);
series = this.attributes_.seriesForAxis(i);
var includeZero = this.attributes_.getForAxis("includeZero", i);
series = this.attributes_.seriesForAxis(i);
- if (series.length == 0) {
+ if (series.length ==
=
0) {
// If no series are defined or visible then use a reasonable default
axis.extremeRange = [0, 1];
} else {
// If no series are defined or visible then use a reasonable default
axis.extremeRange = [0, 1];
} else {
@@
-2804,7
+2804,7
@@
Dygraph.prototype.setXAxisOptions_ = function(isDate) {
this.attrs_.axes.x.ticker = Dygraph.numericLinearTicks;
this.attrs_.axes.x.axisLabelFormatter = this.attrs_.axes.x.valueFormatter;
}
this.attrs_.axes.x.ticker = Dygraph.numericLinearTicks;
this.attrs_.axes.x.axisLabelFormatter = this.attrs_.axes.x.valueFormatter;
}
-}
+}
;
/**
* Parses the value as a floating point number. This is like the parseFloat()
/**
* Parses the value as a floating point number. This is like the parseFloat()