summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHalil İbrahim Kalkan <hikalkan@gmail.com>2017-03-29 16:40:25 +0300
committerGitHub <noreply@github.com>2017-03-29 16:40:25 +0300
commite26cea1da8032fa61dfe47897af1eec8b2578fb0 (patch)
treed78b4bf005060fdc954e8ffe43f78e46f837f483
parentbcd862d5077bbef9078a95c3d3f24ffb865e4716 (diff)
parentb36abf2ebc1ce122b3875695aa5380a926e58784 (diff)
downloadjtable-e26cea1da8032fa61dfe47897af1eec8b2578fb0.zip
jtable-e26cea1da8032fa61dfe47897af1eec8b2578fb0.tar.gz
jtable-e26cea1da8032fa61dfe47897af1eec8b2578fb0.tar.bz2
Merge pull request #2040 from ismcagdas/master
#1459: implement initial sorting direction
-rw-r--r--dev/jquery.jtable.sorting.js8
-rw-r--r--jquery.jtable.js8
2 files changed, 12 insertions, 4 deletions
diff --git a/dev/jquery.jtable.sorting.js b/dev/jquery.jtable.sorting.js
index b7e9fa5..a83d624 100644
--- a/dev/jquery.jtable.sorting.js
+++ b/dev/jquery.jtable.sorting.js
@@ -57,7 +57,7 @@
_createHeaderCellForField: function (fieldName, field) {
var $headerCell = base._createHeaderCellForField.apply(this, arguments);
if (this.options.sorting && field.sorting) {
- this._makeColumnSortable($headerCell, fieldName);
+ this._makeColumnSortable($headerCell, fieldName, field.initialSortingDirection);
}
return $headerCell;
@@ -104,7 +104,7 @@
/* Makes a column sortable.
*************************************************************************/
- _makeColumnSortable: function ($columnHeader, fieldName) {
+ _makeColumnSortable: function ($columnHeader, fieldName, initialSortingDirection) {
var self = this;
$columnHeader
@@ -119,6 +119,10 @@
self._sortTableByColumn($columnHeader);
});
+ if(initialSortingDirection){
+ $columnHeader.addClass('jtable-column-header-sorted-' + initialSortingDirection.toLowerCase());
+ }
+
//Set default sorting
$.each(this._lastSorting, function (sortIndex, sortField) {
if (sortField.fieldName == fieldName) {
diff --git a/jquery.jtable.js b/jquery.jtable.js
index b07a50f..320a8a4 100644
--- a/jquery.jtable.js
+++ b/jquery.jtable.js
@@ -4256,7 +4256,7 @@ THE SOFTWARE.
_createHeaderCellForField: function (fieldName, field) {
var $headerCell = base._createHeaderCellForField.apply(this, arguments);
if (this.options.sorting && field.sorting) {
- this._makeColumnSortable($headerCell, fieldName);
+ this._makeColumnSortable($headerCell, fieldName, field.initialSortingDirection);
}
return $headerCell;
@@ -4303,7 +4303,7 @@ THE SOFTWARE.
/* Makes a column sortable.
*************************************************************************/
- _makeColumnSortable: function ($columnHeader, fieldName) {
+ _makeColumnSortable: function ($columnHeader, fieldName, initialSortingDirection) {
var self = this;
$columnHeader
@@ -4318,6 +4318,10 @@ THE SOFTWARE.
self._sortTableByColumn($columnHeader);
});
+ if(initialSortingDirection){
+ $columnHeader.addClass('jtable-column-header-sorted-' + initialSortingDirection.toLowerCase());
+ }
+
//Set default sorting
$.each(this._lastSorting, function (sortIndex, sortField) {
if (sortField.fieldName == fieldName) {