<!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>[29370] trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js: TinyMCE: fix alignment buttons when used on image with caption.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/29370">29370</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-08-04 00:51:19 +0000 (Mon, 04 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE: fix alignment buttons when used on image with caption. Remove old/unneeded code. Fixes <a href="http://core.trac.wordpress.org/ticket/28705">#28705</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstinymcepluginswpeditimagepluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjstinymcepluginswpeditimagepluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (29369 => 29370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-08-03 22:33:05 UTC (rev 29369)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-08-04 00:51:19 UTC (rev 29370)
</span><span class="lines">@@ -794,29 +794,15 @@
</span><span class="cx"> dom.insertAfter( p, node );
</span><span class="cx"> editor.selection.setCursorLocation( p, 0 );
</span><span class="cx"> editor.nodeChanged();
</span><del>-
- if ( tinymce.Env.ie > 8 ) {
- setTimeout( function() {
- editor.selection.setCursorLocation( p, 0 );
- editor.selection.setContent( event.value );
- }, 500 );
-
- return false;
- }
</del><span class="cx"> }
</span><span class="cx"> } else if ( cmd === 'JustifyLeft' || cmd === 'JustifyRight' || cmd === 'JustifyCenter' ) {
</span><span class="cx"> node = editor.selection.getNode();
</span><span class="cx"> align = cmd.substr(7).toLowerCase();
</span><del>- align = 'align' + align;
</del><ins>+ align = 'align' + align,
+ DL = dom.getParent( node, 'dl.wp-caption' );
</ins><span class="cx">
</span><span class="cx"> removeToolbar();
</span><span class="cx">
</span><del>- if ( dom.is( node, 'dl.wp-caption' ) ) {
- DL = node;
- } else {
- DL = dom.getParent( node, 'dl.wp-caption' );
- }
-
</del><span class="cx"> if ( DL ) {
</span><span class="cx"> // When inside an image caption, set the align* class on dl.wp-caption
</span><span class="cx"> if ( dom.hasClass( DL, align ) ) {
</span><span class="lines">@@ -827,7 +813,12 @@
</span><span class="cx"> dom.addClass( DL, align );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return false;
</del><ins>+ if ( node.nodeName === 'IMG' ) {
+ // Re-select the image to update resize handles, etc.
+ editor.nodeChanged();
+ }
+
+ event.preventDefault();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( node.nodeName === 'IMG' ) {
</span></span></pre>
</div>
</div>
</body>
</html>