<!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>[44695] trunk/src: TinyMCE Classic Block: fix the Edit Image modal to work as in the Classic Editor.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/44695">44695</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/44695","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-01-24 11:10:34 +0000 (Thu, 24 Jan 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>TinyMCE Classic Block: fix the Edit Image modal to work as in the Classic Editor.
Fixes <a href="https://core.trac.wordpress.org/ticket/46085">#46085</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesvendortinymcepluginswpeditimagepluginjs">trunk/src/js/_enqueues/vendor/tinymce/plugins/wpeditimage/plugin.js</a></li>
<li><a href="#trunksrcwpincludescsseditorcss">trunk/src/wp-includes/css/editor.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesvendortinymcepluginswpeditimagepluginjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/tinymce/plugins/wpeditimage/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/tinymce/plugins/wpeditimage/plugin.js 2019-01-23 23:22:23 UTC (rev 44694)
+++ trunk/src/js/_enqueues/vendor/tinymce/plugins/wpeditimage/plugin.js 2019-01-24 11:10:34 UTC (rev 44695)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,12 +347,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return serializer.serialize( editor.parser.parse( caption, { forced_root_block: false } ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function updateImage( imageNode, imageData ) {
- var classes, className, node, html, parent, wrap, linkNode,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function updateImage( $imageNode, imageData ) {
+ var classes, className, node, html, parent, wrap, linkNode, imageNode,
</ins><span class="cx" style="display: block; padding: 0 10px"> captionNode, dd, dl, id, attrs, linkAttrs, width, height, align,
</span><span class="cx" style="display: block; padding: 0 10px"> $imageNode, srcset, src,
</span><span class="cx" style="display: block; padding: 0 10px"> dom = editor.dom;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $imageNode || ! $imageNode.length ) {
+ return;
+ }
+
+ imageNode = $imageNode[0];
</ins><span class="cx" style="display: block; padding: 0 10px"> classes = tinymce.explode( imageData.extraClasses, ' ' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! classes ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,7 +394,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> dom.setAttribs( imageNode, attrs );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Preserve empty alt attributes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- editor.$( imageNode ).attr( 'alt', imageData.alt || '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imageNode.attr( 'alt', imageData.alt || '' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> linkAttrs = {
</span><span class="cx" style="display: block; padding: 0 10px"> href: imageData.linkUrl,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -513,7 +518,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function editImage( img ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var frame, callback, metadata;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var frame, callback, metadata, imageNode;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( typeof wp === 'undefined' || ! wp.media ) {
</span><span class="cx" style="display: block; padding: 0 10px"> editor.execCommand( 'mceImage' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -522,6 +527,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> metadata = extractImageData( img );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Mark the image node so we can select it later.
+ editor.$( img ).attr( 'data-wp-editing', 1 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Manipulate the metadata by reference that is fed into the PostImage model used in the media modal
</span><span class="cx" style="display: block; padding: 0 10px"> wp.media.events.trigger( 'editor:image-edit', {
</span><span class="cx" style="display: block; padding: 0 10px"> editor: editor,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -538,9 +546,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp.media.events.trigger( 'editor:frame-create', { frame: frame } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> callback = function( imageData ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- editor.focus();
</del><span class="cx" style="display: block; padding: 0 10px"> editor.undoManager.transact( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- updateImage( img, imageData );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateImage( imageNode, imageData );
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> frame.detach();
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -550,6 +557,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> frame.on( 'close', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> editor.focus();
</span><span class="cx" style="display: block; padding: 0 10px"> frame.detach();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // `close` fires first...
+ // To be able to update the image node, we need to find it here,
+ // and use it in the callback.
+ imageNode = editor.$( 'img[data-wp-editing]' )
+ imageNode.removeAttr( 'data-wp-editing' );
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> frame.open();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -810,7 +823,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'beforeGetContent', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( event.format !== 'raw' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- editor.$( 'img[id="__wp-temp-img-id"]' ).attr( 'id', null );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.$( 'img[id="__wp-temp-img-id"]' ).removeAttr( 'id' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludescsseditorcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/css/editor.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/editor.css 2019-01-23 23:22:23 UTC (rev 44694)
+++ trunk/src/wp-includes/css/editor.css 2019-01-24 11:10:34 UTC (rev 44695)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1211,6 +1211,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> content: "\f104";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.mce-content-body dl.wp-caption {
+ max-width: 100%;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Quicktags */
</span><span class="cx" style="display: block; padding: 0 10px"> .quicktags-toolbar {
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 3px;
</span></span></pre>
</div>
</div>
</body>
</html>