Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-09-21 10:41:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #448 from JelteF/feature-nolabel

Browse Source 
Add feature to pass false as a label so it isn't displayed
This commit is contained in:
Olly Smith 2014-07-14 21:13:06 +01:00
commit 8c100cde86
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/morris.bar.coffee
View File

@ -221,6 +221,9 @@ class Morris.Bar extends Morris.Grid
row = @data[index] row = @data[index]
content = "<div class='morris-hover-row-label'>#{row.label}</div>" content = "<div class='morris-hover-row-label'>#{row.label}</div>"
for y, j in row.y for y, j in row.y
if @options.labels[j] is false
continue
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]}:

3
lib/morris.line.coffee
View File

@ -101,6 +101,9 @@ class Morris.Line extends Morris.Grid
row = @data[index] row = @data[index]
content = "<div class='morris-hover-row-label'>#{row.label}</div>" content = "<div class='morris-hover-row-label'>#{row.label}</div>"
for y, j in row.y for y, j in row.y
if @options.labels[j] is false
continue
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]}: