Merge branch 'MDL-68417-master' of git://github.com/lameze/moodle

This commit is contained in:
Eloy Lafuente (stronk7)
2020-05-12 23:20:21 +02:00
7 changed files with 34 additions and 2 deletions
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+2
View File
@@ -24,6 +24,7 @@
import {fetch as fetchTableData} from 'core_table/local/dynamic/repository';
import * as Selectors from 'core_table/local/dynamic/selectors';
import Events from './local/dynamic/events';
import {addIconToContainer} from 'core/loadingicon';
let watching = false;
@@ -66,6 +67,7 @@ const getFiltersetFromTable = tableRoot => {
*/
export const refreshTableContent = (tableRoot, resetContent = false) => {
const filterset = getFiltersetFromTable(tableRoot);
addIconToContainer(tableRoot);
return fetchTableData(
tableRoot.dataset.tableComponent,
+1
View File
@@ -1645,6 +1645,7 @@ class flexible_table {
if (is_a($this, \core_table\dynamic::class)) {
$sortdata = $this->get_sort_order();
return html_writer::start_tag('div', [
'class' => 'table-dynamic position-relative',
'data-region' => 'core_table/dynamic',
'data-table-handler' => $this->get_handler(),
'data-table-component' => $this->get_component(),
+11
View File
@@ -46,3 +46,14 @@ table {
caption-side: top;
}
}
.table-dynamic .loading-icon {
position: absolute;
left: calc(50% - 1.5rem);
top: 200px;
.icon {
height: 3rem;
width: 3rem;
font-size: 3rem;
}
}
+9
View File
@@ -17168,6 +17168,15 @@ table caption {
text-align: left;
caption-side: top; }
.table-dynamic .loading-icon {
position: absolute;
left: calc(50% - 1.5rem);
top: 200px; }
.table-dynamic .loading-icon .icon {
height: 3rem;
width: 3rem;
font-size: 3rem; }
.singlebutton {
display: inline-block; }
.singlebutton + .singlebutton {
+9
View File
@@ -17400,6 +17400,15 @@ table caption {
text-align: left;
caption-side: top; }
.table-dynamic .loading-icon {
position: absolute;
left: calc(50% - 1.5rem);
top: 200px; }
.table-dynamic .loading-icon .icon {
height: 3rem;
width: 3rem;
font-size: 3rem; }
.singlebutton {
display: inline-block; }
.singlebutton + .singlebutton {