Changeset 21773

Timestamp:

09/06/2012 01:35:33 PM (13 years ago)

Author:

koopersmith

Message:

Media JS: Apply selection when Attachment models are initially rendered.

This allows us to automatically retain selections when the library context is changed (e.g. when searching. This changes the Attachment view's select() and deselect() methods so that they can be triggered directly.

see #21390.

File:

• trunk/wp-includes/js/media-views.js (modified) (2 diffs)

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

@@ -548 +548 @@
                 delete this.$bar;
 
+            // Check if the model is selected.
+            if ( this.controller.selection.has( this.model ) )
+                this.select();
+
             return this;
         },
@@ -562 +566 @@
 
         select: function( model, collection ) {
-            if ( collection === this.controller.selection )
-                this.$el.addClass('selected');
+            // If a collection is provided, check if it's the selection.
+            // If it's not, bail; we're in another selection's event loop.
+            if ( collection && collection !== this.controller.selection )
+                return;
+
+            this.$el.addClass('selected');
         },
 
         deselect: function( model, collection ) {
-            if ( collection === this.controller.selection )
-                this.$el.removeClass('selected');
+            // If a collection is provided, check if it's the selection.
+            // If it's not, bail; we're in another selection's event loop.
+            if ( collection && collection !== this.controller.selection )
+                return;
+
+            this.$el.removeClass('selected');
         }
     });