Changeset 29073

Timestamp:

07/10/2014 06:24:23 PM (11 years ago)

Author:

wonderboymusic

Message:

Media Grid: make the router work when ?item= is in the URL on page load. This is still a hack, needs to be event-driven.
See #24716.

File:

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

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

@@ -141 +141 @@
             this.render();
 
-            this.gridRouter = new media.view.Frame.Router( this );
-
-            // Set up the Backbone router after a brief delay
-            _.delay( function(){
-                // Verify pushState support and activate
-                if ( window.history && window.history.pushState ) {
-                    Backbone.history.start({
-                        root: mediaGridSettings.adminUrl,
-                        pushState: true
-                    });
-                }
-            }, 250);
-
             // Update the URL when entering search string (at most once per second)
             $( '#media-search-input' ).on( 'input', _.debounce( function(e) {
@@ -162 +149 @@
                 self.gridRouter.navigate( self.gridRouter.baseUrl( url ) );
             }, 1000 ) );
+
+            _.delay( _.bind( this.createRouter, this ), 1000 );
+        },
+
+        createRouter: function() {
+            this.gridRouter = new media.view.Frame.Router( this );
+
+            // Verify pushState support and activate
+            if ( window.history && window.history.pushState ) {
+                Backbone.history.start({
+                    root: mediaGridSettings.adminUrl,
+                    pushState: true
+                });
+            }
         },