Ticket #39824: 39824.diff

src/wp-includes/js/media/views/frame/post.js

@@ -570 +570 @@
                                         style:    'primary',
                                         text:     editing ? l10n.updateGallery : l10n.insertGallery,
                                         priority: 80,
-                                        requires: { library: true },
+                                        requires: { library: true, uploadingComplete: true },
 
                                         /**
                                          * @fires wp.media.controller.State#update

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

@@ -138 +138 @@
                         }
 
                         var requires = button.options.requires,
-                                disabled = false;
+                                disabled = false,
+                                modelsUploading = ! _.isEmpty( library.findWhere(  { 'uploading': true } ) );
 
                         // Prevent insertion of attachments if any of them are still uploading
                         disabled = _.some( selection.models, function( attachment ) {
@@ -145 +146 @@
                                 return attachment.get('uploading') === true;
                         });
 
+                        if ( requires.uploadingComplete && modelsUploading ) {
+                                disabled = true;
+                        }
+
                         if ( requires.selection && selection && ! selection.length ) {
                                 disabled = true;
                         } else if ( requires.library && library && ! library.length ) {

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

@@ -5684 +5684 @@
                                         style:    'primary',
                                         text:     editing ? l10n.updateGallery : l10n.insertGallery,
                                         priority: 80,
-                                        requires: { library: true },
+                                        requires: { library: true, uploadingComplete: true },
 
                                         /**
                                          * @fires wp.media.controller.State#update
@@ -5691 +5691 @@
                                          */
                                         click: function() {
                                                 var controller = this.controller,
-                                                        state = controller.state();
+                                                        state = controller.state(),
+                                                        library = state.get('library');
 
                                                 controller.close();
-                                                state.trigger( 'update', state.get('library') );
+                                                state.trigger( 'update', library );
 
                                                 // Restore and reset the default state.
                                                 controller.setState( controller.options.state );
@@ -7721 +7722 @@
                         }
 
                         var requires = button.options.requires,
-                                disabled = false;
+                                disabled = false,
+                                modelsUploading = ! _.isEmpty( library.findWhere(  { 'uploading': true } ) );
 
                         // Prevent insertion of attachments if any of them are still uploading
                         disabled = _.some( selection.models, function( attachment ) {
@@ -7728 +7730 @@
                                 return attachment.get('uploading') === true;
                         });
 
+                        if ( requires.uploadingComplete && modelsUploading ) {
+                                disabled = true;
+                        }
+
                         if ( requires.selection && selection && ! selection.length ) {
                                 disabled = true;
                         } else if ( requires.library && library && ! library.length ) {