From 26cbeccba16b4fe0e80bcbc21c88e1a0b8fb90ff Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Mon, 2 May 2016 16:15:12 +0100 Subject: [PATCH] Fix - example: Server-side pipelining didn't work when all data is requested - Although this mitigates any benefits of using server-side processing it is something that should be handled. - Thanks Hormah for pointing this out. --- .datatables-commit-sync | 2 +- examples/server_side/pipeline.html | 8 ++++++-- media/js/dataTables.semanticui.js | 4 +--- media/js/dataTables.semanticui.min.js | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 94bbb3c9..c454c277 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -91a3581a1c030835bead900b938ef07840f44ca5 +f62f7617c1f9539dac46d8964616e1dec730b8eb diff --git a/examples/server_side/pipeline.html b/examples/server_side/pipeline.html index bb6a8359..9a6176a2 100644 --- a/examples/server_side/pipeline.html +++ b/examples/server_side/pipeline.html @@ -111,7 +111,9 @@ $.fn.dataTable.pipeline = function ( opts ) { if ( cacheLower != drawStart ) { json.data.splice( 0, drawStart-cacheLower ); } - json.data.splice( requestLength, json.data.length ); + if ( requestLength >= -1 ) { + json.data.splice( requestLength, json.data.length ); + } drawCallback( json ); } @@ -289,7 +291,9 @@ $.fn.dataTable.pipeline = function ( opts ) { if ( cacheLower != drawStart ) { json.data.splice( 0, drawStart-cacheLower ); } - json.data.splice( requestLength, json.data.length ); + if ( requestLength >= -1 ) { + json.data.splice( requestLength, json.data.length ); + } drawCallback( json ); } diff --git a/media/js/dataTables.semanticui.js b/media/js/dataTables.semanticui.js index bc4db816..97f797ec 100644 --- a/media/js/dataTables.semanticui.js +++ b/media/js/dataTables.semanticui.js @@ -199,9 +199,7 @@ $(document).on( 'init.dt', function (e, ctx) { if ( $.fn.dropdown ) { var api = new $.fn.dataTable.Api( ctx ); - $( 'div.dataTables_length select', api.table().container() ).dropdown( { - on: 'click' - } ); + $( 'div.dataTables_length select', api.table().container() ).dropdown(); } } ); diff --git a/media/js/dataTables.semanticui.min.js b/media/js/dataTables.semanticui.min.js index 32cd0dea..cb60091e 100644 --- a/media/js/dataTables.semanticui.min.js +++ b/media/js/dataTables.semanticui.min.js @@ -5,5 +5,5 @@ (function(b){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],function(a){return b(a,window,document)}):"object"===typeof exports?module.exports=function(a,d){a||(a=window);if(!d||!d.fn.dataTable)d=require("datatables.net")(a,d).$;return b(d,a,a.document)}:b(jQuery,window,document)})(function(b,a,d){var e=b.fn.dataTable;b.extend(!0,e.defaults,{dom:"<'ui grid'<'row'<'eight wide column'l><'right aligned eight wide column'f>><'row dt-table'<'sixteen wide column'tr>><'row'<'seven wide column'i><'right aligned nine wide column'p>>>", renderer:"semanticUI"});b.extend(e.ext.classes,{sWrapper:"dataTables_wrapper dt-semanticUI",sFilter:"dataTables_filter ui input",sProcessing:"dataTables_processing ui segment",sPageButton:"paginate_button item"});e.ext.renderer.pageButton.semanticUI=function(h,a,r,s,j,m){var n=new e.Api(h),t=h.oClasses,k=h.oLanguage.oPaginate,u=h.oLanguage.oAria.paginate||{},f,g,o=0,p=function(a,d){var e,i,l,c,q=function(a){a.preventDefault();!b(a.currentTarget).hasClass("disabled")&&n.page()!=a.data.action&&n.page(a.data.action).draw("page")}; e=0;for(i=d.length;e",{"class":t.sPageButton+" "+g,id:0===r&&"string"===typeof c? -h.sTableId+"_"+c:null,href:"#","aria-controls":h.sTableId,"aria-label":u[c],"data-dt-idx":o,tabindex:h.iTabIndex}).html(f).appendTo(a),h.oApi._fnBindAction(l,{action:c},q),o++)}},i;try{i=b(a).find(d.activeElement).data("dt-idx")}catch(v){}p(b(a).empty().html('