feat(header): title and sortable expression now has access to the col…

…umn definition

BREAKING CHANGE:

parse method on the ngTable scope has been removed as it's no longer required

src/ng-table/header.html

@@ -2,20 +2,20 @@
     <th title="{{column.headerTitle(this)}}"
         ng-repeat="column in $columns"
         ng-class="{
-                    'sortable': parse(column.sortable),
-                    'sort-asc': params.sorting()[parse(column.sortable)]=='asc',
-                    'sort-desc': params.sorting()[parse(column.sortable)]=='desc'
+                    'sortable': column.sortable(this),
+                    'sort-asc': params.sorting()[column.sortable(this)]=='asc',
+                    'sort-desc': params.sorting()[column.sortable(this)]=='desc'
                   }"
         ng-click="sortBy(column, $event)"
         ng-show="column.show(this)"
         ng-init="template = column.headerTemplateURL(this)"
         class="header {{column.class(this)}}">
-        <div ng-if="!template" ng-show="!template" ng-bind="parse(column.title)"></div>
+        <div ng-if="!template" ng-show="!template" ng-bind="column.title(this)"></div>
         <div ng-if="template" ng-show="template" ng-include="template"></div>
     </th>
 </tr>
 <tr ng-show="show_filter" class="ng-table-filters">
-    <th data-title-text="{{parse(column.title)}}" ng-repeat="column in $columns" ng-show="column.show(this)" class="filter">
+    <th data-title-text="{{column.title(this)}}" ng-repeat="column in $columns" ng-show="column.show(this)" class="filter">
         <div ng-repeat="(name, filter) in column.filter(this)">
             <div ng-if="filter.indexOf('/') !== -1" ng-include="filter"></div>
             <div ng-if="filter.indexOf('/') === -1" ng-include="'ng-table/filters/' + filter + '.html'"></div>

src/scripts/04-controller.js

@@ -60,7 +60,7 @@ app.controller('ngTableController', ['$scope', 'NgTableParams', '$timeout', func
     }, true);
 
     $scope.sortBy = function(column, event) {
-        var parsedSortable = $scope.parse(column.sortable);
+        var parsedSortable = column.sortable && column.sortable($scope);
         if (!parsedSortable) {
             return;
         }

src/scripts/05-directive.js

@@ -94,9 +94,7 @@ app.directive('ngTable', ['$compile', '$q', '$parse',
                         scope.paramsModel = $parse(attrs.ngTable);
                         scope.params = params;
                     }), true);
-                    scope.parse = function(text) {
-                        return angular.isDefined(text) ? text(scope) : '';
-                    };
+
                     if (attrs.showFilter) {
                         scope.$parent.$watch(attrs.showFilter, function(value) {
                             scope.show_filter = value;

test/tableSpec.js

@@ -186,6 +186,29 @@ describe('ng-table', function() {
         }));
     });
 
+    describe('sorting', function() {
+
+        it('should provide column definition', inject(function($compile) {
+            var columnDef;
+            var elm = angular.element(
+                    '<table ng-table="tableParams">' +
+                    '<tr ng-repeat="user in $data">' +
+                    '<td title="\'Age\'" sortable="captureColumn(column)">{{user.age}}</td>' +
+                    '</tr>' +
+                    '</table>');
+
+            scope.captureColumn = function(col){
+                columnDef = col;
+                return 'age'
+            };
+
+            $compile(elm)(scope);
+            scope.$digest();
+
+            expect(columnDef).toBeDefined();
+        }));
+    });
+
     describe('filters', function(){
 
         var columnDef;