<!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>[32816] trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js: TinyMCE: improve reposition method inline toolbars</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/32816">32816</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/32816","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iseulde</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-06-17 04:41:59 +0000 (Wed, 17 Jun 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: improve reposition method inline toolbars
* Make sure the toolbar does not overlap the target, unless it is higher than half the visible editor area's height.
* Allow the toolbar to have the preference to position itself above or below the target.
* Cache DOM lookups.
* Simplify the logic and fix various positioning issues.
See <a href="https://core.trac.wordpress.org/ticket/32604">#32604</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/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-06-17 04:14:06 UTC (rev 32815)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2015-06-17 04:41:59 UTC (rev 32816)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,9 +447,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var Factory = tinymce.ui.Factory,
</span><span class="cx" style="display: block; padding: 0 10px"> settings = editor.settings,
</span><span class="cx" style="display: block; padding: 0 10px"> currentToolbar,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- currentSelection;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ currentSelection,
+ wpAdminbar = document.getElementById( 'wpadminbar' ),
+ mceIframe, mceToolbar, mceStatusbar, wpStatusbar;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function create( buttons ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.on( 'init', function() {
+ mceIframe = document.getElementById( editor.id + '_ifr' );
+ mceToolbar = tinymce.$( '.mce-toolbar-grp', editor.getContainer() )[0];
+ mceStatusbar = tinymce.$( '.mce-statusbar', editor.getContainer() )[0];
+
+ if ( editor.id === 'content' ) {
+ wpStatusbar = document.getElementById( 'post-status-info' );
+ }
+ } );
+
+ function create( buttons, bottom ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> var toolbar,
</span><span class="cx" style="display: block; padding: 0 10px"> toolbarItems = [],
</span><span class="cx" style="display: block; padding: 0 10px"> buttonGroup;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -573,107 +585,83 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ toolbar.bottom = bottom;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function hide() {
</span><span class="cx" style="display: block; padding: 0 10px"> toolbar.hide();
</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 reposition() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var top, left, minTop, className,
- windowPos, adminbar, mceToolbar, boundary,
- boundaryMiddle, boundaryVerticalMiddle, spaceTop,
- spaceBottom, windowWidth, toolbarWidth, toolbarHalf,
- iframe, iframePos, iframeWidth, iframeHeigth,
- toolbarNodeHeight, verticalSpaceNeeded,
- toolbarNode = this.getEl(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var scrollX = window.pageXOffset || document.documentElement.scrollLeft,
+ scrollY = window.pageYOffset || document.documentElement.scrollTop,
+ windowWidth = window.innerWidth,
+ windowHeight = window.innerHeight,
+ iframeRect = mceIframe.getBoundingClientRect(),
+ toolbar = this.getEl(),
+ toolbarWidth = toolbar.offsetWidth,
+ toolbarHeight = toolbar.offsetHeight,
+ selection = currentSelection.getBoundingClientRect(),
+ selectionMiddle = ( selection.left + selection.right ) / 2,
</ins><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">- adminbarHeight = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ spaceNeeded = toolbarHeight + margin + buffer,
+ wpAdminbarBottom = wpAdminbar ? wpAdminbar.getBoundingClientRect().bottom : 0,
+ mceToolbarBottom = mceToolbar ? mceToolbar.getBoundingClientRect().bottom : 0,
+ mceStatusbarTop = mceStatusbar ? windowHeight - mceStatusbar.getBoundingClientRect().top : 0,
+ wpStatusbarTop = wpStatusbar ? windowHeight - wpStatusbar.getBoundingClientRect().top : 0,
+ blockedTop = Math.max( 0, wpAdminbarBottom, mceToolbarBottom, iframeRect.top ),
+ blockedBottom = Math.max( 0, mceStatusbarTop, wpStatusbarTop, windowHeight - iframeRect.bottom ),
+ spaceTop = selection.top + iframeRect.top - blockedTop,
+ spaceBottom = windowHeight - iframeRect.top - selection.bottom - blockedBottom,
+ editorHeight = windowHeight - blockedTop - blockedBottom,
+ className = '',
+ top, left;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! currentSelection ) {
- return;
- }
-
- windowPos = window.pageYOffset || document.documentElement.scrollTop;
- adminbar = tinymce.$( '#wpadminbar' )[0];
- mceToolbar = tinymce.$( '.mce-toolbar-grp', editor.getContainer() )[0];
- boundary = currentSelection.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 = document.getElementById( editor.id + '_ifr' );
- iframePos = DOM.getPos( iframe );
- iframeWidth = iframe.offsetWidth;
- iframeHeigth = iframe.offsetHeight;
- toolbarNodeHeight = toolbarNode.offsetHeight;
- verticalSpaceNeeded = toolbarNodeHeight + margin + buffer;
-
- if ( spaceTop >= verticalSpaceNeeded ) {
- className = ' mce-arrow-down';
- top = boundary.top + iframePos.y - toolbarNodeHeight - margin;
- } else if ( spaceBottom >= verticalSpaceNeeded ) {
- className = ' mce-arrow-up';
- top = boundary.bottom + iframePos.y;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( this.bottom ) {
+ if ( spaceBottom >= spaceNeeded ) {
+ className = ' mce-arrow-up';
+ top = selection.bottom + iframeRect.top + scrollY;
+ } else if ( spaceTop >= spaceNeeded ) {
+ className = ' mce-arrow-down';
+ top = selection.top + iframeRect.top + scrollY - toolbarHeight - margin;
+ }
</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">- top = buffer;
-
- if ( boundaryVerticalMiddle >= verticalSpaceNeeded ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( spaceTop >= spaceNeeded ) {
</ins><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">- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ top = selection.top + iframeRect.top + scrollY - toolbarHeight - margin;
+ } else if ( spaceBottom >= spaceNeeded && editorHeight / 2 > selection.bottom + iframeRect.top - blockedTop ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> className = ' mce-arrow-up';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ top = selection.bottom + iframeRect.top + scrollY;
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make sure the image toolbar is below the main toolbar.
- if ( mceToolbar ) {
- minTop = DOM.getPos( mceToolbar ).y + mceToolbar.clientHeight;
- } else {
- minTop = iframePos.y;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( typeof top === 'undefined' ) {
+ top = scrollY + blockedTop + buffer;
</ins><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">- // Make sure the image toolbar is below the adminbar (if visible) or below the top of the window.
- if ( windowPos ) {
- if ( adminbar && adminbar.getBoundingClientRect().top === 0 ) {
- adminbarHeight = adminbar.clientHeight;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ left = selectionMiddle - toolbarWidth / 2 + iframeRect.left + scrollX;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( windowPos + adminbarHeight > minTop ) {
- minTop = windowPos + adminbarHeight;
- }
- }
-
- if ( top && minTop && ( minTop + buffer > top ) ) {
- top = minTop + buffer;
- className = '';
- }
-
- left = boundaryMiddle - toolbarHalf;
- left += iframePos.x;
-
- if ( boundary.left < 0 || boundary.right > iframeWidth ) {
- left = iframePos.x + ( iframeWidth - toolbarWidth ) / 2;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( selection.left < 0 || selection.right > iframeRect.width ) {
+ left = iframeRect.left + scrollX + ( iframeRect.width - toolbarWidth ) / 2;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( toolbarWidth >= windowWidth ) {
</span><span class="cx" style="display: block; padding: 0 10px"> className += ' mce-arrow-full';
</span><span class="cx" style="display: block; padding: 0 10px"> left = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ( left < 0 && boundary.left + toolbarWidth > windowWidth ) ||
- ( left + toolbarWidth > windowWidth && boundary.right - toolbarWidth < 0 ) ) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( ( left < 0 && selection.left + toolbarWidth > windowWidth ) || ( left + toolbarWidth > windowWidth && selection.right - toolbarWidth < 0 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> left = ( windowWidth - toolbarWidth ) / 2;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( left < iframePos.x ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( left < iframeRect.left + scrollX ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> className += ' mce-arrow-left';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- left = boundary.left + iframePos.x;
- } else if ( left + toolbarWidth > iframeWidth + iframePos.x ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ left = selection.left + iframeRect.left + scrollX;
+ } else if ( left + toolbarWidth > iframeRect.width + iframeRect.left + scrollX ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> className += ' mce-arrow-right';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- left = boundary.right - toolbarWidth + iframePos.x;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ left = selection.right - toolbarWidth + iframeRect.left + scrollX;
</ins><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">- toolbarNode.className = toolbarNode.className.replace( / ?mce-arrow-[\w]+/g, '' );
- toolbarNode.className += className;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ toolbar.className = toolbar.className.replace( / ?mce-arrow-[\w]+/g, '' ) + className;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- DOM.setStyles( toolbarNode, { 'left': left, 'top': top } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ DOM.setStyles( toolbar, {
+ 'left': left,
+ 'top': top
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return this;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>