WordPress 4.6.1

[autoinstalls/wordpress.git] / wp-admin / js / media.js

diff --git a/wp-admin/js/media.js b/wp-admin/js/media.js
index 119c10bd2aee55ac2e2e56d242ef926c032720a6..e23adebb17d8a8f3c2b85e31f06b241697ff5670 100644 (file)
--- 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,11 +72,18 @@ var findPosts;
        };
 
        $( document ).ready( function() {
+               var settings, $mediaGridWrap = $( '#wp-media-grid' );
+
                // Open up a manage media frame into the grid.
-               wp.media && wp.media({
-                       frame: 'manage',
-                       container: $('#wpbody-content > .wrap')
-               }).open();
+               if ( $mediaGridWrap.length && window.wp && window.wp.media ) {
+                       settings = _wpMediaGridSettings;
+
+                       window.wp.media({
+                               frame: 'manage',
+                               container: $mediaGridWrap,
+                               library: settings.queryVars
+                       }).open();
+               }
 
                $( '#find-posts-submit' ).click( function( event ) {
                        if ( ! $( '#find-posts-response input[type="radio"]:checked' ).length )
@@ -92,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();
+                                       }
                                }
                        });
                });