Skip to content

Commit 053ad4f

Browse files
committed
add Event parameter to onSortCol callback and jqGridSortCol event
See free-jqgrid#336 for more details
1 parent 08f6262 commit 053ad4f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

js/grid.base.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Dual licensed under the MIT and GPL licenses
99
* http://www.opensource.org/licenses/mit-license.php
1010
* http://www.gnu.org/licenses/gpl-2.0.html
11-
* Date: 2017-05-23
11+
* Date: 2017-05-28
1212
*/
1313
//jsHint options
1414
/*jshint eqnull:true */
@@ -4977,7 +4977,7 @@
49774977
});
49784978
p.sortname = sort1.substring(0, sort1.length - p.sortorder.length - 1);
49794979
},
4980-
sortData = function (index, idxcol, reload, sor, obj) {
4980+
sortData = function (index, idxcol, reload, sor, obj, e) {
49814981
var self = this, mygrid = self.grid, cm = p.colModel[idxcol], disabledClasses = getGuiStyles("states.disabled");
49824982
if (cm == null || !cm.sortable) { return; }
49834983
if (p.savedRow.length > 0) { return; }
@@ -5079,7 +5079,7 @@
50795079
index = index.substring(5 + p.id.length + 1); // bad to be changed!?!
50805080
p.sortname = cm.index || index;
50815081
}
5082-
if (!feedback.call(self, "onSortCol", p.sortname, idxcol, p.sortorder)) {
5082+
if (!feedback.call(self, "onSortCol", p.sortname, idxcol, p.sortorder, e)) {
50835083
p.lastsort = idxcol;
50845084
return;
50855085
}
@@ -5594,7 +5594,7 @@
55945594
}
55955595
var iColByName = getColumnHeaderIndex(this);
55965596
if (iColByName != null) {
5597-
sortData.call(ts, $("div", this)[0].id, iColByName, r, d, this);
5597+
sortData.call(ts, $("div", this)[0].id, iColByName, r, d, this, e);
55985598
}
55995599
return false;
56005600
});

ts/free-jqgrid.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,7 +1155,7 @@ declare namespace FreeJqGrid {
11551155
ignoreCase?: boolean; // true
11561156
readonly lastsort?: number; // 0
11571157
multiSort?: boolean; // false
1158-
onSortCol?: (this: BodyTable, cmOrIndexName: string, iCol: number, sortOrder: string) => BooleanFeedbackValues;
1158+
onSortCol?: (this: BodyTable, cmOrIndexName: string, iCol: number, sortOrder: string, eventObject: JQueryEventObject) => BooleanFeedbackValues;
11591159
sortname?: string; // ""
11601160
sortIconsBeforeText?: boolean; // false
11611161
sortIconName?: (this: BodyTable, options: { order: "asc" | "desc", iCol: number, cm: ColumnModel }) => string; // return CSS classes
@@ -1984,7 +1984,7 @@ interface JQuery {
19841984
on(eventName: "jqGridSelectAll", handler: (eventObject: JQueryEventObject, rowids: string[], toCheck: boolean) => void): FreeJqGrid.JQueryJqGrid;
19851985
on(eventName: "jqGridSelectRow", handler: (eventObject: JQueryEventObject, rowid: string, state: boolean, orgEventObject: JQueryEventObject) => void): FreeJqGrid.JQueryJqGrid;
19861986
on(eventName: "jqGridShowHideCol", handler: (eventObject: JQueryEventObject, show: boolean | "none" | "", cmName: string, iCol: number, options: FreeJqGrid.ShowHideColOptions) => void): FreeJqGrid.JQueryJqGrid;
1987-
on(eventName: "jqGridSortCol", handler: (eventObject: JQueryEventObject, cmOrIndexName: string, iCol: number, sortOrder: string) => FreeJqGrid.BooleanFeedbackValues): FreeJqGrid.JQueryJqGrid;
1987+
on(eventName: "jqGridSortCol", handler: (eventObject: JQueryEventObject, cmOrIndexName: string, iCol: number, sortOrder: string, orgEventObject: JQueryEventObject) => FreeJqGrid.BooleanFeedbackValues): FreeJqGrid.JQueryJqGrid;
19881988
on(eventName: "jqGridRemapColumns", handler: (eventObject: JQueryEventObject, permutation: number[], updateCells?: boolean, keepHeader?: boolean) => void): FreeJqGrid.JQueryJqGrid;
19891989
on(eventName: "jqGridResizeDblClick", handler: (eventObject: JQueryEventObject, iCol: number, cm: FreeJqGrid.ColumnModel, orgEventObject: JQueryEventObject) => FreeJqGrid.BooleanFeedbackValues): FreeJqGrid.JQueryJqGrid;
19901990
on(eventName: "jqGridResizeStart", handler: (eventObject: JQueryEventObject, orgEventObject: JQueryEventObject, iCol: number) => void): FreeJqGrid.JQueryJqGrid;

0 commit comments

Comments
 (0)