Ticket #24062: 24062.diff

wp-includes/js/media-editor.js

@@ -538 +538 @@
                 add: function( id, options ) {
                         var workflow = this.get( id );
 
-                        if ( workflow )
-                                return workflow;
-
                         workflow = workflows[ id ] = wp.media( _.defaults( options || {}, {
                                 frame:    'post',
                                 state:    'insert',
@@ -692 +689 @@
                         }
                 },
 
-                open: function( id ) {
+                open: function( id, options ) {
                         var workflow, editor;
 
                         id = this.id( id );
+                        
+                        if ( ! options )
+                                var options = {};
 
                         // Save a bookmark of the caret position in IE.
                         if ( typeof tinymce !== 'undefined' ) {
@@ -710 +710 @@
                         workflow = this.get( id );
 
                         // Initialize the editor's workflow if we haven't yet.
-                        if ( ! workflow )
-                                workflow = this.add( id );
+                        // Redo workflow if state has changed
+                        if ( ! workflow || workflow.options && options.state !== workflow.options.state )
+                                workflow = this.add( id, options );
 
                         return workflow.open();
                 },
@@ -719 +720 @@
                 init: function() {
                         $(document.body).on( 'click', '.insert-media', function( event ) {
                                 var $this = $(this),
-                                        editor = $this.data('editor');
+                                        editor = $this.data('editor'),
+                                        options = {
+                                                frame:    'post',
+                                                state:    'insert',
+                                                title:    wp.media.view.l10n.addMedia,
+                                                multiple: true
+                                        };
 
                                 event.preventDefault();
 
@@ -729 +736 @@
                                 //
                                 // See: http://core.trac.wordpress.org/ticket/22445
                                 $this.blur();
+                                
+                                if ( $this.hasClass( 'gallery' ) ) {
+                                        options = {
+                                                title:          wp.media.view.l10n.createGalleryTitle,
+                                                state:          'gallery',
+                                                frame:          'post',
+                                                multiple:       true
+                                        }
+                                }
 
-                                wp.media.editor.open( editor );
+                                wp.media.editor.open( editor, options );
                         });
                 }
         };

wp-admin/js/post-formats.js

@@ -17 +17 @@
                         var $this = $(this), editor, body,
                                 parent = $this.parent(),
                                 format = $this.data('wp-format'),
+                                insertMediaButton = $( '#insert-media-button' ),
                                 description = $('.post-format-description');
 
                 if ( typeof container === 'undefined' )
@@ -57 +58 @@
                                         editor.dom.addClass( body, 'post-format-' + format );
                                 }
                         }
+                        
+                        // If gallery, force it to open to gallery state
+                        if ( 'gallery' === format )
+                                insertMediaButton.addClass( 'gallery' );
+                        else
+                                insertMediaButton.removeClass( 'gallery' );
 
                         postFormats.currentPostFormat = format;
                 }).on('mouseenter focusin', 'a', function () {