Add original data to custom hover callback.

Chart data points are sorted when using parseTime, so indices will not always match the original data ordering. Also fixes a couple of event triggers. Ref: #264.
morrisjs · Nov 9, 2013 · 68aa4c3 · 68aa4c3 · sudeepdk · Nov 18, 2013
1 parent c072224
commit 68aa4c3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/examples/decimal-custom-hover.html b/examples/decimal-custom-hover.html
@@ -27,8 +27,7 @@ <h1>Decimal Data</h1>
   ykeys: ['y'],
   labels: ['sin(x)'],
   parseTime: false,
-  hoverCallback: function (index, options, default_content) {
-    var row = options.data[index];
+  hoverCallback: function (index, options, default_content, row) {
     return default_content.replace("sin(x)", "1.5 + 1.5 sin(" + row.x + ")");
   },
   xLabelMargin: 10,

diff --git a/lib/morris.bar.coffee b/lib/morris.bar.coffee
@@ -143,7 +143,7 @@ class Morris.Bar extends Morris.Grid
   # @private
   onGridClick: (x, y) =>
     index = @hitTest(x)
-    @fire 'click', index, @options.data[index], x, y
+    @fire 'click', index, @data[index].src, x, y
 
   # hover movement event handler
   #
@@ -173,7 +173,7 @@ class Morris.Bar extends Morris.Grid
         </div>
       """
     if typeof @options.hoverCallback is 'function'
-      content = @options.hoverCallback(index, @options, content)
+      content = @options.hoverCallback(index, @options, content, row.src)
     x = @left + (index + 0.5) * @width / @data.length
     [content, x]
 

diff --git a/lib/morris.grid.coffee b/lib/morris.grid.coffee
@@ -152,7 +152,7 @@ class Morris.Grid extends Morris.EventEmitter
       ymax = if ymax? then Math.max(ymax, maxGoal) else maxGoal
 
     @data = for row, index in data
-      ret = {}
+      ret = {src: row}
 
       ret.label = row[@options.xkey]
       if @options.parseTime

diff --git a/lib/morris.line.coffee b/lib/morris.line.coffee
@@ -68,7 +68,7 @@ class Morris.Line extends Morris.Grid
   # @private
   onGridClick: (x, y) =>
     index = @hitTest(x)
-    @fire 'click', index, @options.data[index], x, y
+    @fire 'click', index, @data[index].src, x, y
 
   # hover movement event handler
   #
@@ -109,7 +109,7 @@ class Morris.Line extends Morris.Grid
         </div>
       """
     if typeof @options.hoverCallback is 'function'
-      content = @options.hoverCallback(index, @options, content)
+      content = @options.hoverCallback(index, @options, content, row.src)
     [content, row._x, row._ymax]
 
 

diff --git a/morris.js b/morris.js
diff --git a/morris.min.js b/morris.min.js