X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/874d2a2f468a0d1e69aab49b1fe2d9d79d3e1142..607b7e02d77e7326161e8ec15639052d2040f745:/wp-admin/js/media.js

diff --git a/wp-admin/js/media.js b/wp-admin/js/media.js
index a071cd60..e23adebb 100644
--- a/wp-admin/js/media.js
+++ b/wp-admin/js/media.js
@@ -1,4 +1,4 @@
-/* global ajaxurl, attachMediaBoxL10n */
+/* global ajaxurl, attachMediaBoxL10n, _wpMediaGridSettings, showNotice */
 
 var findPosts;
 ( function( $ ){
@@ -32,7 +32,7 @@ var findPosts;
 		},
 
 		close: function() {
-			$('#find-posts-response').html('');
+			$('#find-posts-response').empty();
 			$('#find-posts').hide();
 			$( '.ui-find-overlay' ).hide();
 		},
@@ -51,14 +51,14 @@ var findPosts;
 				},
 				spinner = $( '.find-box-search .spinner' );
 
-			spinner.show();
+			spinner.addClass( 'is-active' );
 
 			$.ajax( ajaxurl, {
 				type: 'POST',
 				data: post,
 				dataType: 'json'
 			}).always( function() {
-				spinner.hide();
+				spinner.removeClass( 'is-active' );
 			}).done( function( x ) {
 				if ( ! x.success ) {
 					$( '#find-posts-response' ).text( attachMediaBoxL10n.error );
@@ -72,13 +72,16 @@ var findPosts;
 	};
 
 	$( document ).ready( function() {
-		var $mediaGridWrap = $( '#wp-media-grid' );
+		var settings, $mediaGridWrap = $( '#wp-media-grid' );
 
 		// Open up a manage media frame into the grid.
 		if ( $mediaGridWrap.length && window.wp && window.wp.media ) {
+			settings = _wpMediaGridSettings;
+
 			window.wp.media({
 				frame: 'manage',
-				container: $mediaGridWrap
+				container: $mediaGridWrap,
+				library: settings.queryVars
 			}).open();
 		}
 
@@ -96,9 +99,15 @@ var findPosts;
 		$( '#find-posts-close' ).click( findPosts.close );
 		$( '#doaction, #doaction2' ).click( function( event ) {
 			$( 'select[name^="action"]' ).each( function() {
-				if ( $(this).val() === 'attach' ) {
+				var optionValue = $( this ).val();
+
+				if ( 'attach' === optionValue ) {
 					event.preventDefault();
 					findPosts.open();
+				} else if ( 'delete' === optionValue ) {
+					if ( ! showNotice.warn() ) {
+						event.preventDefault();
+					}
 				}
 			});
 		});