Changeset 22790

Timestamp:

11/21/2012 08:27:49 PM (12 years ago)

Author:

koopersmith

Message:

Media: Make the window-wide uploader a subview of the frame view.

Allows the uploader to leverage the ready event to know when it has been attached to the page.

see #21390.

Location:

trunk/wp-includes

Files:

• js/media-views.js (modified) (4 diffs)
• media.php (modified) (1 diff)

trunk/wp-includes/js/media-views.js

@@ -1050 +1050 @@
                     }
                 });
+                this.views.set( '.media-frame-uploader', this.uploader );
             }
 
@@ -1060 +1061 @@
 
             media.view.Frame.prototype.render.apply( this, arguments );
-
-            // Render the window uploader if it exists.
-            if ( this.uploader )
-                this.uploader.render().$el.appendTo( this.$el );
-
             return this;
         },
@@ -1734 +1730 @@
             });
 
-            if ( uploader.dropzone ) {
-                // Ensure the dropzone is a jQuery collection.
-                if ( ! (uploader.dropzone instanceof $) )
-                    uploader.dropzone = $( uploader.dropzone );
-
-                // Attempt to initialize the uploader whenever the dropzone is hovered.
-                uploader.dropzone.one( 'mouseenter dragenter', _.bind( this.maybeInitUploader, this ) );
-            }
-        },
-
-        render: function() {
-            this.maybeInitUploader();
-            this.$el.html( this.template( this.options ) );
-            return this;
+            // Ensure the dropzone is a jQuery collection.
+            if ( uploader.dropzone && ! (uploader.dropzone instanceof $) )
+                uploader.dropzone = $( uploader.dropzone );
         },
 
@@ -1755 +1740 @@
         },
 
-        maybeInitUploader: function() {
-            var $id, dropzone;
-
-            // If the uploader already exists or the body isn't in the DOM, bail.
-            if ( this.uploader || ! this.$el.closest('body').length )
+        ready: function() {
+            var postId = media.view.settings.postId,
+                dropzone;
+
+            // If the uploader already exists, bail.
+            if ( this.uploader )
                 return;
 
-            $id = $('#post_ID');
-            if ( $id.length )
-                this.options.uploader.params.post_id = $id.val();
+            if ( postId )
+                this.options.uploader.params.post_id = postId;
 
             this.uploader = new wp.Uploader( this.options.uploader );

trunk/wp-includes/media.php

@@ -1407 +1407 @@
         <div class="media-frame-sidebar"></div>
         <div class="media-frame-toolbar"></div>
+        <div class="media-frame-uploader"></div>
     </script>