feat(ngTable): getter methods declared on $column no longer require a…

… $scope to be supplied

Previously you needed to supply a $scope when calling any of the getter methods on $column.
Now when a $scope is not supplied, the child $scope created for the directive will be assumed.

src/scripts/04-controller.js

@@ -125,7 +125,9 @@ function($scope, NgTableParams, $timeout, $parse, $compile, $attrs, $element, ng
     };
 
     this.buildColumns = function (columns) {
-        return columns.map(ngTableColumn.buildColumn)
+        return columns.map(function(col){
+            return ngTableColumn.buildColumn(col, $scope)
+        })
     };
 
     this.setupBindingsToInternalScope = function(tableParamsExpr){
@@ -157,7 +159,7 @@ function($scope, NgTableParams, $timeout, $parse, $compile, $attrs, $element, ng
     };
 
     $scope.sortBy = function(column, event) {
-        var parsedSortable = column.sortable && column.sortable($scope);
+        var parsedSortable = column.sortable && column.sortable();
         if (!parsedSortable) {
             return;
         }
@@ -194,7 +196,7 @@ app.factory('ngTableColumn', [function () {
         titleAlt: function(){ return ''; }
     };
 
-    function buildColumn(column){
+    function buildColumn(column, defaultScope){
         // note: we're not modifying the original column object. This helps to avoid unintended side affects
         var extendedCol = Object.create(column);
         for (var prop in defaults) {
@@ -212,6 +214,17 @@ app.factory('ngTableColumn', [function () {
                     };
                 })(prop);
             }
+            (function(prop1){
+                // satisfy the arguments expected by the function returned by parsedAttribute in the ngTable directive
+                var getterFn = extendedCol[prop1];
+                extendedCol[prop1] = function(){
+                    if (arguments.length === 0){
+                        return getterFn.call(column, defaultScope);
+                    } else {
+                        return getterFn.apply(column, arguments);
+                    }
+                };
+            })(prop);
         }
         return extendedCol;
     }

test/tableSpec.js

@@ -33,21 +33,31 @@ describe('ng-table', function() {
                     '<div>' +
                     '<table ng-table="tableParams" show-filter="true">' +
                     '<tr ng-repeat="user in $data">' +
-                    '<td data-header-title="\'Sort by Name\'" data-title="\'Name of person\'" filter="{ \'name\': \'text\' }" sortable="\'name\'" data-header-class="getCustomClass(column)">' +
+                    '<td data-header-title="\'Sort by Name\'" data-title="nameTitle()" filter="{ \'name\': \'text\' }" sortable="\'name\'" data-header-class="getCustomClass(column)">' +
                     '{{user.name}}' +
                     '</td>' +
-                    '<td x-data-header-title="\'Sort by Age\'" x-data-title="\'Age\'" sortable="\'age\'" x-data-header-class="getCustomClass(column)">' +
+                    '<td x-data-header-title="\'Sort by Age\'" x-data-title="ageTitle()" sortable="\'age\'" x-data-header-class="getCustomClass(column)">' +
                     '{{user.age}}' +
                     '</td>' +
-                    '<td header-title="\'Sort by Money\'" title="\'Money\'" filter="{ \'action\': \'select\' }" filter-data="money($column)" header-class="getCustomClass(column)">' +
+                    '<td header-title="\'Sort by Money\'" title="moneyTitle()" filter="{ \'action\': \'select\' }" filter-data="money($column)" header-class="getCustomClass(column)">' +
                     '{{user.money}}' +
                     '</td>' +
                     '</tr>' +
                     '</table>' +
                     '</div>');
 
+            scope.nameTitle = function(){
+                return 'Name of person';
+            };
+            scope.ageTitle = function(){
+                return 'Age';
+            };
+            scope.moneyTitle = function(){
+                return 'Money';
+            };
+
             scope.getCustomClass = function(column){
-                if (column.title(scope).indexOf('Money') !== -1){
+                if (column.title().indexOf('Money') !== -1){
                     return 'moneyHeaderClass';
                 } else{
                     return 'customClass';
@@ -305,7 +315,7 @@ describe('ng-table', function() {
             it('should make filter def available on $column', function () {
                 expect(columnDef).toBeDefined();
                 expect(columnDef.filter).toBeDefined();
-                expect(columnDef.filter(scope)['username']).toBe('text');
+                expect(columnDef.filter()['username']).toBe('text');
             });
         });
 
@@ -381,8 +391,8 @@ describe('ng-table', function() {
             it('should make filter def available on $column', function () {
                 expect(columnDef).toBeDefined();
                 expect(columnDef.filter).toBeDefined();
-                expect(columnDef.filter(scope)['name']).toBe('text');
-                expect(columnDef.filter(scope)['age']).toBe('text');
+                expect(columnDef.filter()['name']).toBe('text');
+                expect(columnDef.filter()['age']).toBe('text');
             });
         });
         describe('dynamic filter', function(){