<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[23730] trunk: Pass post format as a class to TinyMCE's body, props adamsilverstein, fixes #23198</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23730">23730</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-03-16 05:57:54 +0000 (Sat, 16 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass post format as a class to TinyMCE's body, props adamsilverstein, fixes <a href="http://core.trac.wordpress.org/ticket/23198">#23198</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjspostformatsjs">trunk/wp-admin/js/post-formats.js</a></li>
<li><a href="#trunkwpincludesclasswpeditorphp">trunk/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjspostformatsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/post-formats.js (23729 => 23730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/post-formats.js 2013-03-16 05:25:44 UTC (rev 23729)
+++ trunk/wp-admin/js/post-formats.js 2013-03-16 05:57:54 UTC (rev 23730)
</span><span class="lines">@@ -4,14 +4,28 @@
</span><span class="cx"> var imageFrame;
</span><span class="cx">
</span><span class="cx"> // Post formats selection
</span><del>- $('.post-format-select a').on( 'click', function(e){
- e.preventDefault();
- var $this = $(this),
- format = $this.data('wpFormat');
</del><ins>+ $('.post-format-select a').on( 'click.post-format', function(e) {
+ var $this = $(this), editor, body,
+ format = $this.data('wp-format'), container = $('#post-body-content');
+
</ins><span class="cx"> $('.post-format-select a.nav-tab-active').removeClass('nav-tab-active');
</span><span class="cx"> $this.addClass('nav-tab-active').blur();
</span><span class="cx"> $('#post_format').val(format);
</span><del>- $('#post-body-content').attr('class', 'wp-format-' + format );
</del><ins>+
+ 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();
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Image selection
</span></span></pre></div>
<a id="trunkwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-editor.php (23729 => 23730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-editor.php 2013-03-16 05:25:44 UTC (rev 23729)
+++ trunk/wp-includes/class-wp-editor.php 2013-03-16 05:57:54 UTC (rev 23730)
</span><span class="lines">@@ -396,8 +396,16 @@
</span><span class="cx">
</span><span class="cx"> $body_class = $editor_id;
</span><span class="cx">
</span><del>- if ( $post = get_post() )
- $body_class .= ' post-type-' . $post->post_type;
</del><ins>+ 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';
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> if ( !empty($set['tinymce']['body_class']) ) {
</span><span class="cx"> $body_class .= ' ' . $set['tinymce']['body_class'];
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (23729 => 23730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2013-03-16 05:25:44 UTC (rev 23729)
+++ trunk/wp-includes/post-template.php 2013-03-16 05:57:54 UTC (rev 23730)
</span><span class="lines">@@ -1315,7 +1315,7 @@
</span><span class="cx"> $date = date_i18n( $datef, strtotime( $revision->post_modified ) );
</span><span class="cx"> if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
</span><span class="cx"> $date = "<a href='$link'>$date</a>";
</span><del>-
</del><ins>+
</ins><span class="cx"> $revision_date_author = sprintf(
</span><span class="cx"> '%s %s, %s %s (%s)',
</span><span class="cx"> $gravatar,
</span></span></pre>
</div>
</div>
</body>
</html>