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 branch 'master' of https://github.com/stlk/morris.js into stlk-master

Browse Source 
Conflicts:
	morris.min.js
This commit is contained in:
Olly Smith 2013-10-12 14:02:06 +01:00
commit 7123d419a6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/morris.donut.coffee
View File

@ -76,7 +76,7 @@ class Morris.Donut extends Morris.EventEmitter
next = last + min + C * (value / total)
seg = new Morris.DonutSegment(
cx, cy, w*2, w, last, next,
@options.colors[idx % @options.colors.length],
@data[i].color || @options.colors[idx % @options.colors.length],
@options.backgroundColor, idx, @raphael)
seg.render()
@segments.push seg

2
morris.js
View File

@ -1663,7 +1663,7 @@
for (i = _j = 0, _len1 = _ref1.length; _j < _len1; i = ++_j) {
value = _ref1[i];
next = last + min + C * (value / total);
seg = new Morris.DonutSegment(cx, cy, w * 2, w, last, next, this.options.colors[idx % this.options.colors.length], this.options.backgroundColor, idx, this.raphael);
seg = new Morris.DonutSegment(cx, cy, w * 2, w, last, next, this.data[i].color || this.options.colors[idx % this.options.colors.length], this.options.backgroundColor, idx, this.raphael);
seg.render();
this.segments.push(seg);
seg.on('hover', this.select);

2
morris.min.js vendored
View File

File diff suppressed because one or more lines are too long