-
- // remove mouse event handlers
- Dygraph.removeEvent(this.mouseEventElement_, 'mouseout', this.mouseOutHandler);
- Dygraph.removeEvent(this.mouseEventElement_, 'mousemove', this.mouseMoveHandler);
- Dygraph.removeEvent(this.mouseEventElement_, 'mousemove', this.mouseUpHandler_);
+
+ for (var idx = 0; idx < this.registeredEvents_.length; idx++) {
+ var reg = this.registeredEvents_[idx];
+ this.removeEvent(reg.elem, reg.type, reg.fn);
+ }
+ this.registeredEvents_ = [];
+
+ // remove mouse event handlers (This may not be necessary anymore)
+ this.removeEvent(this.mouseEventElement_, 'mouseout', this.mouseOutHandler);
+ this.removeEvent(this.mouseEventElement_, 'mousemove', this.mouseMoveHandler);
+ this.removeEvent(this.mouseEventElement_, 'mousemove', this.mouseUpHandler_);