|
@@ -724,12 +724,8 @@ class TableAjax extends ViewAjax {
|
|
|
|
|
|
|
|
//find out what rows to show next...
|
|
//find out what rows to show next...
|
|
|
var rowsAdded = 0;
|
|
var rowsAdded = 0;
|
|
|
- _data.toRow = _data.fromRow + priv.options.pageSize;
|
|
|
|
|
- if (_data.toRow > _data.total)
|
|
|
|
|
- _data.toRow = _data.total;
|
|
|
|
|
|
|
|
|
|
//slice out the chunk of data we need and create rows
|
|
//slice out the chunk of data we need and create rows
|
|
|
- //$.each(_data.rows.slice(_data.fromRow, _data.toRow), function (index, props) {
|
|
|
|
|
$.each(_data.rows, function (index, props) {
|
|
$.each(_data.rows, function (index, props) {
|
|
|
var row = $('<tr></tr>').appendTo(_body);
|
|
var row = $('<tr></tr>').appendTo(_body);
|
|
|
|
|
|
|
@@ -920,7 +916,6 @@ class TableAjax extends ViewAjax {
|
|
|
|
|
|
|
|
//enough rows created?
|
|
//enough rows created?
|
|
|
if (rowsAdded >= priv.options.pageSize) {
|
|
if (rowsAdded >= priv.options.pageSize) {
|
|
|
- _data.toRow = _data.fromRow + rowsAdded;
|
|
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
@@ -1334,7 +1329,7 @@ class TableAjax extends ViewAjax {
|
|
|
node;
|
|
node;
|
|
|
if (priv.options.debug) console.log('Render: ', nodeClass);
|
|
if (priv.options.debug) console.log('Render: ', nodeClass);
|
|
|
node = $('<div class="foot-info ' + nodeClass + '"></div>');
|
|
node = $('<div class="foot-info ' + nodeClass + '"></div>');
|
|
|
- //console.log('renderFooterInfo fromRow', _data.fromRow, 'toRow', _data.toRow, 'total', _data.total, 'page', _state.page, 'priv.options.pageSize', priv.options.pageSize);
|
|
|
|
|
|
|
+ //console.log('renderFooterInfo total', _data.total, 'page', _state.page, 'priv.options.pageSize', priv.options.pageSize);
|
|
|
var fromRow = Math.max(_state.page - 1, 0) * _state.pageSize;
|
|
var fromRow = Math.max(_state.page - 1, 0) * _state.pageSize;
|
|
|
var total = _data.total;
|
|
var total = _data.total;
|
|
|
var toRow = Math.min(fromRow + _state.pageSize, total);
|
|
var toRow = Math.min(fromRow + _state.pageSize, total);
|
|
@@ -1875,9 +1870,6 @@ class TableAjax extends ViewAjax {
|
|
|
|
|
|
|
|
priv.setStateData = function (pData, skipCols, resetChecked) {
|
|
priv.setStateData = function (pData, skipCols, resetChecked) {
|
|
|
var data = $.extend(true, {}, pData);
|
|
var data = $.extend(true, {}, pData);
|
|
|
- data.fromRow = _data && _data.fromRow || 0;
|
|
|
|
|
- data.toRow = _data && _data.toRow || 0;
|
|
|
|
|
-
|
|
|
|
|
data.cols = _state.cols;// always use old cols - change cols mved to priv.setStateCols
|
|
data.cols = _state.cols;// always use old cols - change cols mved to priv.setStateCols
|
|
|
|
|
|
|
|
_data = data;
|
|
_data = data;
|
|
@@ -1885,15 +1877,7 @@ class TableAjax extends ViewAjax {
|
|
|
|
|
|
|
|
//we might have more/less data now. Recalculate stuff.
|
|
//we might have more/less data now. Recalculate stuff.
|
|
|
if (_state.page > 1) {
|
|
if (_state.page > 1) {
|
|
|
- _data.toRow = Math.min(_data.total, _data.toRow);
|
|
|
|
|
- _data.fromRow = _data.toRow - priv.options.pageSize;
|
|
|
|
|
- _data.fromRow = Math.max(_data.fromRow, 0);
|
|
|
|
|
_totalPages = Math.ceil(_data.total / priv.options.pageSize);
|
|
_totalPages = Math.ceil(_data.total / priv.options.pageSize);
|
|
|
- } else {
|
|
|
|
|
- _data.fromRow = 0;
|
|
|
|
|
- if (priv.options.pageSize != -1)
|
|
|
|
|
- _data.toRow = _data.fromRow + priv.options.pageSize;
|
|
|
|
|
- _data.toRow = Math.max(_data.toRow, _data.total);
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//keep any previously checked rows around?
|
|
//keep any previously checked rows around?
|
|
@@ -2312,11 +2296,6 @@ class TableAjax extends ViewAjax {
|
|
|
}
|
|
}
|
|
|
priv.options.pageSize = parseInt(val);
|
|
priv.options.pageSize = parseInt(val);
|
|
|
|
|
|
|
|
- //revert to first page, as its gets messy otherwise.
|
|
|
|
|
- _data.fromRow = 0;
|
|
|
|
|
- _data.toRow = _data.fromRow + priv.options.pageSize;
|
|
|
|
|
- if (_data.toRow > _data.rows.length) _data.toRow = _data.rows.length;
|
|
|
|
|
-
|
|
|
|
|
publ.loadPage(1, priv.options.pageSize);
|
|
publ.loadPage(1, priv.options.pageSize);
|
|
|
|
|
|
|
|
jQuery(_uiNodeCont).trigger('TableAjax:render', ['body', 'foot_pagination']);
|
|
jQuery(_uiNodeCont).trigger('TableAjax:render', ['body', 'foot_pagination']);
|