From 01ec877d3b5f6f3bc809732927cc5648cab0958e Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sun, 12 May 2013 16:00:46 +0200 Subject: [PATCH] Fixed anchor support for tab menus --- wcfsetup/install/files/js/WCF.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index a915d6c2fd..852ff9bea7 100755 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -3291,8 +3291,8 @@ WCF.TabMenu = { self._containers[$containerID] = $tabMenu; $tabMenu.wcfTabs({ active: false, - select: function(event, ui) { - var $panel = $(ui.panel); + activate: function(event, eventData) { + var $panel = $(eventData.newPanel); var $container = $panel.closest('.tabMenuContainer'); // store currently selected item @@ -3320,7 +3320,7 @@ WCF.TabMenu = { location.hash = '#' + $panel.attr('id'); } - $container.trigger('tabsselect', event, ui); + //$container.trigger('tabsbeforeactivate', event, eventData); } }); @@ -3335,11 +3335,11 @@ WCF.TabMenu = { // try to resolve location hash if (!this._didInit) { - this.selectTabs(); + this._selectActiveTab(); $(window).bind('hashchange', $.proxy(this.selectTabs, this)); if (!this._selectErroneousTab()) { - this._selectActiveTab(); + this.selectTabs(); } } @@ -3399,7 +3399,6 @@ WCF.TabMenu = { var $tabMenuItem = $(tabMenuItem); if ($tabMenuItem.wcfIdentify() == $index) { $tabMenu.wcfTabs('select', innerIndex); - if ($subIndex !== null) { if ($tabMenuItem.hasClass('tabMenuContainer')) { $tabMenuItem.wcfTabs('selectTab', $tabMenu.data('active')); -- 2.20.1