Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-11-14 07:41:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Pass series index to yLabelFormat
This commit is contained in:
Jelte Fennema 2014-08-14 14:32:08 +02:00
commit bb86c78613
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/morris.bar.coffee
View file

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

6
lib/morris.grid.coffee
View file

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

2
lib/morris.line.coffee
View file

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