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 github.com:oesmith/morris.js

Browse Source 
Conflicts:
	morris.min.js
This commit is contained in:
Olly Smith 2013-04-14 09:18:28 +01:00
commit b9f53a8fdb
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/morris.donut.coffee
View File

@ -98,8 +98,7 @@ class Morris.Donut extends Morris.EventEmitter
# @private
click: (idx) =>
if typeof idx is 'number' then segment = @segments[idx] else segment = idx
@fire 'click', segment.idx, segment.data
@fire 'click', idx, @data[idx]
# Select the segment at the given index.
select: (idx) =>

8
morris.js
View File

@ -1572,13 +1572,7 @@
};
Donut.prototype.click = function(idx) {
var segment;
if (typeof idx === 'number') {
segment = this.segments[idx];
} else {
segment = idx;
}
return this.fire('click', segment.idx, segment.data);
return this.fire('click', idx, this.data[idx]);
};
Donut.prototype.select = function(idx) {

2
morris.min.js vendored
View File

File diff suppressed because one or more lines are too long