Changeset 23854

Timestamp:

03/29/2013 07:46:24 AM (14 years ago)

Author:

markjaquith

Message:

Do not attempt a slide transition if the current and switched-to post
formats both have no UI. Do not slide if clicking on the current format.

see #19570

File:

• trunk/wp-admin/js/post-formats.js (modified) (4 diffs)

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

@@ -2 +2 @@
 
 (function($) {
-        var mediaFrame, lastMimeType, lastMenu, mediaPreview;
+        var container, mediaFrame, lastMimeType, lastMenu, mediaPreview, noUIFormats = ['standard', 'chat', 'status', 'aside'];
+
+        function switchFormatClass( format ) {
+                container.get(0).className = container.get(0).className.replace( /\bwp-format-[^ ]+/, '' );
+                container.addClass('wp-format-' + format);
+        }
+
         $(function(){
                 var $container = $( '.post-formats-fields' );
@@ -8 +14 @@
                 // Post formats selection
                 $('.post-format-options').on( 'click', 'a', function(e){
+                        e.preventDefault();
                         var $this = $(this), editor, body,
                                 parent = $this.parent(),
                                 format = $this.data('wp-format'),
-                                container = $('#post-body-content'),
                                 description = $('.post-format-description');
+
+                if ( typeof container === 'undefined' )
+                        container = $('#post-body-content');
+
+                        // Already on this post format. Bail.
+                        if ( format === postFormats.currentPostFormat )
+                                return;
 
                         parent.find('a.active').removeClass('active');
@@ -19 +32 @@
                         $('#post_format').val(format);
 
-                        $container.slideUp( 200, function(){
-                                container.get(0).className = container.get(0).className.replace( /\bwp-format-[^ ]+/, '' );
-                                container.addClass('wp-format-' + format);
-                                $container.slideDown( 400 );
-                        });
+                        if ( -1 < $.inArray( format, noUIFormats ) && -1 < $.inArray( postFormats.currentPostFormat, noUIFormats ) ) {
+                                switchFormatClass( format ); // No slide
+                        } else {
+                                $container.slideUp( 200, function(){
+                                        switchFormatClass( format );
+                                        $container.slideDown( 400 );
+                                });
+                        }
 
                         $('#title').focus();
@@ -44 +60 @@
 
                         postFormats.currentPostFormat = format;
-
-                        e.preventDefault();
                 }).on('mouseenter focusin', 'a', function () {
                         $('.post-format-tip').html( $(this).prop('title') );