<!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>[32831] trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js: TinyMCE: show inline toolbar after scroll/resize</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/32831">32831</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/32831","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-18 11:09:56 +0000 (Thu, 18 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: show inline toolbar after scroll/resize
Also:
* Reduce the amount of callbacks.
* Move everything under `preinit` (but prepend to the callback). The API shouldn't be availbale earlier, and some UI is not available yet, neither is `editor.dom`.
* Hide the toolbar if the target is out of view.
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-18 11:06:09 UTC (rev 32830)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2015-06-18 11:09:56 UTC (rev 32831)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -443,23 +443,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Experimental: create a floating toolbar.
</span><span class="cx" style="display: block; padding: 0 10px"> * This functionality will change in the next releases. Not recommended for use by plugins.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.on( 'preinit', function() {
</ins><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"> activeToolbar,
</span><span class="cx" style="display: block; padding: 0 10px"> currentSelection,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ timeout,
</ins><span class="cx" style="display: block; padding: 0 10px"> wpAdminbar = document.getElementById( 'wpadminbar' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- mceIframe, mceToolbar, mceStatusbar, wpStatusbar;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mceIframe = document.getElementById( editor.id + '_ifr' ),
+ mceToolbar = tinymce.$( '.mce-toolbar-grp', editor.getContainer() )[0],
+ mceStatusbar = tinymce.$( '.mce-statusbar', editor.getContainer() )[0],
+ 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">- 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];
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( editor.id === 'content' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wpStatusbar = document.getElementById( 'post-status-info' );
</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><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function create( buttons, bottom ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var toolbar,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,10 +585,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> toolbar.bottom = bottom;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function hide() {
- toolbar.hide();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> function reposition() {
</span><span class="cx" style="display: block; padding: 0 10px"> var scrollX = window.pageXOffset || document.documentElement.scrollLeft,
</span><span class="cx" style="display: block; padding: 0 10px"> scrollY = window.pageYOffset || document.documentElement.scrollTop,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -617,6 +611,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> className = '',
</span><span class="cx" style="display: block; padding: 0 10px"> top, left;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( spaceTop >= editorHeight || spaceBottom >= editorHeight ) {
+ return this.hide();
+ }
+
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -677,18 +675,6 @@
</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">- toolbar.on( 'remove', function() {
- DOM.unbind( window, 'resize scroll', hide );
- editor.dom.unbind( editor.getWin(), 'resize scroll', hide );
- editor.off( 'blur hide', hide );
- } );
-
- editor.once( 'init', function() {
- DOM.bind( window, 'resize scroll', hide );
- editor.dom.bind( editor.getWin(), 'resize scroll', hide );
- editor.on( 'blur hide', hide );
- } );
-
</del><span class="cx" style="display: block; padding: 0 10px"> toolbar.reposition = reposition;
</span><span class="cx" style="display: block; padding: 0 10px"> toolbar.hide().renderTo( document.body );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -735,13 +721,29 @@
</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">- editor.on( 'hide', function() {
- activeToolbar = false;
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function hide( event ) {
+ if ( activeToolbar ) {
+ activeToolbar.hide();
</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 ( event.type === 'hide' ) {
+ activeToolbar = false;
+ } else if ( event.type === 'resize' || event.type === 'scroll' ) {
+ clearTimeout( timeout );
+
+ timeout = setTimeout( function() {
+ activeToolbar.show();
+ }, 250 );
+ }
+ }
+ }
+
+ DOM.bind( window, 'resize scroll', hide );
+ editor.dom.bind( editor.getWin(), 'resize scroll', hide );
+ editor.on( 'blur hide', hide );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> editor.wp = editor.wp || {};
</span><span class="cx" style="display: block; padding: 0 10px"> editor.wp._createToolbar = create;
</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">+ }, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function noop() {}
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>