projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor tweaks to jeremy's change
[dygraphs.git]
/
dygraph.js
diff --git
a/dygraph.js
b/dygraph.js
index
f5e19ab
..
656d7a8
100644
(file)
--- a/
dygraph.js
+++ b/
dygraph.js
@@
-221,7
+221,7
@@
Dygraph.prototype.__old_init__ = function(div, file, labels, attrs) {
/**
* Initializes the Dygraph. This creates a new DIV and constructs the PlotKit
/**
* Initializes the Dygraph. This creates a new DIV and constructs the PlotKit
- * and context <canvas> inside of it. See the constructor for details
+ * and context <canvas> inside of it. See the constructor for details
.
* on the parameters.
* @param {Element} div the Element to render the graph into.
* @param {String | Function} file Source data
* on the parameters.
* @param {Element} div the Element to render the graph into.
* @param {String | Function} file Source data
@@
-254,7
+254,7
@@
Dygraph.prototype.__init__ = function(div, file, attrs) {
this.wilsonInterval_ = attrs.wilsonInterval || true;
this.is_initial_draw_ = true;
this.annotations_ = [];
this.wilsonInterval_ = attrs.wilsonInterval || true;
this.is_initial_draw_ = true;
this.annotations_ = [];
-
+
// Number of digits to use when labeling the x (if numeric) and y axis
// ticks.
this.numXDigits_ = 2;
// Number of digits to use when labeling the x (if numeric) and y axis
// ticks.
this.numXDigits_ = 2;
@@
-331,6
+331,12
@@
Dygraph.prototype.__init__ = function(div, file, attrs) {
this.start_();
};
this.start_();
};
+Dygraph.prototype.toString = function() {
+ var maindiv = this.maindiv_;
+ var id = (maindiv && maindiv.id) ? maindiv.id : maindiv
+ return "[Dygraph " + id + "]";
+}
+
Dygraph.prototype.attr_ = function(name, seriesName) {
if (seriesName &&
typeof(this.user_attrs_[seriesName]) != 'undefined' &&
Dygraph.prototype.attr_ = function(name, seriesName) {
if (seriesName &&
typeof(this.user_attrs_[seriesName]) != 'undefined' &&
@@
-1470,7
+1476,7
@@
Dygraph.prototype.mouseMove_ = function(event) {
var points = this.layout_.points;
// This prevents JS errors when mousing over the canvas before data loads.
var points = this.layout_.points;
// This prevents JS errors when mousing over the canvas before data loads.
- if (points ===
'undefined'
) return;
+ if (points ===
undefined
) return;
var lastx = -1;
var lasty = -1;
var lastx = -1;
var lasty = -1;
@@
-1802,8
+1808,10
@@
Dygraph.prototype.addXTicks_ = function() {
var ret = formatter(range[0], range[1], this);
var xTicks = [];
var ret = formatter(range[0], range[1], this);
var xTicks = [];
+ // Note: numericTicks() returns a {ticks: [...], numDigits: yy} dictionary,
+ // whereas dateTicker and user-defined tickers typically just return a ticks
+ // array.
if (ret.ticks !== undefined) {
if (ret.ticks !== undefined) {
- // numericTicks() returns multiple values.
xTicks = ret.ticks;
this.numXDigits_ = ret.numDigits;
} else {
xTicks = ret.ticks;
this.numXDigits_ = ret.numDigits;
} else {