Changeset 32894

Timestamp:

06/20/2015 09:07:03 PM (10 years ago)

Author:

azaozz

Message:

Fix error when dropping files for uploading on the editor before the media modal is initialized.
Props rommelxcastro, sebastiantiede. Fixes #32527.

Location:

trunk/src/wp-includes/js

Files:

• media-views.js (modified) (3 diffs)
• media/views/uploader/editor.js (modified) (3 diffs)

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

@@ -7875 +7875 @@
      */
     drop: function( event ) {
-        var $wrap = null, uploadView;
+        var $wrap, uploadView;
 
         this.containerDragleave( event );
@@ -7892 +7892 @@
 
         if ( ! this.workflow ) {
-            this.workflow = wp.media.editor.open( 'content', {
+            this.workflow = wp.media.editor.open( window.wpActiveEditor, {
                 frame:    'post',
                 state:    'insert',
@@ -7898 +7898 @@
                 multiple: true
             });
+
             uploadView = this.workflow.uploader;
+
             if ( uploadView.uploader && uploadView.uploader.ready ) {
                 this.addFiles.apply( this );

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

@@ -129 +129 @@
      */
     drop: function( event ) {
-        var $wrap = null, uploadView;
+        var $wrap, uploadView;
 
         this.containerDragleave( event );
@@ -146 +146 @@
 
         if ( ! this.workflow ) {
-            this.workflow = wp.media.editor.open( 'content', {
+            this.workflow = wp.media.editor.open( window.wpActiveEditor, {
                 frame:    'post',
                 state:    'insert',
@@ -152 +152 @@
                 multiple: true
             });
+
             uploadView = this.workflow.uploader;
+
             if ( uploadView.uploader && uploadView.uploader.ready ) {
                 this.addFiles.apply( this );