Changeset 30254

Timestamp:

11/06/2014 08:07:10 AM (10 years ago)

Author:

nacin

Message:

Make sure we're on the media grid page before calling wp.media().

Merges [29725] to the 4.0 branch.

props azaozz.
fixes #29520.

Location:

branches/4.0

Files:

• . (modified) (1 prop)
• src/wp-admin/js/media.js (modified) (1 diff)
• src/wp-admin/upload.php (modified) (1 diff)

branches/4.0/src/wp-admin/js/media.js

@@ -73 +73 @@
 
     $( document ).ready( function() {
+        var $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 ) {
+            window.wp.media({
+                frame: 'manage',
+                container: $mediaGridWrap
+            }).open();
+        }
 
         $( '#find-posts-submit' ).click( function( event ) {

branches/4.0/src/wp-admin/upload.php

@@ -58 +58 @@
     require_once( ABSPATH . 'wp-admin/admin-header.php' );
     ?>
-    <div class="wrap">
+    <div class="wrap" id="wp-media-grid">
         <h2>
         <?php