Merge branch 'master' of git://github.com/danvk/dygraphs
authorNikhil Kasinadhuni <nikhilk@google.com>
Thu, 11 Mar 2010 01:14:40 +0000 (17:14 -0800)
committerNikhil Kasinadhuni <nikhilk@google.com>
Thu, 11 Mar 2010 01:14:40 +0000 (17:14 -0800)
Conflicts:
dygraph.js

1  2 
dygraph.js

diff --cc dygraph.js
@@@ -902,10 -902,11 +902,11 @@@ Dygraph.prototype.mouseMove_ = function
    this.selPoints_ = [];
    var cumulative_sum = 0;  // used only if we have a stackedGraph.
    var l = points.length;
 -  for (var i = 0; i < l; i++) {
+   var isStacked = this.attr_("stackedGraph");
 +  for (var i = l - 1; i >= 0; i--) {
      if (points[i].xval == lastx) {
-       if (!this.attr_("stackedGraph")) {
+       if (!isStacked) {
 -        this.selPoints_.push(points[i]);
 +        this.selPoints_.unshift(points[i]);
        } else {
          // Clone the point, since we need to 'unstack' it below. Stacked points
          // are in reverse order.