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

Merge pull request #108 from tiraeth/fix-107

Browse Source 
Fixes #107, passes data row to formatter function as second param
This commit is contained in:
Olly Smith 2012-11-05 12:44:48 -08:00
commit 93fa8df7b8
4 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
examples/donut-formatter.html Normal file
View File

@ -0,0 +1,26 @@
<!doctype html>
<head>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script src="https://raw.github.com/DmitryBaranovskiy/raphael/300aa589f5a0ba7fce667cd62c7cdda0bd5ad904/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
<link rel="stylesheet" href="lib/example.css">
<link rel="stylesheet" href="lib/prettify.css">
</head>
<body>
<h1>Donut Chart</h1>
<div id="graph"></div>
<pre id="code" class="prettyprint linenums">
Morris.Donut({
element: 'graph',
data: [
{value: 70, label: 'foo', formatted: 'at least 70%' },
{value: 15, label: 'bar', formatted: 'approx. 15%' },
{value: 10, label: 'baz', formatted: 'approx. 10%' },
{value: 5, label: 'A really really long label', formatted: 'at most 5%' }
],
formatter: function (x, data) { return data.formatted; }
});
</pre>
</body>

2
lib/morris.donut.coffee
View File

@ -94,7 +94,7 @@ class Morris.Donut
s.deselect() for s in @segments
if typeof idx is 'number' then segment = @segments[idx] else segment = idx
segment.select()
@setLabels segment.data.label, @options.formatter(segment.data.value)
@setLabels segment.data.label, @options.formatter(segment.data.value, segment.data)
# @private
setLabels: (label1, label2) ->

2
morris.js
View File

@ -1309,7 +1309,7 @@
segment = idx;
}
segment.select();
return this.setLabels(segment.data.label, this.options.formatter(segment.data.value));
return this.setLabels(segment.data.label, this.options.formatter(segment.data.value, segment.data));
};
Donut.prototype.setLabels = function(label1, label2) {

2
morris.min.js vendored
View File

File diff suppressed because one or more lines are too long