Improved WCF.System.Page.Multiple

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index c603d7c5770681e181e3c19d3d1bb820df8f8775..a9e9fa6213baaa7e42e0e54a3d1931e57e6f906c 100644 (file)
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -1218,9 +1218,7 @@ WCF.ACP.Package.Search = Class.extend({
        }
 });
 
-WCF.ACP.Package.Server = {
-       
-};
+WCF.ACP.Package.Server = { };
 
 WCF.ACP.Package.Server.Installation = Class.extend({
        _proxy: null,

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index 05c3ff9184015225e7724e4991e930b35c2c5d54..234578599dbca25c5835ea13b5c822b7c7b0b2c4 100755 (executable)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -6660,6 +6660,7 @@ WCF.System.Page.Multiple = Class.extend({
        _options: { },
        _pageNo: 1,
        _pages: 0,
+       _previousPageNo: 0,
        
        init: function(options) {
                this._options = $.extend({
@@ -6670,6 +6671,17 @@ WCF.System.Page.Multiple = Class.extend({
                        // callbacks
                        loadItems: null
                }, options);
+               
+               this._cache = { };
+               this._pageNo = 1;
+               this._pages = 0;
+               this._previousPageNo = 0;
+               
+               if (this._pagination.data('pages')) {
+                       this._pagination.wcfPages({
+                               maxPage: this._pagination.data('pages')
+                       }).on('wcfpagesswitched', $.proxy(this._showPage, this));
+               }
        },
        
        /**
@@ -6698,7 +6710,7 @@ WCF.System.Page.Multiple = Class.extend({
                        }
                }
                else {
-                       this._loadItems();
+                       this._options.loadItems();
                }
        },
        
@@ -6707,6 +6719,10 @@ WCF.System.Page.Multiple = Class.extend({
                        activePage: pageNo,
                        template: template
                });
+       },
+       
+       getPageNo: function() {
+               return this._pageNo;
        }
 });