projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
un-deprecate minimal example in README file
[dygraphs.git]
/
dygraph.js
diff --git
a/dygraph.js
b/dygraph.js
index
193f0f8
..
8858396
100644
(file)
--- a/
dygraph.js
+++ b/
dygraph.js
@@
-526,6
+526,7
@@
Dygraph.prototype.createDragInterface_ = function() {
// Tracks whether the mouse is down right now
var isZooming = false;
// Tracks whether the mouse is down right now
var isZooming = false;
+ var isPanning = false;
var dragStartX = null;
var dragStartY = null;
var dragEndX = null;
var dragStartX = null;
var dragStartY = null;
var dragEndX = null;
@@
-569,7
+570,7
@@
Dygraph.prototype.createDragInterface_ = function() {
dragStartX = getX(event);
dragStartY = getY(event);
dragStartX = getX(event);
dragStartY = getY(event);
- if (event.altKey) {
+ if (event.altKey
|| event.shiftKey
) {
if (!self.dateWindow_) return; // have to be zoomed in to pan.
isPanning = true;
dateRange = self.dateWindow_[1] - self.dateWindow_[0];
if (!self.dateWindow_) return; // have to be zoomed in to pan.
isPanning = true;
dateRange = self.dateWindow_[1] - self.dateWindow_[0];
@@
-1644,7
+1645,13
@@
Dygraph.prototype.parseDataTable_ = function(data) {
var ret = [];
for (var i = 0; i < rows; i++) {
var row = [];
var ret = [];
for (var i = 0; i < rows; i++) {
var row = [];
- if (!data.getValue(i, 0)) continue;
+ if (typeof(data.getValue(i, 0)) === 'undefined' ||
+ data.getValue(i, 0) === null) {
+ this.warning("Ignoring row " + i +
+ " of DataTable because of undefined or null first column.");
+ continue;
+ }
+
if (indepType == 'date') {
row.push(data.getValue(i, 0).getTime());
} else {
if (indepType == 'date') {
row.push(data.getValue(i, 0).getTime());
} else {