Changeset 29917

Timestamp:

10/16/2014 05:53:15 AM (10 years ago)

Author:

wonderboymusic

Message:

In wp.Uploader, when uploader:ready is triggered, set ready to true on the instance. This allows media workflows to check for an existing uploaded instance when opening.

Without this check, workflows might wait for uploader:ready, which could already have been fired. This would result in an unresponsive editor dropzone.

Fixes #29689.

Location:

trunk/src/wp-includes/js

Files:

• media-views.js (modified) (2 diffs)
• plupload/wp-plupload.js (modified) (1 diff)

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

@@ -3725 +3725 @@
 
         drop: function( event ) {
-            var $wrap = null;
+            var $wrap = null, uploadView;
 
             this.containerDragleave( event );
@@ -3748 +3748 @@
                     multiple: true
                 });
-                this.workflow.on( 'uploader:ready', this.addFiles, this );
+                uploadView = this.workflow.uploader;
+                if ( uploadView.uploader && uploadView.uploader.ready ) {
+                    this.addFiles.apply( this );
+                } else {
+                    this.workflow.on( 'uploader:ready', this.addFiles, this );
+                }
             } else {
                 this.workflow.state().reset();

trunk/src/wp-includes/js/plupload/wp-plupload.js

@@ -159 +159 @@
                 }, 0 );
             });
-
+            
+            self.ready = true;
             $(self).trigger( 'uploader:ready' );
         });