<!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>[21963] trunk/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js: DFW: add scroll locking to prevent scrolling to top in WebKit on paste, add auto-resize throttling to 0.5 sec, only compare scrollHeight values (works well in all supported browsers), fixes #21979</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, #logmsg > ol { margin-left: 0; 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/21963">21963</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2012-09-24 03:08:31 +0000 (Mon, 24 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>DFW: add scroll locking to prevent scrolling to top in WebKit on paste, add auto-resize throttling to 0.5 sec, only compare scrollHeight values (works well in all supported browsers), fixes <a href="http://core.trac.wordpress.org/ticket/21979">#21979</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcepluginswpfullscreeneditor_plugin_srcjs">trunk/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjstinymcepluginswpfullscreeneditor_plugin_srcjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js (21962 => 21963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js 2012-09-24 02:18:15 UTC (rev 21962)
+++ trunk/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js 2012-09-24 03:08:31 UTC (rev 21963)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx">
</span><span class="cx"> (function() {
</span><span class="cx"> tinymce.create('tinymce.plugins.wpFullscreenPlugin', {
</span><ins>+ resize_timeout: false,
</ins><span class="cx">
</span><span class="cx"> init : function(ed, url) {
</span><span class="cx"> var t = this, oldHeight = 0, s = {}, DOM = tinymce.DOM;
</span><span class="lines">@@ -119,24 +120,31 @@
</span><span class="cx"> /**
</span><span class="cx"> * This method gets executed each time the editor needs to resize.
</span><span class="cx"> */
</span><del>- function resize() {
- var d = ed.getDoc(), DOM = tinymce.DOM, resizeHeight, myHeight;
</del><ins>+ function resize(editor, e) {
+ var DOM = tinymce.DOM, body = ed.getBody(), ifr = DOM.get(ed.id + '_ifr'), height, y = ed.dom.win.scrollY;
</ins><span class="cx">
</span><del>- // Get height differently depending on the browser used
- if ( tinymce.isWebKit )
- myHeight = d.body.offsetHeight;
- else
- myHeight = d.body.scrollHeight;
</del><ins>+ if ( t.resize_timeout )
+ return;
</ins><span class="cx">
</span><del>- // Don't make it smaller than 300px
- resizeHeight = (myHeight > 300) ? myHeight : 300;
</del><ins>+ // sometimes several events are fired few ms apart, trottle down resizing a little
+ t.resize_timeout = true;
+ setTimeout(function(){
+ t.resize_timeout = false;
+ }, 500);
</ins><span class="cx">
</span><del>- // Resize content element
- if ( oldHeight != resizeHeight ) {
- DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
- oldHeight = resizeHeight;
- ed.getWin().scrollTo(0,0);
</del><ins>+ height = body.scrollHeight > 300 ? body.scrollHeight : 300;
+
+ if ( height != ifr.scrollHeight ) {
+ DOM.setStyle(ifr, 'height', height + 'px');
+ ed.getWin().scrollTo(0, 0); // iframe window object, make sure there's no scrolling
</ins><span class="cx"> }
</span><ins>+
+ // WebKit scrolls to top on paste...
+ if ( e && e.type == 'paste' && tinymce.isWebKit ) {
+ setTimeout(function(){
+ ed.dom.win.scrollTo(0, y);
+ }, 40);
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Add appropriate listeners for resizing content area
</span><span class="lines">@@ -150,7 +158,7 @@
</span><span class="cx"> ed.getBody().style.overflowY = "hidden";
</span><span class="cx"> });
</span><span class="cx">
</span><del>- if (ed.getParam('autoresize_on_init', true)) {
</del><ins>+ if ( ed.getParam('autoresize_on_init', true) ) {
</ins><span class="cx"> ed.onLoadContent.add(function(ed, l) {
</span><span class="cx"> // Because the content area resizes when its content CSS loads,
</span><span class="cx"> // and we can't easily add a listener to its onload event,
</span></span></pre>
</div>
</div>
</body>
</html>