<!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>[29471] trunk/src/wp-includes/js: TinyMCE: fix the 'editimage' plugin for touch devices.</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/29471">29471</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-08-12 04:26:13 +0000 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE: fix the 'editimage' plugin for touch devices. Better attempt to hide the onscreen keyboard when the media modal opens and TinyMCE is in focus. See <a href="http://core.trac.wordpress.org/ticket/28595">#28595</a>, <a href="http://core.trac.wordpress.org/ticket/29166">#29166</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaeditorjs">trunk/src/wp-includes/js/media-editor.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<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="trunksrcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/mce-view.js (29470 => 29471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mce-view.js 2014-08-12 01:17:07 UTC (rev 29470)
+++ trunk/src/wp-includes/js/mce-view.js 2014-08-12 04:26:13 UTC (rev 29471)
</span><span class="lines">@@ -483,6 +483,9 @@
</span><span class="cx"> var shortcode = gallery.shortcode( selection ).string();
</span><span class="cx"> $( node ).attr( 'data-wpview-text', window.encodeURIComponent( shortcode ) );
</span><span class="cx"> wp.mce.views.refreshView( self, shortcode );
</span><ins>+ });
+
+ frame.on( 'close', function() {
</ins><span class="cx"> frame.detach();
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaeditorjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-editor.js (29470 => 29471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-editor.js 2014-08-12 01:17:07 UTC (rev 29470)
+++ trunk/src/wp-includes/js/media-editor.js 2014-08-12 04:26:13 UTC (rev 29471)
</span><span class="lines">@@ -1048,22 +1048,8 @@
</span><span class="cx"> * @returns {wp.media.view.MediaFrame}
</span><span class="cx"> */
</span><span class="cx"> open: function( id, options ) {
</span><del>- var workflow, focusTrap, scrollTop;
</del><ins>+ var workflow;
</ins><span class="cx">
</span><del>- if ( 'ontouchend' in document ) {
- // Close the onscreen keyboard
- if ( ! focusTrap ) {
- focusTrap = $( '<input type="text" style="width: 1px; height: 1px;" />' );
- }
-
- // Keep the scroll position
- scrollTop = $( window ).scrollTop();
-
- $( document.body ).append( focusTrap );
- focusTrap.focus().blur().remove();
- $( window ).scrollTop( scrollTop );
- }
-
</del><span class="cx"> options = options || {};
</span><span class="cx">
</span><span class="cx"> id = this.id( id );
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29470 => 29471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-08-12 01:17:07 UTC (rev 29470)
+++ trunk/src/wp-includes/js/media-views.js 2014-08-12 04:26:13 UTC (rev 29471)
</span><span class="lines">@@ -3222,7 +3222,8 @@
</span><span class="cx"> */
</span><span class="cx"> open: function() {
</span><span class="cx"> var $el = this.$el,
</span><del>- options = this.options;
</del><ins>+ options = this.options,
+ mceEditor;
</ins><span class="cx">
</span><span class="cx"> if ( $el.is(':visible') ) {
</span><span class="cx"> return this;
</span><span class="lines">@@ -3243,6 +3244,19 @@
</span><span class="cx"> $( 'body' ).addClass( 'modal-open' );
</span><span class="cx">
</span><span class="cx"> $el.show().find( '.media-modal-close' ).focus();
</span><ins>+
+ // Try to close the onscreen keyboard
+ if ( 'ontouchend' in document ) {
+ if ( ( mceEditor = window.tinymce && window.tinymce.activeEditor ) && ! mceEditor.isHidden() && mceEditor.iframeElement ) {
+ mceEditor.iframeElement.focus();
+ mceEditor.iframeElement.blur();
+
+ setTimeout( function() {
+ mceEditor.iframeElement.blur();
+ }, 100 );
+ }
+ }
+
</ins><span class="cx"> return this.propagate('open');
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpeditimagepluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (29470 => 29471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-08-12 01:17:07 UTC (rev 29470)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-08-12 04:26:13 UTC (rev 29471)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> /* global tinymce */
</span><span class="cx"> tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
</span><del>- var toolbarActive = false;
</del><ins>+ var toolbarActive = false,
+ editingImage = false;
</ins><span class="cx">
</span><span class="cx"> function parseShortcode( content ) {
</span><span class="cx"> return content.replace( /(?:<p>)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g, function( a, b, c ) {
</span><span class="lines">@@ -411,6 +412,7 @@
</span><span class="cx"> frame.on( 'close', function() {
</span><span class="cx"> editor.focus();
</span><span class="cx"> frame.detach();
</span><ins>+ editingImage = false;
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> frame.open();
</span><span class="lines">@@ -492,6 +494,7 @@
</span><span class="cx">
</span><span class="cx"> editor.dom.setAttrib( editor.dom.select( 'img[data-wp-imgselect]' ), 'data-wp-imgselect', null );
</span><span class="cx">
</span><ins>+ editingImage = false;
</ins><span class="cx"> toolbarActive = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -507,6 +510,63 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function isToolbarButton( node ) {
+ return ( node && node.nodeName === 'I' && node.parentNode.id === 'wp-image-toolbar' );
+ }
+
+ function edit( event ) {
+ var image,
+ node = event.target,
+ dom = editor.dom;
+
+ // Don't trigger on right-click
+ if ( event.button && event.button > 1 ) {
+ return;
+ }
+
+ if ( isToolbarButton( node ) ) {
+ image = dom.select( 'img[data-wp-imgselect]' )[0];
+
+ if ( image ) {
+ editor.selection.select( image );
+
+ if ( dom.hasClass( node, 'remove' ) ) {
+ removeImage( image );
+ } else if ( dom.hasClass( node, 'edit' ) ) {
+ if ( ! editingImage ) {
+ editImage( image );
+ editingImage = true;
+ }
+ }
+ }
+
+ event.preventDefault();
+ } else if ( node.nodeName === 'IMG' && ! editor.dom.getAttrib( node, 'data-wp-imgselect' ) && ! isPlaceholder( node ) ) {
+ addToolbar( node );
+ } else if ( node.nodeName !== 'IMG' ) {
+ removeToolbar();
+ }
+ }
+
+ if ( 'ontouchend' in document ) {
+ editor.on( 'touchend', edit );
+
+ editor.on( 'click', function( event ) {
+ var target = event.target;
+
+ if ( editingImage && target.nodeName === 'IMG' ) {
+ event.preventDefault();
+ }
+
+ if ( isToolbarButton( target ) ) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ });
+ } else {
+ editor.on( 'mouseup', edit );
+ }
+
</ins><span class="cx"> editor.on( 'init', function() {
</span><span class="cx"> var dom = editor.dom,
</span><span class="cx"> captionClass = editor.getParam( 'wpeditimage_html5_captions' ) ? 'html5-captions' : 'html4-captions';
</span><span class="lines">@@ -919,7 +979,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> editor.on( 'mousedown', function( event ) {
</span><del>- if ( editor.dom.getParent( event.target, '#wp-image-toolbar' ) ) {
</del><ins>+ if ( isToolbarButton( event.target ) ) {
</ins><span class="cx"> if ( tinymce.Env.ie ) {
</span><span class="cx"> // Stop IE > 8 from making the wrapper resizable on mousedown
</span><span class="cx"> event.preventDefault();
</span><span class="lines">@@ -929,35 +989,6 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- editor.on( 'mouseup touchend', function( event ) {
- var image,
- node = event.target,
- dom = editor.dom;
-
- // Don't trigger on right-click
- if ( event.button && event.button > 1 ) {
- return;
- }
-
- if ( node.nodeName === 'I' && dom.getParent( node, '#wp-image-toolbar' ) ) {
- image = dom.select( 'img[data-wp-imgselect]' )[0];
-
- if ( image ) {
- editor.selection.select( image );
-
- if ( dom.hasClass( node, 'remove' ) ) {
- removeImage( image );
- } else if ( dom.hasClass( node, 'edit' ) ) {
- editImage( image );
- }
- }
- } else if ( node.nodeName === 'IMG' && ! editor.dom.getAttrib( node, 'data-wp-imgselect' ) && ! isPlaceholder( node ) ) {
- addToolbar( node );
- } else if ( node.nodeName !== 'IMG' ) {
- removeToolbar();
- }
- });
-
</del><span class="cx"> // Remove from undo levels
</span><span class="cx"> editor.on( 'BeforeAddUndo', function( event ) {
</span><span class="cx"> event.level.content = event.level.content.replace( / data-wp-imgselect="1"/g, '' );
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymceskinswordpresswpcontentcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css (29470 => 29471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-08-12 01:17:07 UTC (rev 29470)
+++ trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-08-12 04:26:13 UTC (rev 29471)
</span><span class="lines">@@ -209,7 +209,9 @@
</span><span class="cx">
</span><span class="cx"> /* delegate the handling of the selection to the wpview tinymce plugin */
</span><span class="cx"> .wpview-wrap,
</span><del>-.wpview-wrap * {
</del><ins>+.wpview-wrap *,
+#wp-image-toolbar,
+#wp-image-toolbar * {
</ins><span class="cx"> -moz-user-select: none;
</span><span class="cx"> -webkit-user-select: none;
</span><span class="cx"> -ms-user-select: none;
</span></span></pre>
</div>
</div>
</body>
</html>