Changeset 29613

Timestamp:

08/26/2014 04:21:06 AM (12 years ago)

Author:

wonderboymusic

Message:

Media Modal:

• the Image Details frame does not have a menu, indicate that by setting menu: false when adding states.
• mimic the default router rendering by toggling a hide-menu class on the frame when the region for menu is null
• remove the dead render code for the Image Details frame

See #29339.

Location:

trunk/src/wp-includes

Files:

• css/media-views.css (modified) (1 diff)
• js/media-views.js (modified) (7 diffs)

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

@@ -1780 +1780 @@
 }
 
-.image-details .media-frame-menu {
-        display: none;
-}
-
 .image-details .media-frame-title,
 .image-details .media-frame-content,

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

@@ -463 +463 @@
                                 view;
 
+                        this.frame.$el.toggleClass( 'hide-menu', ! mode );
                         if ( ! mode ) {
                                 return;
@@ -792 +793 @@
                         // Initial region modes.
                         content:  'image-details',
-                        menu:     'image-details',
+                        menu:     false,
                         router:   false,
                         toolbar:  'image-details',
@@ -1245 +1246 @@
                         // Region mode defaults.
                         toolbar:       'replace',
+                        menu:          false,
 
                         priority:      60,
@@ -2970 +2972 @@
                         this.on( 'content:create:image-details', this.imageDetailsContent, this );
                         this.on( 'content:render:edit-image', this.editImageContent, this );
-                        this.on( 'menu:render:image-details', this.renderMenu, this );
                         this.on( 'toolbar:render:image-details', this.renderImageDetailsToolbar, this );
                         // override the select toolbar
@@ -2980 +2981 @@
                                 new media.controller.ImageDetails({
                                         image: this.image,
-                                        editable: false,
-                                        menu: 'image-details'
+                                        editable: false
                                 }),
                                 new media.controller.ReplaceImage({
@@ -2989 +2989 @@
                                         multiple:  false,
                                         title:     l10n.imageReplaceTitle,
-                                        menu: 'image-details',
                                         toolbar: 'replace',
                                         priority:  80,
@@ -3024 +3023 @@
                         // after bringing in the frame, load the actual editor via an ajax call
                         view.loadEditor();
-
-                },
-
-                renderMenu: function( view ) {
-                        var lastState = this.lastState(),
-                                previous = lastState && lastState.id,
-                                frame = this;
-
-                        view.set({
-                                cancel: {
-                                        text:     l10n.imageDetailsCancel,
-                                        priority: 20,
-                                        click:    function() {
-                                                if ( previous ) {
-                                                        frame.setState( previous );
-                                                } else {
-                                                        frame.close();
-                                                }
-                                        }
-                                },
-                                separateCancel: new media.View({
-                                        className: 'separator',
-                                        priority: 40
-                                })
-                        });
 
                 },