|
|
@@ -2392,9 +2392,16 @@
|
|
|
};
|
|
|
|
|
|
BootstrapTable.prototype.getData = function (useCurrentPage) {
|
|
|
- return (this.searchText || !$.isEmptyObject(this.filterColumns) || !$.isEmptyObject(this.filterColumnsPartial)) ?
|
|
|
- (useCurrentPage ? this.data.slice(this.pageFrom - 1, this.pageTo) : this.data) :
|
|
|
- (useCurrentPage ? this.options.data.slice(this.pageFrom - 1, this.pageTo) : this.options.data);
|
|
|
+ var data = this.options.data;
|
|
|
+ if (this.searchText || this.options.sortName || !$.isEmptyObject(this.filterColumns) || !$.isEmptyObject(this.filterColumnsPartial)) {
|
|
|
+ data = this.data;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (useCurrentPage) {
|
|
|
+ return data.slice(this.pageFrom - 1, this.pageTo);
|
|
|
+ }
|
|
|
+
|
|
|
+ return data;
|
|
|
};
|
|
|
|
|
|
BootstrapTable.prototype.load = function (data) {
|