Merge pull request #5701 from chmirenko/master

dlgski · web-flow · commit 0ae4c9591156 · 2016-11-16T12:19:52.000-05:00
Exposing the column being sorted
diff --git a/src/js/core/services/rowSorter.js b/src/js/core/services/rowSorter.js
@@ -455,7 +455,7 @@ module.service('rowSorter', ['$parse', 'uiGridConstants', function ($parse, uiGr
           propB = grid.getCellValue(rowB, col);
         }
 
-        tem = sortFn(propA, propB, rowA, rowB, direction);
+        tem = sortFn(propA, propB, rowA, rowB, direction, col);
 
         idx++;
       }

Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@ module.service('rowSorter', ['$parse', 'uiGridConstants', function ($parse, uiGr`
`455`	`455`	`propB = grid.getCellValue(rowB, col);`
`456`	`456`	`}`
`457`	`457`
`458`		`- tem = sortFn(propA, propB, rowA, rowB, direction);`
	`458`	`+ tem = sortFn(propA, propB, rowA, rowB, direction, col);`
`459`	`459`
`460`	`460`	`idx++;`
`461`	`461`	`}`