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

Don't sort data when parseTime is false. Fixes #83.

Browse Source
This commit is contained in:
Olly Smith 2012-10-03 08:24:38 +01:00
parent 2903d086c6
commit 7775332aeb
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/morris.line.coffee
View File

@ -96,7 +96,11 @@ class Morris.Line
setData: (data, redraw = true) -> setData: (data, redraw = true) ->
# shallow copy & sort data # shallow copy & sort data
@options.data = data.slice(0) @options.data = data.slice(0)
@options.data.sort (a, b) => (a[@options.xkey] < b[@options.xkey]) - (b[@options.xkey] < a[@options.xkey]) if @options.parseTime
@options.data.sort (a, b) =>
(a[@options.xkey] < b[@options.xkey]) - (b[@options.xkey] < a[@options.xkey])
else
@options.data.reverse()
# extract labels # extract labels
@columnLabels = $.map @options.data, (d) => d[@options.xkey] @columnLabels = $.map @options.data, (d) => d[@options.xkey]

4
morris.js
View File

@ -392,9 +392,13 @@
redraw = true; redraw = true;
} }
this.options.data = data.slice(0); this.options.data = data.slice(0);
if (this.options.parseTime) {
this.options.data.sort(function(a, b) { this.options.data.sort(function(a, b) {
return (a[_this.options.xkey] < b[_this.options.xkey]) - (b[_this.options.xkey] < a[_this.options.xkey]); return (a[_this.options.xkey] < b[_this.options.xkey]) - (b[_this.options.xkey] < a[_this.options.xkey]);
}); });
} else {
this.options.data.reverse();
}
this.columnLabels = $.map(this.options.data, function(d) { this.columnLabels = $.map(this.options.data, function(d) {
return d[_this.options.xkey]; return d[_this.options.xkey];
}); });

2
morris.min.js vendored
View File

File diff suppressed because one or more lines are too long