File tree Expand file tree Collapse file tree 3 files changed +4
-3
lines changed Expand file tree Collapse file tree 3 files changed +4
-3
lines changed Original file line number Diff line number Diff line change 229
229
} ) ;
230
230
231
231
// Figure out whether this column is sortable or not
232
- if ( uiGridCtrl . grid . options . enableSorting && $scope . col . enableSorting ) {
232
+ if ( $scope . col . enableSorting ) {
233
233
$scope . sortable = true ;
234
234
}
235
235
else {
Original file line number Diff line number Diff line change @@ -640,7 +640,7 @@ angular.module('ui.grid')
640
640
//self.cursor = self.sortable ? 'pointer' : 'default';
641
641
642
642
// Turn on sorting by default
643
- self . enableSorting = typeof ( colDef . enableSorting ) !== 'undefined' ? colDef . enableSorting : true ;
643
+ self . enableSorting = typeof ( colDef . enableSorting ) !== 'undefined' ? colDef . enableSorting : self . grid . options . enableSorting ;
644
644
self . sortingAlgorithm = colDef . sortingAlgorithm ;
645
645
646
646
/**
Original file line number Diff line number Diff line change @@ -356,7 +356,8 @@ angular.module('ui.grid')
356
356
* @propertyOf ui.grid.class:GridOptions
357
357
* @description True by default. When enabled, this setting adds sort
358
358
* widgets to the column headers, allowing sorting of the data for the entire grid.
359
- * Sorting can then be disabled on individual columns using the columnDefs.
359
+ * Sorting can then be disabled / enabled on individual columns using the columnDefs,
360
+ * if it set, it will override GridOptions enableSorting setting.
360
361
*/
361
362
baseOptions . enableSorting = baseOptions . enableSorting !== false ;
362
363
You can’t perform that action at this time.
0 commit comments