1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-10 00:27:45 +02:00

Admin-ui: Spinning indicator during search/filter.

This commit is contained in:
Cameron
2021-01-24 07:15:46 -08:00
parent 08e0b26874
commit 0846285277

View File

@@ -7516,7 +7516,7 @@ class e_admin_form_ui extends e_form
' .$this->select_close()." ' .$this->select_close()."
<div class='e-autocomplete'></div> <div class='e-autocomplete'></div>
".implode("\n", $filter_preserve_var). ' ".implode("\n", $filter_preserve_var). '
' .$this->admin_button('etrigger_filter', 'etrigger_filter', 'filter e-hide-if-js', ADMIN_FILTER_ICON, array('id' => false, 'title' =>LAN_FILTER)). ' ' .$this->admin_button('etrigger_filter', 'etrigger_filter', 'filter e-hide-if-js', ADMIN_FILTER_ICON, array('id' => false, 'title' =>LAN_FILTER, 'loading' => false)). '
' .$this->renderPagination()." ' .$this->renderPagination()."
".$gridToggle." ".$gridToggle."
@@ -7614,13 +7614,14 @@ class e_admin_form_ui extends e_form
}); });
}; };
var searchQueryHandler = function (e) { var searchQueryHandler = function (e) {
var el = \$(this), frm = el.parents('form'), cont = frm.nextAll('.e-container'); var el = \$(this), frm = el.parents('form'), cont = frm.nextAll('.e-container');
if(cont.length < 1 || frm.length < 1 || (el.val().length > 0 && el.val().length < 3)) return; if(cont.length < 1 || frm.length < 1 || (el.val().length > 0 && el.val().length < 3)) return;
e.preventDefault(); e.preventDefault();
if(filterRunning && request) request.abort(); if(filterRunning && request) request.abort();
filterRunning = true; filterRunning = true;
\$('#admin-ui-list-filter .indicator').show();
cont.css({ opacity: 0.5 }); cont.css({ opacity: 0.5 });
request = \$.get(frm.attr('action'), frm.serialize(), function(data){ request = \$.get(frm.attr('action'), frm.serialize(), function(data){
@@ -7631,6 +7632,7 @@ class e_admin_form_ui extends e_form
return; return;
} }
cont.html(data).css({ opacity: 1 }); cont.html(data).css({ opacity: 1 });
\$('#admin-ui-list-filter .indicator').hide();
// TODO remove applyAfterAjax() and use behaviors! // TODO remove applyAfterAjax() and use behaviors!
applyAfterAjax(cont); applyAfterAjax(cont);
// Attach behaviors to the newly loaded contents. // Attach behaviors to the newly loaded contents.
@@ -7643,6 +7645,16 @@ class e_admin_form_ui extends e_form
}); });
}; };
\$('#searchquery').on('keyup', searchQueryHandler); \$('#searchquery').on('keyup', searchQueryHandler);
\$('#filter-options').on('change', function() {
\$('#admin-ui-list-filter .indicator').show();
});
\$('#etrigger-filter').on('click', function() {
\$('#admin-ui-list-filter .indicator').show();
});
", 'jquery'); ", 'jquery');
return $text; return $text;