WordPress 4.2

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

diff --git a/wp-admin/js/media.js b/wp-admin/js/media.js
index a071cd6001ed83bc9078276c0a015d0f35cbe8cc..f0c21752c652a3b122e81b7cc90ec92f68db13c6 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 */
 
 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();
                }