Merge pull request #459 from JelteF/better-ylabel-callback

Pass series index to yLabelFormat

lib/morris.bar.coffee

@@ -241,7 +241,7 @@ class Morris.Bar extends Morris.Grid
       content += """
         <div class='morris-hover-point' style='color: #{@colorFor(row, j, 'label')}'>
           #{@options.labels[j]}:
-          #{@yLabelFormat(y)}
+          #{@yLabelFormat(y, j)}
         </div>
       """
     if typeof @options.hoverCallback is 'function'

lib/morris.grid.coffee

@@ -381,13 +381,13 @@ class Morris.Grid extends Morris.EventEmitter
 
   # @private
   #
-  yAxisFormat: (label) -> @yLabelFormat(label)
+  yAxisFormat: (label) -> @yLabelFormat(label, 0)
 
   # @private
   #
-  yLabelFormat: (label) ->
+  yLabelFormat: (label, i) ->
     if typeof @options.yLabelFormat is 'function'
-      @options.yLabelFormat(label)
+      @options.yLabelFormat(label, i)
     else
       "#{@options.preUnits}#{Morris.commas(label)}#{@options.postUnits}"
 

lib/morris.line.coffee

@@ -115,7 +115,7 @@ class Morris.Line extends Morris.Grid
       content += """
         <div class='morris-hover-point' style='color: #{@colorFor(row, j, 'label')}'>
           #{@options.labels[j]}:
-          #{@yLabelFormat(y)}
+          #{@yLabelFormat(y, j)}
         </div>
       """
     if typeof @options.hoverCallback is 'function'