Media modal: make sure the Close button is focused after attempting t…

…o close the onscreen keyboard on touch devices. Props celloexpressions, fixes #29166. Built from https://develop.svn.wordpress.org/trunk@29473 git-svn-id: http://core.svn.wordpress.org/trunk@29251 1a063a9b-81f0-0310-95a4-ce76da25c4cd
going1000 · Aug 12, 2014 · ce14155 · ce14155
1 parent d45cde5
commit ce14155
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/wp-includes/js/media-views.js b/wp-includes/js/media-views.js
@@ -3243,7 +3243,7 @@
 			// Disable page scrolling.
 			$( 'body' ).addClass( 'modal-open' );
 
-			$el.show().find( '.media-modal-close' ).focus();
+			$el.show();
 
 			// Try to close the onscreen keyboard
 			if ( 'ontouchend' in document ) {
@@ -3257,6 +3257,8 @@
 				}
 			}
 
+			$el.find( '.media-modal-close' ).focus();
+
 			return this.propagate('open');
 		},