Skip to content

add fieldProp: firstSort ([ASC] | DESC) #1600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
morgunder wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add fieldProp: firstSort ([ASC] | DESC) #1600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions dev/jquery.jtable.core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
(function ($) {

var unloadingPage;

$(window).on('beforeunload', function () {
unloadingPage = true;
});
Expand Down Expand Up @@ -117,7 +117,7 @@
this._createErrorDialogDiv();
this._addNoDataRow();

this._cookieKeyPrefix = this._generateCookieKeyPrefix();
this._cookieKeyPrefix = this._generateCookieKeyPrefix();
},

/* Normalizes some options for all fields (sets default values).
Expand Down Expand Up @@ -281,6 +281,7 @@
*************************************************************************/
_createHeaderCellForField: function (fieldName, field) {
field.width = field.width || '10%'; //default column width: 10%.
field.firstSort = field.firstSort || 'ASC'; //default to ASC sorting columns unless firstSort: DESC

var $headerTextSpan = $('<span />')
.addClass('jtable-column-header-text')
Expand All @@ -295,6 +296,7 @@
.addClass(field.listClass)
.css('width', field.width)
.data('fieldName', fieldName)
.data('firstSort', field.firstSort)
.append($headerContainerDiv);

this._jqueryuiThemeAddClass($th, 'ui-state-default');
Expand Down Expand Up @@ -1170,7 +1172,7 @@
jqXHR.abort();
return;
}

if (options.error) {
options.error(arguments);
}
Expand Down
27 changes: 11 additions & 16 deletions dev/jquery.jtable.sorting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
*************************************************************************/
_makeColumnSortable: function ($columnHeader, fieldName) {
var self = this;

$columnHeader
.addClass('jtable-column-header-sortable')
.click(function (e) {
Expand All @@ -115,7 +115,7 @@
if (!self.options.multiSorting || !e.ctrlKey) {
self._lastSorting = []; //clear previous sorting
}

self._sortTableByColumn($columnHeader);
});

Expand Down Expand Up @@ -146,20 +146,15 @@
}
}

//Sort ASC or DESC according to current sorting state
if ($columnHeader.hasClass('jtable-column-header-sorted-asc')) {
$columnHeader.removeClass('jtable-column-header-sorted-asc').addClass('jtable-column-header-sorted-desc');
this._lastSorting.push({
'fieldName': $columnHeader.data('fieldName'),
sortOrder: 'DESC'
});
} else {
$columnHeader.removeClass('jtable-column-header-sorted-desc').addClass('jtable-column-header-sorted-asc');
this._lastSorting.push({
'fieldName': $columnHeader.data('fieldName'),
sortOrder: 'ASC'
});
}
//Sort ASC or DESC according to current firstSort state on the field
var sortTo = 'ASC';
if ($columnHeader.data('firstSort') == 'ASC') {
// DEFAULT TO ASC unless already ASC
sortTo = ($columnHeader.hasClass('jtable-column-header-sorted-asc')) ? 'DESC' : 'ASC';
} else {
// DEFAULT TO DESC unless already DESC
sortTo = ($columnHeader.hasClass('jtable-column-header-sorted-desc')) ? 'ASC' : 'DESC';
}

//Load current page again
this._reloadTable();
Expand Down