rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2025-03-15 16:29:16 +01:00
Code Issues Releases Activity

New: fnPageChange will now accept integers as well as the four current strings. The integer given represents the page that the table should jump to. Also update the internal calls to use this new ability as it is cleaner.

Browse Source
This commit is contained in:
Allan Jardine 2011-12-11 08:41:55 +00:00
parent 0d772b5eba
commit e5816e381c
4 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
media/js/jquery.dataTables.js vendored
View File

@ -2788,19 +2788,28 @@
/** /**
* Alter the display settings to change the page * Alter the display settings to change the page
* @param {object} oSettings dataTables settings object * @param {object} oSettings dataTables settings object
* @param {string} sAction paging action to take: "first", "previous", "next" or "last" * @param {string|int} mAction Paging action to take: "first", "previous", "next" or "last"
* or page number to jump to (integer)
* @returns {bool} true page has changed, false - no change (no effect) eg 'first' on page 1 * @returns {bool} true page has changed, false - no change (no effect) eg 'first' on page 1
* @private * @private
*/ */
function _fnPageChange ( oSettings, sAction ) function _fnPageChange ( oSettings, mAction )
{ {
var iOldStart = oSettings._iDisplayStart; var iOldStart = oSettings._iDisplayStart;
if ( sAction == "first" ) if ( typeof mAction == "number" )
{
oSettings._iDisplayStart = mAction * oSettings._iDisplayLength;
if ( oSettings._iDisplayStart > oSettings.fnRecordsDisplay() )
{
oSettings._iDisplayStart = 0;
}
}
else if ( mAction == "first" )
{ {
oSettings._iDisplayStart = 0; oSettings._iDisplayStart = 0;
} }
else if ( sAction == "previous" ) else if ( mAction == "previous" )
{ {
oSettings._iDisplayStart = oSettings._iDisplayLength>=0 ? oSettings._iDisplayStart = oSettings._iDisplayLength>=0 ?
oSettings._iDisplayStart - oSettings._iDisplayLength : oSettings._iDisplayStart - oSettings._iDisplayLength :
@ -2812,7 +2821,7 @@
oSettings._iDisplayStart = 0; oSettings._iDisplayStart = 0;
} }
} }
else if ( sAction == "next" ) else if ( mAction == "next" )
{ {
if ( oSettings._iDisplayLength >= 0 ) if ( oSettings._iDisplayLength >= 0 )
{ {
@ -2827,7 +2836,7 @@
oSettings._iDisplayStart = 0; oSettings._iDisplayStart = 0;
} }
} }
else if ( sAction == "last" ) else if ( mAction == "last" )
{ {
if ( oSettings._iDisplayLength >= 0 ) if ( oSettings._iDisplayLength >= 0 )
{ {
@ -5497,7 +5506,8 @@
* Change the pagination - provides the internal logic for pagination in a simple API * Change the pagination - provides the internal logic for pagination in a simple API
* function. With this function you can have a DataTables table go to the next, * function. With this function you can have a DataTables table go to the next,
* previous, first or last pages. * previous, first or last pages.
* @param {string} sAction Paging action to take: "first", "previous", "next" or "last" * @param {string|int} mAction Paging action to take: "first", "previous", "next" or "last"
* or page number to jump to (integer), note that page 0 is the first page.
* @param {bool} [bRedraw=true] Redraw the table or not * @param {bool} [bRedraw=true] Redraw the table or not
* *
* @example * @example
@ -5506,10 +5516,10 @@
* oTable.fnPageChange( 'next' ); * oTable.fnPageChange( 'next' );
* } ); * } );
*/ */
this.fnPageChange = function ( sAction, bRedraw ) this.fnPageChange = function ( mAction, bRedraw )
{ {
var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] ); var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
_fnPageChange( oSettings, sAction ); _fnPageChange( oSettings, mAction );
_fnCalculateEnd( oSettings ); _fnCalculateEnd( oSettings );
if ( typeof bRedraw == 'undefined' || bRedraw ) if ( typeof bRedraw == 'undefined' || bRedraw )
@ -10141,8 +10151,7 @@
var anButtons, anStatic, nPaginateList; var anButtons, anStatic, nPaginateList;
var fnClick = function(e) { var fnClick = function(e) {
/* Use the information in the element to jump to the required page */ /* Use the information in the element to jump to the required page */
var iTarget = (this.innerHTML * 1) - 1; oSettings.oApi._fnPageChange( oSettings, parseInt(this.innerHTML,10) - 1 )
oSettings._iDisplayStart = iTarget * oSettings._iDisplayLength;
fnCallbackDraw( oSettings ); fnCallbackDraw( oSettings );
e.preventDefault(); e.preventDefault();
}; };

