Ticket #24062: 24062.2.diff

wp-admin/js/post-formats.js

@@ -1 +1 @@
 window.wp = window.wp || {};
 
 (function($) {
-        var container, mediaFrame, lastMimeType, mediaPreview,
+        var container, mediaFrame, lastMimeType, mediaPreview, insertMediaButton,
                 noUIFormats = ['standard', 'chat', 'status', 'aside', 'gallery'],
                 $container = $( '.post-formats-fields' ),
                 $screenIcon = $( '.icon32' );
@@ -59 +59 @@
                         }
                 }
 
+                // If gallery, force it to open to gallery state
+                if ( 'gallery' === format )
+                        insertMediaButton.addClass( 'gallery' );
+                else
+                        insertMediaButton.removeClass( 'gallery' );
+
                 postFormats.currentPostFormat = format;
         }
 
-        $(function(){
+        $(function() {
+                insertMediaButton = $( '#insert-media-button' );
 
                 $('.post-format-change a').click(function() {
                         $('.post-formats-fields, .post-format-change').slideUp();

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;
 
+                        options = options || {};
+
                         id = this.id( id );
 
                         // Save a bookmark of the caret position in IE.
@@ -709 +708 @@
 
                         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 +718 @@
                 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();
 
@@ -730 +735 @@
                                 // See: http://core.trac.wordpress.org/ticket/22445
                                 $this.blur();
 
-                                wp.media.editor.open( editor );
+                                if ( $this.hasClass( 'gallery' ) ) {
+                                        options.state = 'gallery';
+                                        options.title = wp.media.view.l10n.createGalleryTitle;
+                                }
+
+                                wp.media.editor.open( editor, options );
                         });
                 }
         };