Assclaw/jfa-go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

list: add back default sort to _load

Browse Source 
accidentally deleted it when merging reload and loadMore.
This commit is contained in:
Harvey Tindall
2025-05-27 11:00:58 +01:00
parent 285215cf4b
commit 18f8921eba
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ts/modules/list.ts
+16 -3
View File
@@ -310,11 +310,22 @@ export abstract class PaginatedList {
return bottomIdx; return bottomIdx;
} }
private _load = (itemLimit: number, page: number, pre?: (resp: paginatedDTO) => void, post?: (resp: paginatedDTO) => void, failCallback?: (req: XMLHttpRequest) => void) => { private _load = (
itemLimit: number,
page: number,
appendFunc: (resp: paginatedDTO) => void, // Function to append/put items in storage.
pre?: (resp: paginatedDTO) => void,
post?: (resp: paginatedDTO) => void,
failCallback?: (req: XMLHttpRequest) => void
) => {
this._lastLoad = Date.now(); this._lastLoad = Date.now();
let params = this._search.inServerSearch ? this._searchParams : this.defaultParams(); let params = this._search.inServerSearch ? this._searchParams : this.defaultParams();
params.limit = itemLimit; params.limit = itemLimit;
params.page = page; params.page = page;
if (params.sortByField == "") {
params.sortByField = this._c.defaultSortField;
params.ascending = this._c.defaultSortAscending;
}
_post(this._c.getPageEndpoint, params, (req: XMLHttpRequest) => { _post(this._c.getPageEndpoint, params, (req: XMLHttpRequest) => {
if (req.readyState != 4) return; if (req.readyState != 4) return;
@@ -327,10 +338,10 @@ export abstract class PaginatedList {
let resp = req.response as paginatedDTO; let resp = req.response as paginatedDTO;
if (pre) pre(resp); if (pre) pre(resp);
this.lastPage = resp.last_page; this.lastPage = resp.last_page;
// this._c.replaceWithNewItems(resp); appendFunc(resp);
// this._c.appendNewItems(resp);
this._counter.loaded = this._search.ordering.length; this._counter.loaded = this._search.ordering.length;
@@ -354,6 +365,7 @@ export abstract class PaginatedList {
this._load( this._load(
limit, limit,
0, 0,
this._c.replaceWithNewItems,
(_0: paginatedDTO) => { (_0: paginatedDTO) => {
// Allow refreshes every 15s // Allow refreshes every 15s
this._c.refreshButton.disabled = true; this._c.refreshButton.disabled = true;
@@ -385,6 +397,7 @@ export abstract class PaginatedList {
this._load( this._load(
this._c.itemsPerPage, this._c.itemsPerPage,
this._page, this._page,
this._c.appendNewItems,
(resp: paginatedDTO) => { (resp: paginatedDTO) => {
// Check before setting this.lastPage so we have a chance to cancel the timeout. // Check before setting this.lastPage so we have a chance to cancel the timeout.
if (resp.last_page) { if (resp.last_page) {