composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 23:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Regression due to the interaction of the two previous fixes. (Trac #444 and Trac #448)

Browse Source 
SVN:trunk[1541]
This commit is contained in:
Denis Flaven
2011-08-30 11:12:14 +00:00
parent 038fe30fbe
commit 3b42c86f46
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
js/jquery.tablesorter.pager.js
View File

@@ -13,7 +13,7 @@ function sprintf(format, etc) {
var s = $(c.cssPageDisplay,c.container).val((c.page+1) + c.seperator + c.totalPages); var s = $(c.cssPageDisplay,c.container).val((c.page+1) + c.seperator + c.totalPages);
} }
function setPageSize(table,size) { function setPageSize(table,size, bReload) {
var c = table.config; var c = table.config;
c.selectedSize = size; c.selectedSize = size;
if (size == -1) if (size == -1)
@@ -23,7 +23,10 @@ function sprintf(format, etc) {
c.size = size; c.size = size;
c.totalPages = Math.ceil(c.totalRows / c.size); c.totalPages = Math.ceil(c.totalRows / c.size);
c.pagerPositionSet = false; c.pagerPositionSet = false;
if (bReload)
{
moveToPage(table); moveToPage(table);
}
fixPosition(table); fixPosition(table);
} }
@@ -373,19 +376,11 @@ function sprintf(format, etc) {
if (params != undefined) if (params != undefined)
{ {
$(table.config.cssPageSize, table.config.container).val(params.size);
setPageSize(table, params.size, false); // false => don't trigger a reload
if (table.config.sortList != params.sortList) if (table.config.sortList != params.sortList)
{ {
$(table).trigger("sorton", [params.sortList]); $(table).trigger("sorton", [params.sortList]); // triggers a reload anyway
}
if (table.config.selectedSize != params.size)
{
$(table.config.cssPageSize, table.config.container).val(params.size);
setPageSize(table, params.size);
}
if (table.config.page != params.page)
{
table.config.page = params.page;
moveToPage(table);
} }
} }
} }
@@ -427,12 +422,12 @@ function sprintf(format, etc) {
this.ajax_request = null; this.ajax_request = null;
$(this).trigger("appendCache");
setPageSize(table,parseInt($(".pagesize",pager).val()));
config.selectedSize = parseInt($(".pagesize",pager).val()); config.selectedSize = parseInt($(".pagesize",pager).val());
setPageSize(table,config.selectedSize, false);
restoreParams(table, config); restoreParams(table, config);
$(this).trigger("appendCache"); // Load the data
$(config.cssFirst,pager).click(function() { $(config.cssFirst,pager).click(function() {
moveToFirstPage(table); moveToFirstPage(table);
return false; return false;
@@ -450,7 +445,7 @@ function sprintf(format, etc) {
return false; return false;
}); });
$(config.cssPageSize,pager).change(function() { $(config.cssPageSize,pager).change(function() {
setPageSize(table,parseInt($(this).val())); setPageSize(table,parseInt($(this).val()), true);
return false; return false;
}); });
$(table).find(':checkbox.checkAll').removeAttr('onclick').click(function() { $(table).find(':checkbox.checkAll').removeAttr('onclick').click(function() {