Merge branch 'master' of github.com:danvk/dygraphs

diff --combined dygraph.js
index c00a7b1,1a85e51..5b00632
--- 1/dygraph.js
--- 2/dygraph.js
+++ b/dygraph.js
@@@ -963,19 -963,11 +963,19 @@@ Dygraph.prototype.createInterface_ = fu
    };
  
    this.mouseOutHandler_ = function(e) {
 -    dygraph.mouseOut_(e);
 +    // The mouse has left the chart if:
 +    // 1. e.target is inside the chart
 +    // 2. e.relatedTarget is outside the chart
 +    var target = e.target || e.fromElement;
 +    var relatedTarget = e.relatedTarget || e.toElement;
 +    if (Dygraph.isElementContainedBy(target, dygraph.graphDiv) &&
 +        !Dygraph.isElementContainedBy(relatedTarget, dygraph.graphDiv)) {
 +      dygraph.mouseOut_(e);
 +    }
    };
  
 +  this.addEvent(window, 'mouseout', this.mouseOutHandler_);
    this.addEvent(this.mouseEventElement_, 'mousemove', this.mouseMoveHandler_);
 -  this.addEvent(this.mouseEventElement_, 'mouseout', this.mouseOutHandler_);
  
    // Don't recreate and register the resize handler on subsequent calls.
    // This happens when the graph is resized.
@@@ -1013,9 -1005,9 +1013,9 @@@ Dygraph.prototype.destroy = function() 
    this.registeredEvents_ = [];
  
    // remove mouse event handlers (This may not be necessary anymore)
 -  Dygraph.removeEvent(this.mouseEventElement_, 'mouseout', this.mouseOutHandler_);
 +  Dygraph.removeEvent(window, 'mouseout', this.mouseOutHandler_);
    Dygraph.removeEvent(this.mouseEventElement_, 'mousemove', this.mouseMoveHandler_);
 -  Dygraph.removeEvent(this.mouseEventElement_, 'mousemove', this.mouseUpHandler_);
 +  Dygraph.removeEvent(this.mouseEventElement_, 'mouseup', this.mouseUpHandler_);
  
    // remove window handlers
    Dygraph.removeEvent(window,'resize',this.resizeHandler_);
@@@ -3506,9 -3498,12 +3506,12 @@@ Dygraph.prototype.annotations = functio
  /**
   * Get the list of label names for this graph. The first column is the
   * x-axis, so the data series names start at index 1.
+  *
+  * Returns null when labels have not yet been defined.
   */
  Dygraph.prototype.getLabels = function() {
-   return this.attr_("labels").slice();
+   var labels = this.attr_("labels");
+   return labels ? labels.slice() : null;
  };
  
  /**