Changeset 29420

Timestamp:

08/06/2014 09:43:26 PM (11 years ago)

Author:

wonderboymusic

Message:

Media Grid: expose the $.Deffered() object in media.view.AttachmentsBrowser.updateContent() so the grid can call Backbone.history.start() when models actually exist.

This is a lot better then _.delay( this.pray, 1000 ), but needs continued study.

See #29052.

Location:

trunk/src/wp-includes/js

Files:

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

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

@@ -92 +92 @@
             }
 
+            this.gridRouter = new media.view.MediaFrame.Manage.Router();
+
             // Call 'initialize' directly on the parent class.
             media.view.MediaFrame.prototype.initialize.apply( this, arguments );
@@ -110 +112 @@
                 self.gridRouter.navigate( self.gridRouter.baseUrl( url ) );
             }, 1000 ) );
-
-            // This is problematic.
-            _.delay( _.bind( this.createRouter, this ), 1000 );
-        },
-
-        createRouter: function() {
-            this.gridRouter = new media.view.MediaFrame.Manage.Router();
-
-            // Verify pushState support and activate
-            if ( window.history && window.history.pushState ) {
-                Backbone.history.start({
-                    root: _wpMediaGridSettings.adminUrl,
-                    pushState: true
-                });
-            }
         },
 
@@ -211 +198 @@
                 scrollElement: document
             });
+            this.browserView.on( 'ready', _.bind( this.bindDeferred, this ) );
 
             this.errors = wp.Uploader.errors;
@@ -218 +206 @@
         sidebarVisibility: function() {
             this.browserView.$( '.media-sidebar' ).toggle( this.errors.length );
+        },
+
+        bindDeferred: function() {
+            this.browserView.dfd.done( _.bind( this.startHistory, this ) );
+        },
+
+        startHistory: function() {
+            // Verify pushState support and activate
+            if ( window.history && window.history.pushState ) {
+                Backbone.history.start( {
+                    root: _wpMediaGridSettings.adminUrl,
+                    pushState: true
+                } );
+            }
         }
     });

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

@@ -5820 +5820 @@
             if ( ! this.collection.length ) {
                 this.toolbar.get( 'spinner' ).show();
-                this.collection.more().done(function() {
+                this.dfd = this.collection.more().done( function() {
                     if ( ! view.collection.length ) {
                         noItemsView.$el.removeClass( 'hidden' );
@@ -5827 +5827 @@
                     }
                     view.toolbar.get( 'spinner' ).hide();
-                });
+                } );
             } else {
                 noItemsView.$el.addClass( 'hidden' );