/**
* @private
+ * Add an event handler. This event handler is kept until the graph is
+ * destroyed with a call to graph.destroy().
+ *
+ * @param { DOM element } elem The element to add the event to.
+ * @param { String } type The type of the event, e.g. 'click' or 'mousemove'.
+ * @param { Function } fn The function to call on the event. The function takes
+ * one parameter: the event object.
+ */
+Dygraph.prototype.addEvent = function addEvent(elem, type, fn) {
+ Dygraph.addEvent(elem, type, fn);
+ this.registeredEvents_.push({ elem : elem, type : type, fn : fn });
+};
+
+/**
+ * @private
* Remove an event handler. This smooths a difference between IE and the rest of
* the world.
* @param { DOM element } elem The element to add the event to.
/**
* @private
* @param { Object } p The point to consider, valid points are {x, y} objects
+ * @param { Boolean } allowNaNY Treat point with y=NaN as valid
* @return { Boolean } Whether the point has numeric x and y.
*/
-Dygraph.isValidPoint = function(p) {
+Dygraph.isValidPoint = function(p, allowNaNY) {
if (!p) return false; // null or undefined object
- if (isNaN(p.x) || p.x === null || p.x === undefined) return false;
- if (isNaN(p.y) || p.y === null || p.y === undefined) return false;
+ if (p.yval === null) return false; // missing point
+ if (p.x === null || p.x === undefined) return false;
+ if (p.y === null || p.y === undefined) return false;
+ if (isNaN(p.x) || (!allowNaNY && isNaN(p.y))) return false;
return true;
};
var dateStrSlashed;
var d;
- // Let the system try the format first.
- d = Dygraph.dateStrToMillis(dateStr);
- if (d && !isNaN(d)) return d;
+ // Let the system try the format first, with one caveat:
+ // YYYY-MM-DD[ HH:MM:SS] is interpreted as UTC by a variety of browsers.
+ // dygraphs displays dates in local time, so this will result in surprising
+ // inconsistencies. But if you specify "T" or "Z" (i.e. YYYY-MM-DDTHH:MM:SS),
+ // then you probably know what you're doing, so we'll let you go ahead.
+ // Issue: http://code.google.com/p/dygraphs/issues/detail?id=255
+ if (dateStr.search("-") == -1 ||
+ dateStr.search("T") != -1 || dateStr.search("Z") != -1) {
+ d = Dygraph.dateStrToMillis(dateStr);
+ if (d && !isNaN(d)) return d;
+ }
if (dateStr.search("-") != -1) { // e.g. '2009-7-12' or '2009-07-12'
dateStrSlashed = dateStr.replace("-", "/", "g");
// DOM objects are shallowly-copied.
self[k] = o[k];
} else if (typeof(o[k]) == 'object') {
- if (typeof(self[k]) != 'object') {
+ if (typeof(self[k]) != 'object' || self[k] === null) {
self[k] = {};
}
Dygraph.updateDeep(self[k], o[k]);
/**
* @private
+ * Returns a new iterator over array, between indexes start and
+ * start + length, and only returns entries that pass the accept function
+ *
+ * @param array the array to iterate over.
+ * @param start the first index to iterate over
+ * @param length the number of elements in the array to iterate over.
+ * This, along with start, defines a slice of the array, and so length
+ * doesn't imply the number of elements in the iterator when accept
+ * doesn't always accept all values.
+ * @param predicate a function that takes parameters array and idx, which
+ * returns true when the element should be returned. If omitted, all
+ * elements are accepted.
+ *
+ * TODO(konigsberg): add default vlues to start and length.
+ */
+Dygraph.createIterator = function(array, start, length, predicate) {
+ predicate = predicate || function() { return true; };
+
+ var iter = new function() {
+ this.idx_ = start - 1; // use -1 so initial call to advance works.
+ this.end_ = Math.min(array.length, start + length);
+ this.nextIdx_ = this.idx_;
+ var self = this;
+
+ this.hasNext = function() {
+ return self.nextIdx_ < self.end_;
+ }
+ this.next = function() {
+ if (self.hasNext()) {
+ self.idx_ = self.nextIdx_;
+ self.advance_();
+ return array[self.idx_];
+ }
+ return null;
+ }
+ this.peek = function() {
+ if (self.hasNext()) {
+ return array[self.nextIdx_];
+ }
+ return null;
+ }
+ this.advance_ = function() {
+ self.nextIdx_++;
+ while(self.hasNext()) {
+ if (predicate(array, self.nextIdx_)) {
+ return;
+ }
+ self.nextIdx_++;
+ }
+ }
+ };
+ iter.advance_();
+ return iter;
+};
+
+/**
+ * @private
* Call a function N times at a given interval, then call a cleanup function
* once. repeat_fn is called once immediately, then (times - 1) times
* asynchronously. If times=1, then cleanup_fn() is also called synchronously.