From 13372af2c73e0dc8291ec279759ba084f7759cd9 Mon Sep 17 00:00:00 2001 From: Mark Jaquith Date: Fri, 7 Nov 2008 22:07:58 +0000 Subject: [PATCH] Remove the other tab before sliding down. git-svn-id: https://develop.svn.wordpress.org/trunk@9561 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/js/settings-box.js | 8 ++++++-- wp-includes/script-loader.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wp-admin/js/settings-box.js b/wp-admin/js/settings-box.js index dc5115d927..fdba75e8c0 100644 --- a/wp-admin/js/settings-box.js +++ b/wp-admin/js/settings-box.js @@ -1,5 +1,8 @@ jQuery(document).ready( function($) { $('#show-settings-link').click(function () { + if ( ! $('#screen-options-wrap').hasClass('screen-options-open') ) { + $('#contextual-help-link-wrap').addClass('invisible'); + } $('#screen-options-wrap').slideToggle('fast', function(){ if ( $(this).hasClass('screen-options-open') ) { $('#show-settings-link').css({'backgroundImage':'url("images/screen-options-right.gif")'}); @@ -8,13 +11,15 @@ jQuery(document).ready( function($) { } else { $('#show-settings-link').css({'backgroundImage':'url("images/screen-options-right-up.gif")'}); - $('#contextual-help-link-wrap').addClass('invisible'); $(this).addClass('screen-options-open'); } }); return false; }).parent(); $('#contextual-help-link').click(function () { + if ( ! $('#contextual-help-wrap').hasClass('contextual-help-open') ) { + $('#screen-options-link-wrap').addClass('invisible'); + } $('#contextual-help-wrap').slideToggle('fast', function(){ if ( $(this).hasClass('contextual-help-open') ) { $('#contextual-help-link').css({'backgroundImage':'url("images/screen-options-right.gif")'}); @@ -22,7 +27,6 @@ jQuery(document).ready( function($) { $(this).removeClass('contextual-help-open'); } else { $('#contextual-help-link').css({'backgroundImage':'url("images/screen-options-right-up.gif")'}); - $('#screen-options-link-wrap').addClass('invisible'); $(this).addClass('contextual-help-open'); } }); diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 6b8a14ddec..00f19af0e5 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -292,7 +292,7 @@ function wp_default_scripts( &$scripts ) { 'requestFile' => admin_url('admin-ajax.php'), ) ); - $scripts->add( 'settings-box', '/wp-admin/js/settings-box.js', array( 'jquery' ), '20081105' ); + $scripts->add( 'settings-box', '/wp-admin/js/settings-box.js', array( 'jquery' ), '20081107' ); $scripts->add( 'dashboard', '/wp-admin/js/dashboard.js', array( 'jquery', 'admin-comments', 'postbox', 'settings-box' ), '20081016' );