moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-69241-39' of git://github.com/mickhawkins/moodle into MOODLE_39_STABLE

Browse source
This commit is contained in:
Andrew Nicols 2020-08-13 08:47:03 +08:00
commit d1e4c0fecc
3 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/table/amd/build/dynamic.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
lib/table/amd/build/dynamic.min.js.map
View file

File diff suppressed because one or more lines are too long

22
lib/table/amd/src/dynamic.js
View file

@ -156,14 +156,6 @@ export const updateTable = (tableRoot, {
tableRoot.dataset.tableLastInitial = lastInitial; tableRoot.dataset.tableLastInitial = lastInitial;
} }
if (pageNumber !== null) {
if (tableRoot.dataset.tablePageNumber != pageNumber) {
tableConfigChanged = true;
}
tableRoot.dataset.tablePageNumber = pageNumber;
}
if (pageSize !== null) { if (pageSize !== null) {
if (tableRoot.dataset.tablePageSize != pageSize) { if (tableRoot.dataset.tablePageSize != pageSize) {
tableConfigChanged = true; tableConfigChanged = true;
@ -183,6 +175,12 @@ export const updateTable = (tableRoot, {
tableRoot.dataset.tableFilters = filterJson; tableRoot.dataset.tableFilters = filterJson;
} }
// Reset to page 1 when table content is being altered by filtering or sorting.
// This ensures the table page being loaded always exists, and gives a consistent experience.
if (tableConfigChanged) {
pageNumber = 1;
}
// Update hidden columns. // Update hidden columns.
if (hiddenColumns) { if (hiddenColumns) {
const columnJson = JSON.stringify(hiddenColumns); const columnJson = JSON.stringify(hiddenColumns);
@ -194,6 +192,14 @@ export const updateTable = (tableRoot, {
tableRoot.dataset.tableHiddenColumns = columnJson; tableRoot.dataset.tableHiddenColumns = columnJson;
} }
if (pageNumber !== null) {
if (tableRoot.dataset.tablePageNumber != pageNumber) {
tableConfigChanged = true;
}
tableRoot.dataset.tablePageNumber = pageNumber;
}
// Refresh. // Refresh.
if (refreshContent && tableConfigChanged) { if (refreshContent && tableConfigChanged) {
return refreshTableContent(tableRoot) return refreshTableContent(tableRoot)