Ticket #22323: 22323.diff

wp-includes/js/media-views.js

@@ -191 +191 @@
 
                         this.get('selection').on( 'selection:single', this.buildDetails, this );
                         this.get('selection').on( 'selection:unsingle', this.clearDetails, this );
+                        this.get('library').on( 'add remove reset', this.refresh, this );
+                        this.refresh();
                 },
 
                 deactivate: function() {
@@ -202 +204 @@
                         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 );
+                        this.get('library').off( 'add remove reset', this.refresh, this );
                 },
 
                 toolbar: function() {
@@ -230 +233 @@
                 },
 
                 content: function() {
-                        var frame = this.frame;
+                        var frame = this.frame,
+                                library = this.get('library'),
+                                view;
 
                         // Content.
-                        frame.content( new media.view.AttachmentsBrowser({
-                                controller: frame,
-                                collection: this.get('library'),
-                                model:      this
-                        }).render() );
+                        if ( library.length ) {
+                                view = new media.view.AttachmentsBrowser({
+                                        controller: frame,
+                                        collection: library,
+                                        model:      this
+                                });
+                        } else {
+                                library.more();
+                                view = new media.view.UploaderInline({
+                                        controller: frame
+                                });
+                        }
+
+                        frame.content( view.render() );
                 },
 
                 selectUpload: function( attachment ) {
@@ -281 +295 @@
                         }
 
                         return this;
+                },
+
+                refresh: function() {
+                        this.frame.$el.toggleClass( 'hide-sidebar hide-toolbar', ! this.get('library').length );
+                        this.content();
                 }
+
         });
 
 
@@ -309 +329 @@
                         }
 
                         media.controller.Library.prototype.initialize.apply( this, arguments );
-                },
-
-                activate: function() {
-                        this.get('library').on( 'add remove reset', this.refresh, this );
-                        media.controller.Library.prototype.activate.apply( this, arguments );
-                        this.refresh();
-                },
-
-                deactivate: function() {
-                        this.get('library').off( 'add remove reset', this.refresh, this );
-                        media.controller.Library.prototype.deactivate.apply( this, arguments );
-                },
-
-                refresh: function() {
-                        this.frame.$el.toggleClass( 'hide-sidebar hide-toolbar', ! this.get('library').length );
-                        this.content();
-                },
-
-                content: function() {
-                        var frame = this.frame,
-                                upload;
-
-                        if ( this.get('library').length ) {
-                                media.controller.Library.prototype.content.apply( this, arguments );
-                        } else {
-                                upload = new media.view.UploaderInline({
-                                        controller: frame
-                                }).render();
-
-                                frame.content( upload );
-                        }
                 }
+
         });
 
         // wp.media.controller.Gallery