Changeset 29565

Timestamp:

08/21/2014 03:53:13 AM (12 years ago)

Author:

wonderboymusic

Message:

Media Grid: don't auto-select attachments upon upload.

Props ocean90.
See #28842.

Location:

trunk/src/wp-includes/js

Files:

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

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

@@ -136 +136 @@
                                         toolbar:            'select',
                                         contentUserSetting: false,
-                                        filterable:         'all'
+                                        filterable:         'all',
+                                        autoSelect:         false 
                                 })
                         ]);

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

@@ -596 +596 @@
                         sortable:           true,
 
+                        autoSelect:         true,
                         describe:           false,
                         // Uses a user setting to override the content mode.
@@ -752 +753 @@
                                 this.frame.content.mode('browse');
                         }
-                        this.get('selection').add( attachment );
-
-                        this.frame.trigger( 'library:selection:add' );
+
+                        if ( this.get( 'autoSelect' ) ) {
+                                this.get('selection').add( attachment );
+                                this.frame.trigger( 'library:selection:add' );
+                        }
                 },
 
@@ -5706 +5709 @@
 
                         if ( media.view.settings.mediaTrash &&
-                                this.controller.activeModes.where( { id: 'grid' } ).length ) {
+                                this.controller.isModeActive( 'grid' ) ) {
 
                                 filters.trash = {
@@ -5822 +5825 @@
                         // browser view. Is this a use case for doAction( 'add:toolbar-items:attachments-browser', this.toolbar );
                         // which the controller can tap into and add this view?
-                        if ( this.controller.activeModes.where( { id: 'grid' } ).length ) {
+                        if ( this.controller.isModeActive( 'grid' ) ) {
                                 LibraryViewSwitcher = media.View.extend({
                                         className: 'view-switch media-grid-view-switch',