Changeset 29074

Timestamp:

07/10/2014 06:42:15 PM (12 years ago)

Author:

wonderboymusic

Message:

Media Grid: add disambiguation between generic frames and routers and the router specifically interacting with the grid's frame.
See #24716.

File:

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

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

@@ -154 +154 @@
 
                 createRouter: function() {
-                        this.gridRouter = new media.view.Frame.Router( this );
+                        this.gridRouter = new media.view.MediaFrame.Manage.Router();
 
                         // Verify pushState support and activate
@@ -336 +336 @@
          * A router for handling the browser history and application state
          */
-        media.view.Frame.Router = Backbone.Router.extend({
-
-                mediaFrame: '',
-
-                initialize: function( mediaFrame ){
-                        this.mediaFrame = mediaFrame;
-                },
-
+        media.view.MediaFrame.Manage.Router = Backbone.Router.extend({
                 routes: {
                         'upload.php?item=:slug':    'showitem',
@@ -364 +357 @@
                 // Show the modal with a specific item
                 showitem: function( query ) {
-                        var library = this.mediaFrame.state().get('library');
+                        var library = media.frame.state().get('library');
 
                         // Remove existing modal if present
                         this.closeModal();
                         // Trigger the media frame to open the correct item
-                        this.mediaFrame.trigger( 'edit:attachment', library.findWhere( { id: parseInt( query, 10 ) } ) );
+                        media.frame.trigger( 'edit:attachment', library.findWhere( { id: parseInt( query, 10 ) } ) );
                 },
 
                 // Close the modal if set up
                 closeModal: function() {
-                        if ( 'undefined' !== typeof this.mediaFrame.editAttachmentFrame ) {
-                                this.mediaFrame.editAttachmentFrame.modal.close();
+                        if ( media.frame.modal ) {
+                                media.frame.modal.close();
                         }
                 },