Changeset 22337

Timestamp:

10/30/2012 11:36:38 PM (14 years ago)

Author:

koopersmith

Message:

Media JS: Properly build detail views when the selection's single model changes. see #21390.

File:

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

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

@@ -136 +136 @@
                         this.on( 'activate', this.activate, this );
                         this.on( 'deactivate', this.deactivate, this );
-                        this.on( 'change:details', this.details, this );
                 },
 
@@ -148 +147 @@
                         if ( this.get('multiple') )
                                 wp.Uploader.queue.on( 'add', this.selectUpload, this );
+
+                        this.get('selection').on( 'selection:single', this.buildDetails, this );
+                        this.get('selection').on( 'selection:unsingle', this.clearDetails, this );
                 },
 
@@ -156 +158 @@
 
                         wp.Uploader.queue.off( 'add', this.selectUpload, this );
+                        this.get('selection').off( 'selection:single', this.buildDetails, this );
+                        this.get('selection').off( 'selection:unsingle', this.clearDetails, this );
                 },
 
@@ -180 +184 @@
                         }) );
 
-                        this.details({ silent: true });
+                        this.details();
                         frame.sidebar().add({
                                 search: new media.view.Search({
@@ -212 +216 @@
                 },
 
-                details: function( options ) {
-                        var model = this.get('selection').single(),
-                                view;
-
-                        if ( model ) {
-                                view = new media.view.Attachment.Details({
-                                        controller: this.frame,
-                                        model:      model,
-                                        priority:   80
-                                });
-                        } else {
-                                view = new Backbone.View();
-                        }
-
-                        if ( ! options || ! options.silent )
-                                view.render();
-
-                        this.frame.sidebar().add( 'details', view, options );
+                details: function() {
+                        var single = this.get('selection').single();
+                        this[ single ? 'buildDetails' : 'clearDetails' ]( single );
+                },
+
+                buildDetails: function( model ) {
+                        this.frame.sidebar().add( 'details', new media.view.Attachment.Details({
+                                controller: this.frame,
+                                model:      model,
+                                priority:   80
+                        }).render() );
+                        return this;
+                },
+
+                clearDetails: function( model ) {
+                        if ( this.get('selection').single() )
+                                return this;
+
+                        this.frame.sidebar().add( 'details', new Backbone.View({
+                                priority: 80
+                        }).render() );
+                        return this;
                 },