<!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>[35607] trunk/src/wp-includes/js/tinymce/plugins: TinyMCE:</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" 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/35607">35607</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/35607","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>2015-11-11 03:26:59 +0000 (Wed, 11 Nov 2015)</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:
- Fix the inline toolbar on images in iOS, move it out of the way so the default inline toolbar is not over it.
- Fix selecting images on touch in the editor (iOS Safari fails to select them most of the time).
Fixes <a href="https://core.trac.wordpress.org/ticket/34557">#34557</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpeditimagepluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjstinymcepluginswordpresspluginjs"></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/js/tinymce/plugins/wordpress/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2015-11-11 02:24:40 UTC (rev 35606)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2015-11-11 03:26:59 UTC (rev 35607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -739,32 +739,40 @@
</span><span class="cx" style="display: block; padding: 0 10px"> spaceBottom = windowHeight - iframeRect.top - selection.bottom - blockedBottom,
</span><span class="cx" style="display: block; padding: 0 10px"> editorHeight = windowHeight - blockedTop - blockedBottom,
</span><span class="cx" style="display: block; padding: 0 10px"> className = '',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ iosOffsetTop = 0,
+ iosOffsetBottom = 0,
</ins><span class="cx" style="display: block; padding: 0 10px"> top, left;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( spaceTop >= editorHeight || spaceBottom >= editorHeight ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return this.hide();
</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">+ // Add offset in iOS to move the menu over the image, out of the way of the default iOS menu.
+ if ( tinymce.Env.iOS && currentSelection.nodeName === 'IMG' ) {
+ iosOffsetTop = 54;
+ iosOffsetBottom = 46;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( this.bottom ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( spaceBottom >= spaceNeeded ) {
</span><span class="cx" style="display: block; padding: 0 10px"> className = ' mce-arrow-up';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- top = selection.bottom + iframeRect.top + scrollY;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ top = selection.bottom + iframeRect.top + scrollY - iosOffsetBottom;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( spaceTop >= spaceNeeded ) {
</span><span class="cx" style="display: block; padding: 0 10px"> className = ' mce-arrow-down';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- top = selection.top + iframeRect.top + scrollY - toolbarHeight - margin;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ top = selection.top + iframeRect.top + scrollY - toolbarHeight - margin + iosOffsetTop;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( spaceTop >= spaceNeeded ) {
</span><span class="cx" style="display: block; padding: 0 10px"> className = ' mce-arrow-down';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- top = selection.top + iframeRect.top + scrollY - toolbarHeight - margin;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ top = selection.top + iframeRect.top + scrollY - toolbarHeight - margin + iosOffsetTop;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( spaceBottom >= spaceNeeded && editorHeight / 2 > selection.bottom + iframeRect.top - blockedTop ) {
</span><span class="cx" style="display: block; padding: 0 10px"> className = ' mce-arrow-up';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- top = selection.bottom + iframeRect.top + scrollY;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ top = selection.bottom + iframeRect.top + scrollY - iosOffsetBottom;
</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 class="cx" style="display: block; padding: 0 10px"> if ( typeof top === 'undefined' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- top = scrollY + blockedTop + buffer;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ top = scrollY + blockedTop + buffer + iosOffsetBottom;
</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"> left = selectionMiddle - toolbarWidth / 2 + iframeRect.left + scrollX;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,6 +792,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> left = selection.right - toolbarWidth + iframeRect.left + scrollX;
</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">+ // No up/down arrows on the menu over images in iOS.
+ if ( tinymce.Env.iOS && currentSelection.nodeName === 'IMG' ) {
+ className = className.replace( / ?mce-arrow-(up|down)/g, '' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> toolbar.className = toolbar.className.replace( / ?mce-arrow-[\w]+/g, '' ) + className;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> DOM.setStyles( toolbar, {
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpeditimagepluginjs"></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/js/tinymce/plugins/wpeditimage/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2015-11-11 02:24:40 UTC (rev 35606)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2015-11-11 03:26:59 UTC (rev 35607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* global tinymce */
</span><span class="cx" style="display: block; padding: 0 10px"> tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var toolbar, serializer,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var toolbar, serializer, touchOnImage,
</ins><span class="cx" style="display: block; padding: 0 10px"> each = tinymce.each,
</span><span class="cx" style="display: block; padding: 0 10px"> trim = tinymce.trim,
</span><span class="cx" style="display: block; padding: 0 10px"> iOS = tinymce.Env.iOS;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,21 +79,37 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Safari on iOS fails to select image nodes in contentEditoble mode on touch/click.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Safari on iOS fails to select images in contentEditoble mode on touch.
</ins><span class="cx" style="display: block; padding: 0 10px"> // Select them again.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( iOS ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- editor.on( 'click', function( event ) {
- if ( event.target.nodeName === 'IMG' ) {
- var node = event.target;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.on( 'init', function() {
+ editor.on( 'touchstart', function( event ) {
+ if ( event.target.nodeName === 'IMG' ) {
+ touchOnImage = true;
+ }
+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- window.setTimeout( function() {
- editor.selection.select( node );
- editor.nodeChanged();
- }, 200 );
- } else if ( toolbar ) {
- toolbar.hide();
- }
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.dom.bind( editor.getDoc(), 'touchmove', function( event ) {
+ if ( event.target.nodeName === 'IMG' ) {
+ touchOnImage = false;
+ }
+ });
+
+ editor.on( 'touchend', function( event ) {
+ if ( touchOnImage && event.target.nodeName === 'IMG' ) {
+ var node = event.target;
+
+ touchOnImage = false;
+
+ window.setTimeout( function() {
+ editor.selection.select( node );
+ editor.nodeChanged();
+ }, 200 );
+ } else if ( toolbar ) {
+ toolbar.hide();
+ }
+ });
+ });
</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"> function parseShortcode( content ) {
</span></span></pre>
</div>
</div>
</body>
</html>