Popup: replaced activeElement with targetElement for correct focus

Fixes jquery-archivegh-7533
ldeluca · Oct 15, 2014 · 3e5ad2d · 3e5ad2d
1 parent cc548fd
commit 3e5ad2d
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/js/widgets/popup.js b/js/widgets/popup.js
@@ -297,9 +297,9 @@ $.widget( "mobile.popup", {
 
 		if ( targetElement !== ui.container[ 0 ] ) {
 			target = $( targetElement );
-			if ( 0 === target.parents().filter( ui.container[ 0 ] ).length ) {
+			if ( !$.contains( target.parents(), ui.container[ 0 ] ) ) {
 				$( this.document[ 0 ].activeElement ).one( "focus", $.proxy( function(/* theEvent */) {
-					this._safelyBlur( this.document[ 0 ].activeElement );
+					this._safelyBlur( targetElement );
 				}, this ) );
 				ui.focusElement.focus();
 				theEvent.preventDefault();
@@ -631,9 +631,9 @@ $.widget( "mobile.popup", {
 		}
 	},
 
-	_safelyBlur: function( currElement ){
-		if (currElement !== this.window[ 0 ] && currElement.nodeName.toLowerCase() !== "body") {
-			currElement.blur();
+	_safelyBlur: function( currentElement ){
+		if (currentElement !== this.window[ 0 ] && currentElement.nodeName.toLowerCase() !== "body") {
+			currentElement.blur();
 		}
 	},
 
@@ -732,8 +732,6 @@ $.widget( "mobile.popup", {
 		var container = this._ui.container,
 			id = this.element.attr( "id" );
 
-		container.removeAttr( "tabindex" );
-
 		// remove the global mutex for popups
 		$.mobile.popup.active = undefined;