Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/michalcarson/master' into k0sty…
Browse files Browse the repository at this point in the history
…a-rowspan; see also mleibman#1019 mleibman#1019

Conflicts:
	slick.dataview.js
  • Loading branch information
GerHobbelt committed Nov 23, 2014
2 parents 91e4aaa + 110532b commit 434c8d3
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions slick.dataview.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,11 @@
var groupingInfoDefaults = {
getter: null,
formatter: null,
comparer: function (a, b) {
return a.value - b.value;
comparer: function(a, b) {
return (a.value === b.value ?
0 :
(a.value > b.value ? 1 : -1)
);
},
predefinedValues: [],
aggregators: [],
Expand Down

0 comments on commit 434c8d3

Please sign in to comment.