Changeset 40050 for trunk

Timestamp:

02/08/2017 07:16:34 PM (8 years ago)

Author:

wonderboymusic

Message:

Media: in wp.media.view.Toolbar.refresh(), check for a selection before iterating over models.

Props chandrapatel.
Fixes #39511.

Location:

trunk/src/wp-includes/js

Files:

• media-views.js (modified) (1 diff)
• media/views/toolbar.js (modified) (1 diff)

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

@@ -7725 +7725 @@
 
             // Prevent insertion of attachments if any of them are still uploading
-            disabled = _.some( selection.models, function( attachment ) {
-                return attachment.get('uploading') === true;
-            });
+            if ( selection && selection.models ) {
+                disabled = _.some( selection.models, function( attachment ) {
+                    return attachment.get('uploading') === true;
+                });
+            }
 
             if ( requires.selection && selection && ! selection.length ) {

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

@@ -142 +142 @@
 
             // Prevent insertion of attachments if any of them are still uploading
-            disabled = _.some( selection.models, function( attachment ) {
-                return attachment.get('uploading') === true;
-            });
+            if ( selection && selection.models ) {
+                disabled = _.some( selection.models, function( attachment ) {
+                    return attachment.get('uploading') === true;
+                });
+            }
 
             if ( requires.selection && selection && ! selection.length ) {