Merge pull request #191 from timaebi/master

sortable can be defined where the columns are defined
Zizzamia · Dec 27, 2015 · b68d0e5 · b68d0e5
2 parents 5906b71 + da2ae55
commit b68d0e5
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/component/table.js b/src/component/table.js
@@ -568,12 +568,17 @@ angular.module('ngTasty.component.table', [
           isSortedCaret = '';
           // Not sort column when the key is present in the `notSortBy` list,
           // and Not sort column when `notSortBy` is an empty list
+          // If sortable property is present in column object, then use it
           if (angular.isArray(scope.notSortBy)) {
             if (scope.notSortBy.length) {
               sortable = scope.notSortBy.indexOf(column.key) < 0;
             } else {
               sortable = false;
             }
+          } else {
+            if (angular.isDefined(column.sortable)) {
+              sortable = column.sortable === true;
+            }
           }
           if (column.key === scope.header.sortBy ||
               '-' + column.key === scope.header.sortBy) {