Changeset 23730

Timestamp:

03/16/2013 05:57:54 AM (13 years ago)

Author:

azaozz

Message:

Pass post format as a class to TinyMCE's body, props adamsilverstein, fixes #23198

Location:

trunk

Files:

• wp-admin/js/post-formats.js (modified) (1 diff)
• wp-includes/class-wp-editor.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (1 diff)

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

@@ -5 +5 @@
 
         // Post formats selection
-        $('.post-format-select a').on( 'click', function(e){
-                e.preventDefault();
-                var $this = $(this),
-                        format = $this.data('wpFormat');
+        $('.post-format-select a').on( 'click.post-format', function(e) {
+                var $this = $(this), editor, body,
+                        format = $this.data('wp-format'), container = $('#post-body-content');
+
                 $('.post-format-select a.nav-tab-active').removeClass('nav-tab-active');
                 $this.addClass('nav-tab-active').blur();
                 $('#post_format').val(format);
-                $('#post-body-content').attr('class', 'wp-format-' + format );
+
+                container.get(0).className = container.get(0).className.replace( /\bwp-format-[^ ]+/, '' );
+                container.addClass('wp-format-' + format);
+
+                if ( typeof tinymce != 'undefined' ) {
+                        editor = tinymce.get('content');
+
+                        if ( editor ) {
+                                body = editor.getBody();
+                                body.className = body.className.replace( /\bpost-format-[^ ]+/, '' );
+                                editor.dom.addClass( body, 'post-format-' + format );
+                        }
+                }
+
+                e.preventDefault();
         });
 

trunk/wp-includes/class-wp-editor.php

@@ -397 +397 @@
                         $body_class = $editor_id;
 
-                        if ( $post = get_post() )
-                                $body_class .= ' post-type-' . $post->post_type;
+                        if ( $post = get_post() ) {
+                                $body_class .= ' post-type-' . sanitize_html_class( $post->post_type ) . ' post-status-' . sanitize_html_class( $post->post_status );
+                                if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
+                                        $post_format = get_post_format( $post );
+                                        if ( $post_format && ! is_wp_error( $post_format ) )
+                                                $body_class .= ' post-format-' . sanitize_html_class( $post_format );
+                                        else
+                                                $body_class .= ' post-format-standard';
+                                }
+                        }
 
                         if ( !empty($set['tinymce']['body_class']) ) {

trunk/wp-includes/post-template.php

@@ -1316 +1316 @@
         if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
                 $date = "<a href='$link'>$date</a>";
-        
+
         $revision_date_author = sprintf(
                 '%s %s, %s %s (%s)',