From 8108ec82dbc1c203893db18aac827b93d48cfc07 Mon Sep 17 00:00:00 2001
From: Corey Frang <gnarf@gnarf.net>
Date: Tue, 2 Aug 2011 16:54:24 -0500
Subject: [PATCH] Effects: Adding a check to retain focused elements after
 wrapping and unwrapping in animations - Fixes #7595 - Wrapper-creating
 jquery-ui animations will discard any focus state during the animation -
 Thanks @rubyruy

---
 tests/unit/effects/effects_core.js | 11 +++++++++++
 ui/jquery.effects.core.js          | 23 ++++++++++++++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js
index 7c20e22fe..2b4d684eb 100644
--- a/tests/unit/effects/effects_core.js
+++ b/tests/unit/effects/effects_core.js
@@ -150,4 +150,15 @@ asyncTest( "animateClass clears style properties when stopped", function() {
 	start();
 });
 
+test( "createWrapper and removeWrapper retain focused elements (#7595)", function() {
+	expect( 2 );
+	var test = $( "div.hidden" ).show(),
+		input = $( "<input>" ).appendTo( test ).focus();
+
+	$.effects.createWrapper( test );
+	equal( document.activeElement, input[ 0 ], "Active element is still input after createWrapper" );
+	$.effects.removeWrapper( test );
+	equal( document.activeElement, input[ 0 ], "Active element is still input after removeWrapper" );
+})
+
 })(jQuery);
diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js
index b08cd6cf4..15d81b4b0 100644
--- a/ui/jquery.effects.core.js
+++ b/ui/jquery.effects.core.js
@@ -415,9 +415,16 @@ $.extend( $.effects, {
 			size = {
 				width: element.width(),
 				height: element.height()
-			};
+			},
+			active = document.activeElement;
 
 		element.wrap( wrapper );
+
+		// Fixes #7595 - Elements lose focus when wrapped.
+		if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+			$( active ).focus();
+		}
+
 		wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually loose the reference to the wrapped element
 
 		// transfer positioning properties to the wrapper
@@ -449,8 +456,18 @@ $.extend( $.effects, {
 	},
 
 	removeWrapper: function( element ) {
-		if ( element.parent().is( ".ui-effects-wrapper" ) )
-			return element.parent().replaceWith( element );
+		var active = document.activeElement;
+
+		if ( element.parent().is( ".ui-effects-wrapper" ) ) {
+			element.parent().replaceWith( element );
+
+			// Fixes #7595 - Elements lose focus when wrapped.
+			if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+				$( active ).focus();
+			}
+		}
+
+
 		return element;
 	},