match the arguments of sortFn with fn; incorporate sortFn into the internal sorting logic

Author: sturmer-eha

lib/reactive_table.js

@@ -491,7 +491,7 @@ Template.reactiveTable.helpers({
             });
         } else  {
             var sortByValue = _.all(getSortedFields(this.fields, this.multiColumnSort), function (field) {
-                return field.sortByValue || !field.fn;
+                return !field.sortFn || field.sortByValue || !field.fn;
             });
             var filterQuery = getFilterQuery(getFilterStrings(this.filters.get()), getFilterFields(this.filters.get(), this.fields), {enableRegex: this.enableRegex, filterOperator: this.filterOperator});
 

lib/sort.js

@@ -87,7 +87,7 @@ sortWithFunctions = function (rows, fields, multiColumnSort) {
   _.each(sortedFields.reverse(), function (field) {
     if (field.sortFn) {
       sortedRows = _.sortBy(sortedRows, function (row) {
-        return field.sortFn(row);
+        return field.sortFn( get( row, field.key ), row );
       });
     } else if (field.sortByValue || !field.fn) {
       sortedRows = _.sortBy(sortedRows, field.key);