From e815062197c87328c25d37a440a785d1156b8b19 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Fri, 30 Mar 2012 07:48:33 +0100 Subject: [PATCH] Fix: When -1 is selected for the display length (show all) the full numbers paging control didn't show page '1' - 9170 --- media/js/jquery.dataTables.js | 9 ++++++++- media/src/ext/ext.paging.js | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 02a6bad0..49079f99 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -11304,7 +11304,13 @@ }; /* Pages calculation */ - if (iPages < iPageCount) + if ( oSettings._iDisplayLength === -1 ) + { + iStartButton = 1; + iEndButton = 1; + iCurrentPage = 1; + } + else if (iPages < iPageCount) { iStartButton = 1; iEndButton = iPages; @@ -11324,6 +11330,7 @@ iStartButton = iCurrentPage - Math.ceil(iPageCount / 2) + 1; iEndButton = iStartButton + iPageCount - 1; } + /* Build the dynamic list */ for ( i=iStartButton ; i<=iEndButton ; i++ ) diff --git a/media/src/ext/ext.paging.js b/media/src/ext/ext.paging.js index cc0e41c7..195a5797 100644 --- a/media/src/ext/ext.paging.js +++ b/media/src/ext/ext.paging.js @@ -184,7 +184,13 @@ $.extend( DataTable.ext.oPagination, { }; /* Pages calculation */ - if (iPages < iPageCount) + if ( oSettings._iDisplayLength === -1 ) + { + iStartButton = 1; + iEndButton = 1; + iCurrentPage = 1; + } + else if (iPages < iPageCount) { iStartButton = 1; iEndButton = iPages; @@ -204,6 +210,7 @@ $.extend( DataTable.ext.oPagination, { iStartButton = iCurrentPage - Math.ceil(iPageCount / 2) + 1; iEndButton = iStartButton + iPageCount - 1; } + /* Build the dynamic list */ for ( i=iStartButton ; i<=iEndButton ; i++ )