Merge pull request #35 from rozwell/master

[pager] Fixed NaN pager size when cssPageSize is not set & manual page setting on construct.
This commit is contained in:
Rob G 2012-03-17 20:06:53 -07:00
commit 840aac3c61

View File

@ -136,7 +136,7 @@
},
hideRowsSetup = function(table, c){
c.size = parseInt($(c.cssPageSize, c.container).val(), 10);
c.size = parseInt($(c.cssPageSize, c.container).val(), 10) || c.size;
$.data(table, 'pagerLastSize', c.size);
pagerArrows(c);
if (!c.removeRows) {
@ -328,11 +328,11 @@
enablePager = function(table, c, triggered){
var p = $(c.cssPageSize, c.container).removeClass(c.cssDisabled).removeAttr('disabled');
c.isDisabled = false;
c.page = $.data(table, 'pagerLastPage') || 0;
c.size = $.data(table, 'pagerLastSize') || parseInt(p.val(), 10);
c.page = $.data(table, 'pagerLastPage') || c.page || 0;
c.size = $.data(table, 'pagerLastSize') || parseInt(p.val(), 10) || c.size;
c.totalPages = Math.ceil(c.totalRows / c.size);
if (triggered) {
$('table').trigger('update');
$(table).trigger('update');
setPageSize(table, c.size, c);
hideRowsSetup(table, c);
fixHeight(table, c);