7
media/src/api/api.methods.js
View File

@ -813,7 +813,8 @@ this.fnOpen = function( nTr, mHtml, sClass )
* Change the pagination - provides the internal logic for pagination in a simple API * Change the pagination - provides the internal logic for pagination in a simple API
* function. With this function you can have a DataTables table go to the next, * function. With this function you can have a DataTables table go to the next,
* previous, first or last pages. * previous, first or last pages.
* @param {string} sAction Paging action to take: "first", "previous", "next" or "last" * @param {string|int} mAction Paging action to take: "first", "previous", "next" or "last"
* or page number to jump to (integer), note that page 0 is the first page.
* @param {bool} [bRedraw=true] Redraw the table or not * @param {bool} [bRedraw=true] Redraw the table or not
* *
* @example * @example
@ -822,10 +823,10 @@ this.fnOpen = function( nTr, mHtml, sClass )
* oTable.fnPageChange( 'next' ); * oTable.fnPageChange( 'next' );
* } ); * } );
*/ */
this.fnPageChange = function ( sAction, bRedraw ) this.fnPageChange = function ( mAction, bRedraw )
{ {
var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] ); var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
_fnPageChange( oSettings, sAction ); _fnPageChange( oSettings, mAction );
_fnCalculateEnd( oSettings ); _fnCalculateEnd( oSettings );
if ( typeof bRedraw == 'undefined' || bRedraw ) if ( typeof bRedraw == 'undefined' || bRedraw )

21
media/src/core/core.page.js
View File

@ -48,19 +48,28 @@ function _fnFeatureHtmlPaginate ( oSettings )
/** /**
* Alter the display settings to change the page * Alter the display settings to change the page
* @param {object} oSettings dataTables settings object * @param {object} oSettings dataTables settings object
* @param {string} sAction paging action to take: "first", "previous", "next" or "last" * @param {string|int} mAction Paging action to take: "first", "previous", "next" or "last"
* or page number to jump to (integer)
* @returns {bool} true page has changed, false - no change (no effect) eg 'first' on page 1 * @returns {bool} true page has changed, false - no change (no effect) eg 'first' on page 1
* @private * @private
*/ */
function _fnPageChange ( oSettings, sAction ) function _fnPageChange ( oSettings, mAction )
{ {
var iOldStart = oSettings._iDisplayStart; var iOldStart = oSettings._iDisplayStart;
if ( sAction == "first" ) if ( typeof mAction == "number" )
{
oSettings._iDisplayStart = mAction * oSettings._iDisplayLength;
if ( oSettings._iDisplayStart > oSettings.fnRecordsDisplay() )
{
oSettings._iDisplayStart = 0;
}
}
else if ( mAction == "first" )
{ {
oSettings._iDisplayStart = 0; oSettings._iDisplayStart = 0;
} }
else if ( sAction == "previous" ) else if ( mAction == "previous" )
{ {
oSettings._iDisplayStart = oSettings._iDisplayLength>=0 ? oSettings._iDisplayStart = oSettings._iDisplayLength>=0 ?
oSettings._iDisplayStart - oSettings._iDisplayLength : oSettings._iDisplayStart - oSettings._iDisplayLength :
@ -72,7 +81,7 @@ function _fnPageChange ( oSettings, sAction )
oSettings._iDisplayStart = 0; oSettings._iDisplayStart = 0;
} }
} }
else if ( sAction == "next" ) else if ( mAction == "next" )
{ {
if ( oSettings._iDisplayLength >= 0 ) if ( oSettings._iDisplayLength >= 0 )
{ {
@ -87,7 +96,7 @@ function _fnPageChange ( oSettings, sAction )
oSettings._iDisplayStart = 0; oSettings._iDisplayStart = 0;
} }
} }
else if ( sAction == "last" ) else if ( mAction == "last" )
{ {
if ( oSettings._iDisplayLength >= 0 ) if ( oSettings._iDisplayLength >= 0 )
{ {

3
media/src/ext/ext.paging.js
View File

@ -225,8 +225,7 @@ $.extend( DataTable.ext.oPagination, {
var anButtons, anStatic, nPaginateList; var anButtons, anStatic, nPaginateList;
var fnClick = function(e) { var fnClick = function(e) {
/* Use the information in the element to jump to the required page */ /* Use the information in the element to jump to the required page */
var iTarget = (this.innerHTML * 1) - 1; oSettings.oApi._fnPageChange( oSettings, parseInt(this.innerHTML,10) - 1 )
oSettings._iDisplayStart = iTarget * oSettings._iDisplayLength;
fnCallbackDraw( oSettings ); fnCallbackDraw( oSettings );
e.preventDefault(); e.preventDefault();
}; };