<!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>[22857] trunk/wp-includes/js/tinymce/plugins: TinyMCE: improve hiding of the image/gallery popup buttons, fix selecting a gallery in IE, don't leave empty paragraph after deleting an image with the popup button, fixes #22463, see #21390</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/22857">22857</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2012-11-27 01:31:51 +0000 (Tue, 27 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE: improve hiding of the image/gallery popup buttons, fix selecting a gallery in IE, don't leave empty paragraph after deleting an image with the popup button, fixes <a href="http://core.trac.wordpress.org/ticket/22463">#22463</a>, see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcepluginswordpresseditor_plugin_srcjs">trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswpeditimageeditor_plugin_srcjs">trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswpgalleryeditor_plugin_srcjs">trunk/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjstinymcepluginswordpresseditor_plugin_srcjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js (22856 => 22857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js 2012-11-27 00:27:36 UTC (rev 22856)
+++ trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js 2012-11-27 01:31:51 UTC (rev 22857)
</span><span class="lines">@@ -6,8 +6,6 @@
</span><span class="cx"> var DOM = tinymce.DOM;
</span><span class="cx">
</span><span class="cx"> tinymce.create('tinymce.plugins.WordPress', {
</span><del>- showButtons : 0,
-
</del><span class="cx"> init : function(ed, url) {
</span><span class="cx"> var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2'), last = 0, moreHTML, nextpageHTML, closeOnClick, mod_key;
</span><span class="cx"> moreHTML = '<img src="' + url + '/img/trans.gif" class="mceWPmore mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
</span><span class="lines">@@ -374,21 +372,10 @@
</span><span class="cx"> 'left' : X+5+'px',
</span><span class="cx"> 'display' : 'block'
</span><span class="cx"> });
</span><del>-
- this.showButtons = true;
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _hideButtons : function() {
</span><del>- if ( ! this.showButtons )
- return;
-
- if ( document.getElementById('wp_editbtns') )
- tinymce.DOM.hide('wp_editbtns');
-
- if ( document.getElementById('wp_gallerybtns') )
- tinymce.DOM.hide('wp_gallerybtns');
-
- this.showButtons = false;
</del><ins>+ tinymce.DOM.hide(['wp_editbtns', 'wp_gallerybtns']);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Resizes the iframe by a relative height value
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswpeditimageeditor_plugin_srcjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js (22856 => 22857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js 2012-11-27 00:27:36 UTC (rev 22856)
+++ trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js 2012-11-27 01:31:51 UTC (rev 22857)
</span><span class="lines">@@ -205,13 +205,14 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _createButtons : function() {
</span><del>- var t = this, ed = t.editor, DOM = tinymce.DOM, editButton, dellButton, isRetina;
</del><ins>+ var t = this, ed = tinymce.activeEditor, DOM = tinymce.DOM, editButton, dellButton, isRetina;
</ins><span class="cx">
</span><ins>+ if ( DOM.get('wp_editbtns') )
+ return;
+
</ins><span class="cx"> isRetina = ( window.devicePixelRatio && window.devicePixelRatio > 1 ) || // WebKit, Opera
</span><span class="cx"> ( window.matchMedia && window.matchMedia('(min-resolution:130dpi)').matches ); // Firefox, IE10, Opera
</span><span class="cx">
</span><del>- DOM.remove('wp_editbtns');
-
</del><span class="cx"> DOM.add(document.body, 'div', {
</span><span class="cx"> id : 'wp_editbtns',
</span><span class="cx"> style : 'display:none;'
</span><span class="lines">@@ -239,15 +240,20 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> tinymce.dom.Event.add(dellButton, 'mousedown', function(e) {
</span><del>- var el = ed.selection.getNode(), p;
</del><ins>+ var ed = tinymce.activeEditor, el = ed.selection.getNode(), parent;
</ins><span class="cx">
</span><span class="cx"> if ( el.nodeName == 'IMG' && ed.dom.getAttrib(el, 'class').indexOf('mceItem') == -1 ) {
</span><del>- if ( (p = ed.dom.getParent(el, 'div')) && ed.dom.hasClass(p, 'mceTemp') )
- ed.dom.remove(p);
- else if ( (p = ed.dom.getParent(el, 'A')) && p.childNodes.length == 1 )
- ed.dom.remove(p);
- else
</del><ins>+ if ( (parent = ed.dom.getParent(el, 'div')) && ed.dom.hasClass(parent, 'mceTemp') ) {
+ ed.dom.remove(parent);
+ } else {
+ if ( el.parentNode.nodeName == 'A' && el.parentNode.childNodes.length == 1 )
+ el = el.parentNode;
+
+ if ( el.parentNode.nodeName == 'P' && el.parentNode.childNodes.length == 1 )
+ el = el.parentNode;
+
</ins><span class="cx"> ed.dom.remove(el);
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> ed.execCommand('mceRepaint');
</span><span class="cx"> return false;
</span><span class="lines">@@ -257,7 +263,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _editImage : function() {
</span><del>- var ed = this.editor, url = this.url, el = ed.selection.getNode(), vp, H, W, cls = el.className;
</del><ins>+ var ed = tinymce.activeEditor, url = this.url, el = ed.selection.getNode(), vp, H, W, cls = el.className;
</ins><span class="cx">
</span><span class="cx"> if ( cls.indexOf('mceItem') != -1 || cls.indexOf('wpGallery') != -1 || el.nodeName != 'IMG' )
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswpgalleryeditor_plugin_srcjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js (22856 => 22857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js 2012-11-27 00:27:36 UTC (rev 22856)
+++ trunk/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js 2012-11-27 01:31:51 UTC (rev 22857)
</span><span class="lines">@@ -11,6 +11,9 @@
</span><span class="cx">
</span><span class="cx"> // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...');
</span><span class="cx"> ed.addCommand('WP_Gallery', function() {
</span><ins>+ if ( tinymce.isIE )
+ ed.selection.moveToBookmark( ed.wpGalleryBookmark );
+
</ins><span class="cx"> var el = ed.selection.getNode(),
</span><span class="cx"> gallery = wp.media.gallery,
</span><span class="cx"> frame;
</span><span class="lines">@@ -49,6 +52,7 @@
</span><span class="cx">
</span><span class="cx"> ed.onMouseDown.add(function(ed, e) {
</span><span class="cx"> if ( e.target.nodeName == 'IMG' && ed.dom.hasClass(e.target, 'wpGallery') ) {
</span><ins>+ ed.plugins.wordpress._hideButtons();
</ins><span class="cx"> ed.plugins.wordpress._showButtons(e.target, 'wp_gallerybtns');
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -87,13 +91,14 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _createButtons : function() {
</span><del>- var t = this, ed = t.editor, DOM = tinymce.DOM, editButton, dellButton, isRetina;
</del><ins>+ var t = this, ed = tinymce.activeEditor, DOM = tinymce.DOM, editButton, dellButton, isRetina;
</ins><span class="cx">
</span><ins>+ if ( DOM.get('wp_gallerybtns') )
+ return;
+
</ins><span class="cx"> isRetina = ( window.devicePixelRatio && window.devicePixelRatio > 1 ) || // WebKit, Opera
</span><span class="cx"> ( window.matchMedia && window.matchMedia('(min-resolution:130dpi)').matches ); // Firefox, IE10, Opera
</span><span class="cx">
</span><del>- DOM.remove('wp_gallerybtns');
-
</del><span class="cx"> DOM.add(document.body, 'div', {
</span><span class="cx"> id : 'wp_gallerybtns',
</span><span class="cx"> style : 'display:none;'
</span><span class="lines">@@ -108,7 +113,8 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> tinymce.dom.Event.add(editButton, 'mousedown', function(e) {
</span><del>- ed.windowManager.bookmark = ed.selection.getBookmark('simple');
</del><ins>+ var ed = tinymce.activeEditor;
+ ed.wpGalleryBookmark = ed.selection.getBookmark('simple');
</ins><span class="cx"> ed.execCommand("WP_Gallery");
</span><span class="cx"> ed.plugins.wordpress._hideButtons();
</span><span class="cx"> });
</span><span class="lines">@@ -122,7 +128,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> tinymce.dom.Event.add(dellButton, 'mousedown', function(e) {
</span><del>- var el = ed.selection.getNode();
</del><ins>+ var ed = tinymce.activeEditor, el = ed.selection.getNode();
</ins><span class="cx">
</span><span class="cx"> if ( el.nodeName == 'IMG' && ed.dom.hasClass(el, 'wpGallery') ) {
</span><span class="cx"> ed.dom.remove(el);
</span></span></pre>
</div>
</div>
</body>
</html>