<!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>[22602] trunk/wp-includes/js/tinymce/plugins: TinyMCE: fix and improve the popup buttons for editing images and galleries show/hide for touch devices, fix inconsistency in iOS when "touching" an image inside a link, 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/22602">22602</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2012-11-15 23:49:19 +0000 (Thu, 15 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE: fix and improve the popup buttons for editing images and galleries show/hide for touch devices, fix inconsistency in iOS when "touching" an image inside a link, see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a></pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkwpincludesjstinymcepluginswpeditimageeditor_plugin_srcjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js (22601 => 22602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js 2012-11-15 22:58:31 UTC (rev 22601)
+++ trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js 2012-11-15 23:49:19 UTC (rev 22602)
</span><span class="lines">@@ -45,6 +45,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> });
</span><ins>+
+ // iOS6 doesn't show the buttons properly on click, show them on 'touchstart'
+ if ( 'ontouchstart' in window ) {
+ ed.dom.events.add(ed.getBody(), 'touchstart', function(e){
+ t._showButtons(e);
+ });
+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // resize the caption <dl> when the image is soft-resized by the user
</span><span class="lines">@@ -75,26 +82,8 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // show editimage buttons
</span><del>- ed.onMouseDown.add(function(ed, e) {
- var target = e.target;
-
- if ( target.nodeName != 'IMG' ) {
- if ( target.firstChild && target.firstChild.nodeName == 'IMG' && target.childNodes.length == 1 )
- target = target.firstChild;
- else
- return;
- }
-
- if ( ed.dom.getAttrib(target, 'class').indexOf('mceItem') == -1 ) {
- mouse = {
- x: e.clientX,
- y: e.clientY,
- img_w: target.clientWidth,
- img_h: target.clientHeight
- };
-
- ed.plugins.wordpress._showButtons(target, 'wp_editbtns');
- }
</del><ins>+ ed.onMouseDown.add(function(ed, e){
+ t._showButtons(e);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> ed.onBeforeSetContent.add(function(ed, o) {
</span><span class="lines">@@ -199,7 +188,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _createButtons : function() {
</span><del>- var t = this, ed = tinyMCE.activeEditor, DOM = tinymce.DOM, editButton, dellButton, isRetina;
</del><ins>+ var t = this, ed = t.editor, DOM = tinymce.DOM, editButton, dellButton, isRetina;
</ins><span class="cx">
</span><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="lines">@@ -221,6 +210,7 @@
</span><span class="cx">
</span><span class="cx"> tinymce.dom.Event.add(editButton, 'mousedown', function(e) {
</span><span class="cx"> t._editImage();
</span><ins>+ ed.plugins.wordpress._hideButtons();
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> dellButton = DOM.add('wp_editbtns', 'img', {
</span><span class="lines">@@ -232,7 +222,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> tinymce.dom.Event.add(dellButton, 'mousedown', function(e) {
</span><del>- var ed = tinyMCE.activeEditor, el = ed.selection.getNode(), p;
</del><ins>+ var el = ed.selection.getNode(), p;
</ins><span class="cx">
</span><span class="cx"> if ( el.nodeName == 'IMG' && ed.dom.getAttrib(el, 'class').indexOf('mceItem') == -1 ) {
</span><span class="cx"> if ( (p = ed.dom.getParent(el, 'div')) && ed.dom.hasClass(p, 'mceTemp') )
</span><span class="lines">@@ -245,6 +235,7 @@
</span><span class="cx"> ed.execCommand('mceRepaint');
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+ ed.plugins.wordpress._hideButtons();
</ins><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -266,6 +257,36 @@
</span><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ _showButtons : function(e) {
+ var ed = this.editor, target = e.target;
+
+ if ( target.nodeName != 'IMG' ) {
+ if ( target.firstChild && target.firstChild.nodeName == 'IMG' && target.childNodes.length == 1 ) {
+ target = target.firstChild;
+ } else {
+ ed.plugins.wordpress._hideButtons();
+ return;
+ }
+ }
+
+ if ( ed.dom.getAttrib(target, 'class').indexOf('mceItem') == -1 ) {
+ mouse = {
+ x: e.clientX,
+ y: e.clientY,
+ img_w: target.clientWidth,
+ img_h: target.clientHeight
+ };
+
+ if ( e.type == 'touchstart' ) {
+ ed.selection.select(target);
+ ed.dom.events.cancel(e);
+ }
+
+ ed.plugins.wordpress._hideButtons();
+ ed.plugins.wordpress._showButtons(target, 'wp_editbtns');
+ }
+ },
+
</ins><span class="cx"> getInfo : function() {
</span><span class="cx"> return {
</span><span class="cx"> longname : 'Edit Image',
</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 (22601 => 22602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js 2012-11-15 22:58:31 UTC (rev 22601)
+++ trunk/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js 2012-11-15 23:49:19 UTC (rev 22602)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> var t = this;
</span><span class="cx">
</span><span class="cx"> t.url = url;
</span><ins>+ t.editor = ed;
</ins><span class="cx"> t._createButtons();
</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="lines">@@ -30,9 +31,26 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ ed.onInit.add(function(ed) {
+ // iOS6 doesn't show the buttons properly on click, show them on 'touchstart'
+ if ( 'ontouchstart' in window ) {
+ ed.dom.events.add(ed.getBody(), 'touchstart', function(e){
+ var target = e.target;
+
+ if ( target.nodeName == 'IMG' && ed.dom.hasClass(target, 'wpGallery') ) {
+ ed.selection.select(target);
+ ed.dom.events.cancel(e);
+ ed.plugins.wordpress._hideButtons();
+ ed.plugins.wordpress._showButtons(target, 'wp_gallerybtns');
+ }
+ });
+ }
+ });
+
</ins><span class="cx"> ed.onMouseDown.add(function(ed, e) {
</span><del>- if ( e.target.nodeName == 'IMG' && ed.dom.hasClass(e.target, 'wpGallery') )
</del><ins>+ if ( e.target.nodeName == 'IMG' && ed.dom.hasClass(e.target, 'wpGallery') ) {
</ins><span class="cx"> ed.plugins.wordpress._showButtons(e.target, 'wp_gallerybtns');
</span><ins>+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> ed.onBeforeSetContent.add(function(ed, o) {
</span><span class="lines">@@ -69,7 +87,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _createButtons : function() {
</span><del>- var t = this, ed = tinyMCE.activeEditor, DOM = tinymce.DOM, editButton, dellButton, isRetina;
</del><ins>+ var t = this, ed = t.editor, DOM = tinymce.DOM, editButton, dellButton, isRetina;
</ins><span class="cx">
</span><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="lines">@@ -90,9 +108,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> tinymce.dom.Event.add(editButton, 'mousedown', function(e) {
</span><del>- var ed = tinyMCE.activeEditor;
</del><span class="cx"> ed.windowManager.bookmark = ed.selection.getBookmark('simple');
</span><span class="cx"> ed.execCommand("WP_Gallery");
</span><ins>+ ed.plugins.wordpress._hideButtons();
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> dellButton = DOM.add('wp_gallerybtns', 'img', {
</span><span class="lines">@@ -104,14 +122,16 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> tinymce.dom.Event.add(dellButton, 'mousedown', function(e) {
</span><del>- var ed = tinyMCE.activeEditor, el = ed.selection.getNode();
</del><ins>+ var 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 class="cx">
</span><span class="cx"> ed.execCommand('mceRepaint');
</span><del>- return false;
</del><ins>+ ed.dom.events.cancel(e);
</ins><span class="cx"> }
</span><ins>+
+ ed.plugins.wordpress._hideButtons();
</ins><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>