Changeset 24087

Timestamp:

04/25/2013 05:43:14 AM (12 years ago)

Author:

markjaquith

Message:

Force gallery state for gallery post format.

props lessbloat, wonderboymusic. fixes #24062.

Location:

trunk

Files:

• wp-admin/js/post-formats.js (modified) (2 diffs)
• wp-includes/js/media-editor.js (modified) (5 diffs)

trunk/wp-admin/js/post-formats.js

@@ -2 +2 @@
 
 (function($) {
-    var container, $container, mediaFrame, lastMimeType, mediaPreview, lastHeight = 360, content,
+    var container, $container, mediaFrame, lastMimeType, mediaPreview, lastHeight = 360, content, insertMediaButton,
         initialFormat = 'standard',
         shortClass = 'short-format',
@@ -93 +93 @@
         }
 
-        postFormats.currentPostFormat = format;
-    }
+        // If gallery, force it to open to gallery state
+        if ( 'gallery' === format )
+            insertMediaButton.addClass( 'gallery' );
+        else
+            insertMediaButton.removeClass( 'gallery' );
+
+            postFormats.currentPostFormat = format;
+        }
+
+
 
     $(function() {
+        insertMediaButton = $( '#insert-media-button' );
         $container = $( '.post-formats-fields' );
 

trunk/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 || {}, {
@@ -693 +690 @@
         },
 
-        open: function( id ) {
+        open: function( id, options ) {
             var workflow, editor;
+
+            options = options || {};
 
             id = this.id( id );
@@ -710 +709 @@
             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();
@@ -720 +719 @@
             $(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();
@@ -731 +736 @@
                 $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 );
             });
         }