Commit 90d79e48 authored by dmorley's avatar dmorley

Merge branch 'fast-loading' into 'develop'

Fast loading

See merge request !246
parents 135f4aaa 072ef97c
Pipeline #2949 passed with stage
in 37 seconds
......@@ -9,6 +9,15 @@ The format is based on [Keep a Changelog] and this project adheres to [Semantic
### Fixed
### Security
## [2.6.3]
### Added
### Changed
- js for table no longer filters pods that are signup only, this is a 20 second improvment on page load
### Deprecated
### Removed
### Fixed
### Security
## [2.6.2] - 2019-11-24
### Added
- Total rows count o loading screen as that is growing
......
......@@ -242,7 +242,7 @@ a {
position: absolute;
top: 197px;
width: 40px;
animation: pulsate 5s ease-out;
animation: pulsate 1s ease-out;
animation-iteration-count: infinite;
}
......
......@@ -52,20 +52,10 @@ $(document).ready(function () {
$('.resetfilters').on('click', function () {
$('table').trigger('filterReset');
});
var input = $('input:input[name="input"]').val();
$.get('tabledata.php?ajax=page2', function (html) {
$('table tbody').append(html);
$('table').trigger('update', [true]);
var columns = [];
columns[8] = 'Yes';
if (input) {
columns[0] = input;
columns[8] = '';
}
$('table').trigger('search', [columns]);
$('.pagerhidden').delay(30).show(800);
$('[data-toggle="tooltip"]').tooltip();
$('.loadingtable').delay(30).hide(300);
});
$('#colSelect1').prop('checked', false);
$('.loadingtable').delay(3).hide(300);
})
$('[data-toggle="tooltip"]').tooltip();
});
......@@ -56,7 +56,7 @@ try {
<span class="first pagination" title="First page">&laquo;</span>
<span class="prev pagination" title="Previous page">&lt;</span>
<span class="pagedisplay text-center pagerhidden hidden"></span>
<span class="pagedisplay text-center pagerhidden"></span>
<span class="next pagination" title="Next page">&gt;</span>
<span class="last pagination" title="Last page">&raquo;</span>
......@@ -74,7 +74,7 @@ try {
<div class="table-responsive">
<div class="loadingtable">
<div class="loadingmessage">Loading <span id="podcountdown"><?php echo $pods[0]['count']; ?></span> lines of data to the table, this takes under 30 seconds</div>
<div class="loadingmessage">Loading <span id="podcountdown"><?php echo $pods[0]['count']; ?></span> lines of data to the table</div>
<div class="signal"></div>
</div>
<table class="table table-bordered table-sm tablesorter table-hover tfont">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment