<!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>[30560] trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js: TinyMCE: don't hide the image toolbar when the iframe window fires onresize.</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/30560">30560</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/30560","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>2014-11-25 04:30:31 +0000 (Tue, 25 Nov 2014)</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: don't hide the image toolbar when the iframe window fires onresize. There is a bug in several browsers that triggers onresize when a tooltip is shown, only in RTL mode. Also use better variable name. Fixes <a href="https://core.trac.wordpress.org/ticket/30147">#30147</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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="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 2014-11-25 04:02:26 UTC (rev 30559)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-11-25 04:30:31 UTC (rev 30560)
</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 tb, serializer,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var floatingToolbar, serializer,
</ins><span class="cx" style="display: block; padding: 0 10px"> DOM = tinymce.DOM,
</span><span class="cx" style="display: block; padding: 0 10px"> settings = editor.settings,
</span><span class="cx" style="display: block; padding: 0 10px"> Factory = tinymce.ui.Factory,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,32 +155,43 @@
</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">- tb = Factory.create( toolbarConfig() ).renderTo( document.body ).hide();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ floatingToolbar = Factory.create( toolbarConfig() ).renderTo( document.body ).hide();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- tb.reposition = function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ floatingToolbar.reposition = function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> var top, left, minTop, className,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ windowPos, adminbar, mceToolbar, boundary,
+ boundaryMiddle, boundaryVerticalMiddle, spaceTop,
+ spaceBottom, windowWidth, toolbarWidth, toolbarHalf,
+ iframe, iframePos, iframeWidth, iframeHeigth,
+ toolbarNodeHeight, verticalSpaceNeeded,
</ins><span class="cx" style="display: block; padding: 0 10px"> toolbarNode = this.getEl(),
</span><span class="cx" style="display: block; padding: 0 10px"> buffer = 5,
</span><span class="cx" style="display: block; padding: 0 10px"> margin = 8,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- windowPos = window.pageYOffset || document.documentElement.scrollTop,
- adminbar = tinymce.$( '#wpadminbar' )[0],
- mceToolbar = tinymce.$( '.mce-tinymce .mce-toolbar-grp' )[0],
</del><span class="cx" style="display: block; padding: 0 10px"> adminbarHeight = 0,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- boundary = editor.selection.getNode().getBoundingClientRect(),
- boundaryMiddle = ( boundary.left + boundary.right ) / 2,
- boundaryVerticalMiddle = ( boundary.top + boundary.bottom ) / 2,
- spaceTop = boundary.top,
- spaceBottom = iframeHeigth - boundary.bottom,
- windowWidth = window.innerWidth,
- toolbarWidth = toolbarNode.offsetWidth,
- toolbarHalf = toolbarWidth / 2,
- iframe = editor.getContentAreaContainer().firstChild,
- iframePos = DOM.getPos( iframe ),
- iframeWidth = iframe.offsetWidth,
- iframeHeigth = iframe.offsetHeight,
- toolbarNodeHeight = toolbarNode.offsetHeight,
- verticalSpaceNeeded = toolbarNodeHeight + margin + buffer;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ imageNode = editor.selection.getNode();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! imageNode || imageNode.nodeName !== 'IMG' ) {
+ return this;
+ }
+
+ windowPos = window.pageYOffset || document.documentElement.scrollTop;
+ adminbar = tinymce.$( '#wpadminbar' )[0];
+ mceToolbar = tinymce.$( '.mce-tinymce .mce-toolbar-grp' )[0];
+ boundary = imageNode.getBoundingClientRect();
+ boundaryMiddle = ( boundary.left + boundary.right ) / 2;
+ boundaryVerticalMiddle = ( boundary.top + boundary.bottom ) / 2;
+ spaceTop = boundary.top;
+ spaceBottom = iframeHeigth - boundary.bottom;
+ windowWidth = window.innerWidth;
+ toolbarWidth = toolbarNode.offsetWidth;
+ toolbarHalf = toolbarWidth / 2;
+ iframe = editor.getContentAreaContainer().firstChild;
+ iframePos = DOM.getPos( iframe );
+ iframeWidth = iframe.offsetWidth;
+ iframeHeigth = iframe.offsetHeight;
+ toolbarNodeHeight = toolbarNode.offsetHeight;
+ verticalSpaceNeeded = toolbarNodeHeight + margin + buffer;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( iOS ) {
</span><span class="cx" style="display: block; padding: 0 10px"> top = boundary.top + iframePos.y + margin;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> editor.selection.select( node );
</span><span class="cx" style="display: block; padding: 0 10px"> }, 200 );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- tb.hide();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ floatingToolbar.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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +283,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var delay = iOS ? 350 : 100;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( event.element.nodeName !== 'IMG' || isPlaceholder( event.element ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- tb.hide();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ floatingToolbar.hide();
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,18 +291,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var element = editor.selection.getNode();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( element.nodeName === 'IMG' && ! isPlaceholder( element ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( tb._visible ) {
- tb.reposition();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( floatingToolbar._visible ) {
+ floatingToolbar.reposition();
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- tb.show();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ floatingToolbar.show();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- tb.hide();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ floatingToolbar.hide();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }, delay );
</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">- tb.on( 'show', function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ floatingToolbar.on( 'show', function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> var self = this;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> toolbarIsHidden = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,14 +315,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }, 100 );
</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">- tb.on( 'hide', function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ floatingToolbar.on( 'hide', function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> toolbarIsHidden = true;
</span><span class="cx" style="display: block; padding: 0 10px"> DOM.removeClass( this.getEl(), 'mce-inline-toolbar-grp-active' );
</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"> function hide() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! toolbarIsHidden ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- tb.hide();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ floatingToolbar.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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,19 +333,19 @@
</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"> editor.on( 'init', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- DOM.bind( editor.getWin(), 'resize scroll', hide );
- } );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.dom.bind( editor.getWin(), 'scroll', hide );
+ });
+
</ins><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'blur hide', hide );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 119 = F8
</span><span class="cx" style="display: block; padding: 0 10px"> editor.shortcuts.add( 'Alt+119', '', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var node = tb.find( 'toolbar' )[0];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var node = floatingToolbar.find( 'toolbar' )[0];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( node ) {
</span><span class="cx" style="display: block; padding: 0 10px"> node.focus( true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function parseShortcode( content ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return content.replace( /(?:<p>)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g, function( a, b, c ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1110,8 +1121,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> editor.nodeChanged();
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( tb ) {
- tb.reposition();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( floatingToolbar ) {
+ floatingToolbar.reposition();
</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></pre>
</div>
</div>
</body>
</html>