aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2021-06-03 20:27:30 +0000
committerzsloan2021-06-03 20:27:30 +0000
commita32988be49cb84834b24029224b9507e48b4241d (patch)
tree29ab3e8b4e90cbfd4f0cda2ca48bbe1312e70e1b
parent0b760c8282031043e6a9a62ce61bd66eee0f9faf (diff)
downloadgenenetwork2-a32988be49cb84834b24029224b9507e48b4241d.tar.gz
Implemented Scroller with gene global search; for the time being this disables the server-side processing, since that was assuming pagination and caused slow-downs when scrolling or sorting (likely because it's acting as if the full list of results are one page)
-rw-r--r--wqflask/wqflask/templates/gsearch_gene.html34
1 files changed, 17 insertions, 17 deletions
diff --git a/wqflask/wqflask/templates/gsearch_gene.html b/wqflask/wqflask/templates/gsearch_gene.html
index 48953d98..5d2260c1 100644
--- a/wqflask/wqflask/templates/gsearch_gene.html
+++ b/wqflask/wqflask/templates/gsearch_gene.html
@@ -48,6 +48,7 @@
{% block js %}
<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/md5.min.js') }}"></script>
<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
+ <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/scroller/js/dataTables.scroller.min.js') }}"></script>
<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='jszip/jszip.min.js') }}"></script>
<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/natural.js') }}"></script>
<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/colReorder/js/dataTables.colReorder.js') }}"></script>
@@ -66,6 +67,10 @@
};
</script>
+ <script type='text/javascript'>
+ var trait_list = {{ trait_list|safe }};
+ </script>
+
<script type="text/javascript" charset="utf-8">
$(document).ready( function () {
@@ -102,7 +107,6 @@
}
}
- console.time("Creating table");
$('#trait_table').DataTable( {
'drawCallback': function( settings ) {
$('#trait_table tr').click(function(event) {
@@ -150,6 +154,7 @@
$('td', row).eq(12).attr('data-export', $('td', row).eq(12).text());
$('td', row).eq(13).attr('data-export', $('td', row).eq(13).text());
},
+ 'data': trait_list,
'columns': [
{
'data': null,
@@ -241,20 +246,18 @@
'orderSequence': [ "desc", "asc"]
}
],
- 'order': [[1, "asc" ]],
- 'sDom': "pitirp",
- 'autoWidth': true,
- 'deferRender': false,
- 'paging': true,
- 'orderClasses': true,
+ "order": [[1, "asc" ]],
+ 'sDom': "iti",
+ "autoWidth": true,
+ "bSortClasses": false,
'processing': true,
- 'iDisplayLength': 100,
- 'bServerSide': true,
- 'sAjaxSource': '/gsearch_table'+getParams(window.location.href),
- 'language': {
- 'loadingRecords': '&nbsp;',
- 'processing': 'Loading...'
- }
+ {% if trait_count > 20 %}
+ "scrollY": "100vh",
+ "scroller": true,
+ "scrollCollapse": true
+ {% else %}
+ "iDisplayLength": -1
+ {% endif %}
} );
$('#trait_table').append(
@@ -277,9 +280,6 @@
'</tr>' +
'</tfoot>'
);
-
- console.timeEnd("Creating table");
-
});
</script>