diff --git a/.datatables-commit-sync b/.datatables-commit-sync index cc6267fb..c4dd489d 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -2d010519a1e59abb203e8e85bdbbea26ec7b0d94 +a113011de1bb16a367ea50aa8a97d1139cedddee diff --git a/composer.json b/composer.json index 0f0d5ff5..e8ed0882 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "datatables/datatables", - "version": "1.10.12", + "version": "1.10.13-dev", "description": "DataTables is a plug-in for the jQuery Javascript library. It is a highly flexible tool, based upon the foundations of progressive enhancement, which will add advanced interaction controls to any HTML table.", "homepage": "http://www.datatables.net/", "author": "SpryMedia", diff --git a/dataTables.jquery.json b/dataTables.jquery.json index 47ca72c6..3850894e 100644 --- a/dataTables.jquery.json +++ b/dataTables.jquery.json @@ -1,6 +1,6 @@ { "name": "DataTables", - "version": "1.10.12", + "version": "1.10.13-dev", "description": "DataTables enhances HTML tables with the ability to sort, filter and page the data in the table very easily. It provides a comprehensive API and set of configuration options, allowing you to consume data from virtually any data source.", "homepage": "http://datatables.net/", "docs": "http://datatables.net/", diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index f6dc4ebc..26c0b21d 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -1325,8 +1325,8 @@ if ( oInit.bStateSave ) { features.bStateSave = true; - _fnLoadState( oSettings, oInit, loadedInit ); _fnCallbackReg( oSettings, 'aoDrawCallback', _fnSaveState, 'state_save' ); + _fnLoadState( oSettings, oInit, loadedInit ); } else { loadedInit(); diff --git a/media/js/jquery.dataTables.min.js b/media/js/jquery.dataTables.min.js index 10c9b6ed..0600cde6 100644 --- a/media/js/jquery.dataTables.min.js +++ b/media/js/jquery.dataTables.min.js @@ -90,7 +90,7 @@ success:function(a){Fa(a);J(l.oLanguage,a);h.extend(true,s,a);ha(o)},error:funct e.length;j").appendTo(q));o.nTHead=b[0];b=q.children("tbody");b.length===0&&(b=h("
").appendTo(q));o.nTBody=b[0];b=q.children("tfoot");if(b.length===0&&a.length>0&&(o.oScroll.sX!==""||o.oScroll.sY!==""))b=h("").appendTo(q);if(b.length===0||b.children().length===0)q.addClass(r.sNoFooter);else if(b.length>0){o.nTFoot=b[0];ea(o.aoFooter,o.nTFoot)}if(g.aaData)for(j=0;j