@@ -692,10 +692,11 @@ app.factory('ngTableColumn', [function () {
692692 filter : function ( ) { return false ; } ,
693693 filterData : angular . noop ,
694694 headerTemplateURL : function ( ) { return false ; } ,
695- headerTitle : function ( ) { return ' ' ; } ,
695+ headerTitle : function ( ) { return '' ; } ,
696+ sortIndicator : function ( ) { return 'div' ; } ,
696697 sortable : function ( ) { return false ; } ,
697698 show : function ( ) { return true ; } ,
698- title : function ( ) { return ' ' ; } ,
699+ title : function ( ) { return '' ; } ,
699700 titleAlt : function ( ) { return '' ; }
700701 } ;
701702
@@ -746,6 +747,7 @@ app.factory('ngTableColumn', [function () {
746747 buildColumn : buildColumn
747748 } ;
748749} ] ) ;
750+
749751/**
750752 * ngTable: Table + Angular JS
751753 *
@@ -798,6 +800,7 @@ app.directive('ngTable', ['$q', '$parse',
798800
799801 var parsedAttribute = function ( attr ) {
800802 var expr = getAttrValue ( attr ) ;
803+ console . log ( expr ) ;
801804 if ( ! expr ) {
802805 return undefined ;
803806 }
@@ -814,11 +817,14 @@ app.directive('ngTable', ['$q', '$parse',
814817 }
815818 // NOTE TO MAINTAINERS: if you add extra fields to a $column be sure to extend ngTableColumn with
816819 // a corresponding "safe" default
820+
821+
817822 columns . push ( {
818823 id : i ++ ,
819824 title : parsedAttribute ( 'title' ) ,
820825 titleAlt : parsedAttribute ( 'title-alt' ) ,
821826 headerTitle : parsedAttribute ( 'header-title' ) ,
827+ sortIndicator : parsedAttribute ( 'sort-indicator' ) ,
822828 sortable : parsedAttribute ( 'sortable' ) ,
823829 'class' : parsedAttribute ( 'header-class' ) ,
824830 filter : parsedAttribute ( 'filter' ) ,
@@ -828,6 +834,7 @@ app.directive('ngTable', ['$q', '$parse',
828834 return $parse ( el . attr ( "ng-show" ) ) ( scope ) ;
829835 } : undefined )
830836 } ) ;
837+
831838 } ) ;
832839 return function ( scope , element , attrs , controller ) {
833840 scope . $columns = columns = controller . buildColumns ( columns ) ;
@@ -912,6 +919,7 @@ app.directive('ngTableDynamic', ['$parse', function ($parse){
912919 }
913920 } ;
914921} ] ) ;
922+
915923/**
916924 * ngTable: Table + Angular JS
917925 *
@@ -961,7 +969,7 @@ angular.module('ngTable').run(['$templateCache', function ($templateCache) {
961969 $templateCache . put ( 'ng-table/filters/select-multiple.html' , '<select ng-options="data.id as data.title for data in $column.data" ng-disabled="$filterRow.disabled" multiple ng-multiple="true" ng-model="params.filter()[name]" ng-show="filter==\'select-multiple\'" class="filter filter-select-multiple form-control" name="{{name}}"> </select>' ) ;
962970 $templateCache . put ( 'ng-table/filters/select.html' , '<select ng-options="data.id as data.title for data in $column.data" ng-disabled="$filterRow.disabled" ng-model="params.filter()[name]" ng-show="filter==\'select\'" class="filter filter-select form-control" name="{{name}}"> </select>' ) ;
963971 $templateCache . put ( 'ng-table/filters/text.html' , '<input type="text" name="{{name}}" ng-disabled="$filterRow.disabled" ng-model="params.filter()[name]" ng-if="filter==\'text\'" class="input-filter form-control"/>' ) ;
964- $templateCache . put ( 'ng-table/header.html' , '<tr> <th title="{{$column.headerTitle(this)}}" ng-repeat="$column in $columns" ng-class="{ \'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="$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="{{$column.titleAlt(this) || $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> </div> </th> </tr> ' ) ;
972+ $templateCache . put ( 'ng-table/header.html' , '<tr> <th title="{{$column.headerTitle(this)}}" ng-repeat="$column in $columns" ng-class="{ \'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" class="ng-table-header" ng-class="{\'sort-indicator\': $column.sortIndicator(this)==\'div\'}"> <span ng-bind="$column.title(this)" ng-class="{\'sort-indicator\': $column.sortIndicator(this)==\'span\'}"></span> </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="{{$column.titleAlt(this) || $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> </div> </th> </tr> ' ) ;
965973 $templateCache . put ( 'ng-table/pager.html' , '<div class="ng-cloak ng-table-pager" ng-if="params.data.length"> <div ng-if="params.settings().counts.length" class="ng-table-counts btn-group pull-right"> <button ng-repeat="count in params.settings().counts" type="button" ng-class="{\'active\':params.count()==count}" ng-click="params.count(count)" class="btn btn-default"> <span ng-bind="count"></span> </button> </div> <ul class="pagination ng-table-pagination"> <li ng-class="{\'disabled\': !page.active && !page.current, \'active\': page.current}" ng-repeat="page in pages" ng-switch="page.type"> <a ng-switch-when="prev" ng-click="params.page(page.number)" href="">«</a> <a ng-switch-when="first" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="page" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="more" ng-click="params.page(page.number)" href="">…</a> <a ng-switch-when="last" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="next" ng-click="params.page(page.number)" href="">»</a> </li> </ul> </div> ' ) ;
966974} ] ) ;
967975 return app ;
0 commit comments