From d62d0d94d24f10d0d7555a02a587a3378a910391 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Tue, 31 Dec 2013 21:50:40 +0100 Subject: [PATCH] Fixed wcfPages display issue and ACP package search navigation Fixes #1512 --- wcfsetup/install/files/acp/js/WCF.ACP.js | 7 ++++--- wcfsetup/install/files/js/WCF.js | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js index 0dae783e29..09b51fd0f1 100644 --- a/wcfsetup/install/files/acp/js/WCF.ACP.js +++ b/wcfsetup/install/files/acp/js/WCF.ACP.js @@ -1167,15 +1167,16 @@ WCF.ACP.Package.Search = Class.extend({ this._packageSearchResultContainer.find('.pageNavigation').wcfPages('destroy').remove(); if (this._pageCount > 1) { - $('
').insertBefore(this._packageSearchResultList).wcfPages({ + // TODO: Fix ui.wcfPages to properly synchronize multiple instances without triggering events + /*$('
').insertBefore(this._packageSearchResultList).wcfPages({ activePage: this._pageNo, maxPage: this._pageCount - }).bind('wcfpagesswitched', $.proxy(this._showPage, this)); + }).on('wcfpagesswitched', $.proxy(this._showPage, this));*/ $('
').insertAfter(this._packageSearchResultList).wcfPages({ activePage: this._pageNo, maxPage: this._pageCount - }).bind('wcfpagesswitched', $.proxy(this._showPage, this)); + }).on('wcfpagesswitched', $.proxy(this._showPage, this)); } }, diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index 5c8a0c33d9..854ef38186 100755 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -9990,7 +9990,7 @@ $.widget('ui.wcfPages', { else { var $previousImage = $(''); $previousElement.append($previousImage); - $previousElement.addClass('disabled'); + $previousElement.addClass('disabled').removeClass('button'); $previousImage.addClass('disabled'); } @@ -10078,7 +10078,7 @@ $.widget('ui.wcfPages', { else { var $nextImage = $(''); $nextElement.append($nextImage); - $nextElement.addClass('disabled'); + $nextElement.addClass('disabled').removeClass('button'); $nextImage.addClass('disabled'); } -- 2.20.1