<!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>[28614] trunk/src/wp-includes/js/tinymce: TinyMCE: fix problems with undo/redo after resizing an image several times.</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/28614">28614</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-05-29 07:50:35 +0000 (Thu, 29 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE: fix problems with undo/redo after resizing an image several times. Fixes <a href="http://core.trac.wordpress.org/ticket/28389">#28389</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstinymcepluginswpeditimagepluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinswordpresswpcontentcss">trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css</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 (28613 => 28614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-05-29 06:03:15 UTC (rev 28613)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-05-29 07:50:35 UTC (rev 28614)
</span><span class="lines">@@ -435,10 +435,10 @@
</span><span class="cx"> dom.setAttrib( node, 'data-wp-imgselect', 1 );
</span><span class="cx"> rectangle = dom.getRect( node );
</span><span class="cx">
</span><del>- toolbarHtml = '<div class="dashicons dashicons-edit edit" data-mce-bogus="1"></div>' +
- '<div class="dashicons dashicons-no-alt remove" data-mce-bogus="1"></div>';
</del><ins>+ toolbarHtml = '<i class="dashicons dashicons-edit edit" data-mce-bogus="1"></i>' +
+ '<i class="dashicons dashicons-no-alt remove" data-mce-bogus="1"></i>';
</ins><span class="cx">
</span><del>- toolbar = dom.create( 'div', {
</del><ins>+ toolbar = dom.create( 'p', {
</ins><span class="cx"> 'id': 'wp-image-toolbar',
</span><span class="cx"> 'data-mce-bogus': '1',
</span><span class="cx"> 'contenteditable': false
</span><span class="lines">@@ -753,28 +753,31 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> editor.on( 'ObjectResized', function( event ) {
</span><del>- var parent, width,
- node = event.target,
- dom = editor.dom;
</del><ins>+ var node = event.target;
</ins><span class="cx">
</span><span class="cx"> if ( node.nodeName === 'IMG' ) {
</span><del>- node.className = node.className.replace( /\bsize-[^ ]+/, '' );
</del><ins>+ editor.undoManager.transact( function() {
+ var parent, width,
+ dom = editor.dom;
</ins><span class="cx">
</span><del>- if ( parent = dom.getParent( node, '.wp-caption' ) ) {
- width = event.width || dom.getAttrib( node, 'width' );
</del><ins>+ node.className = node.className.replace( /\bsize-[^ ]+/, '' );
</ins><span class="cx">
</span><del>- if ( width ) {
- width = parseInt( width, 10 );
</del><ins>+ if ( parent = dom.getParent( node, '.wp-caption' ) ) {
+ width = event.width || dom.getAttrib( node, 'width' );
</ins><span class="cx">
</span><del>- if ( ! editor.getParam( 'wpeditimage_html5_captions' ) ) {
- width += 10;
</del><ins>+ if ( width ) {
+ width = parseInt( width, 10 );
+
+ if ( ! editor.getParam( 'wpeditimage_html5_captions' ) ) {
+ width += 10;
+ }
+
+ dom.setStyle( parent, 'width', width + 'px' );
</ins><span class="cx"> }
</span><del>-
- dom.setStyle( parent, 'width', width + 'px' );
</del><span class="cx"> }
</span><del>- }
- // refresh toolbar
- addToolbar( node );
</del><ins>+ // refresh toolbar
+ addToolbar( node );
+ });
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -921,7 +924,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( node.nodeName === 'DIV' && dom.getParent( node, '#wp-image-toolbar' ) ) {
</del><ins>+ if ( node.nodeName === 'I' && dom.getParent( node, '#wp-image-toolbar' ) ) {
</ins><span class="cx"> image = dom.select( 'img[data-wp-imgselect]' )[0];
</span><span class="cx">
</span><span class="cx"> if ( image ) {
</span><span class="lines">@@ -940,6 +943,11 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ // Remove toolbar from undo levels
+ editor.on( 'BeforeAddUndo', function( event ) {
+ event.level.content = event.level.content.replace( /<p [^>]*data-mce-bogus[^>]+>[\s\S]*<\/p>/g, '' );
+ });
+
</ins><span class="cx"> editor.on( 'cut', function() {
</span><span class="cx"> removeToolbar();
</span><span class="cx"> });
</span><span class="lines">@@ -953,7 +961,9 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> editor.on( 'BeforeSetContent', function( event ) {
</span><del>- event.content = editor.wpSetImgCaption( event.content );
</del><ins>+ if ( event.format !== 'raw' ) {
+ event.content = editor.wpSetImgCaption( event.content );
+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> editor.on( 'PostProcess', function( event ) {
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymceskinswordpresswpcontentcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css (28613 => 28614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-05-29 06:03:15 UTC (rev 28613)
+++ trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-05-29 07:50:35 UTC (rev 28614)
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .wpview-wrap .toolbar div,
</span><del>-#wp-image-toolbar div {
</del><ins>+#wp-image-toolbar i {
</ins><span class="cx"> margin-top: 7px;
</span><span class="cx"> margin-left: 7px;
</span><span class="cx"> padding: 2px;
</span><span class="lines">@@ -277,8 +277,8 @@
</span><span class="cx">
</span><span class="cx"> .ie8 .wpview-wrap .toolbar div,
</span><span class="cx"> .ie7 .wpview-wrap .toolbar div,
</span><del>-.ie8 #wp-image-toolbar div,
-.ie7 #wp-image-toolbar div {
</del><ins>+.ie8 #wp-image-toolbar i,
+.ie7 #wp-image-toolbar i {
</ins><span class="cx"> display: inline;
</span><span class="cx"> padding: 0;
</span><span class="cx"> }
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> .wpview-wrap .toolbar div:hover,
</span><del>-#wp-image-toolbar div:hover {
</del><ins>+#wp-image-toolbar i:hover {
</ins><span class="cx"> box-shadow: 0 1px 3px rgba(0,0,0,0.8);
</span><span class="cx"> background-color: #000;
</span><span class="cx"> color: #2ea2cc;
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .rtl .wpview-wrap .toolbar div,
</span><del>-.rtl #wp-image-toolbar div {
</del><ins>+.rtl #wp-image-toolbar i {
</ins><span class="cx"> margin-left: auto;
</span><span class="cx"> margin-right: 7px;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>