<!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>[27368] trunk/src: Editor: throttle scrolling of the main window when the editor is active and is being scrolled with the mouse wheel or a trackpad, see #27013</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27368">27368</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-03-03 02:33:22 +0000 (Mon, 03 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Editor: throttle scrolling of the main window when the editor is active and is being scrolled with the mouse wheel or a trackpad, see <a href="http://core.trac.wordpress.org/ticket/27013">#27013</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjspostjs">trunk/src/wp-admin/js/post.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</a></li>
<li><a href="#trunksrcwpincludesversionphp">trunk/src/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjspostjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/post.js (27367 => 27368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/post.js 2014-03-03 02:13:07 UTC (rev 27367)
+++ trunk/src/wp-admin/js/post.js 2014-03-03 02:33:22 UTC (rev 27368)
</span><span class="lines">@@ -370,7 +370,8 @@
</span><span class="cx"> }(jQuery));
</span><span class="cx">
</span><span class="cx"> jQuery(document).ready( function($) {
</span><del>- var stamp, visibility, $submitButtons, updateVisibility, updateText, $content,
</del><ins>+ var stamp, visibility, $submitButtons, updateVisibility, updateText, $content, topx, reset,
+ deltax = 0,
</ins><span class="cx"> sticky = '',
</span><span class="cx"> last = 0,
</span><span class="cx"> co = $('#content'),
</span><span class="lines">@@ -1067,12 +1068,18 @@
</span><span class="cx"> if ( ! ( 'ontouchstart' in window ) ) {
</span><span class="cx"> // When scrolling with mouse wheel or trackpad inside the Text editor, don't scroll the whole window
</span><span class="cx"> $content = $('#content').on( 'onwheel' in $document[0] ? 'wheel.text-editor-scroll' : 'mousewheel.text-editor-scroll', function( event ) {
</span><del>- var delta, origEvent = event.originalEvent;
</del><ins>+ var delta, top,
+ origEvent = event.originalEvent;
</ins><span class="cx">
</span><span class="cx"> if ( wp.editor && wp.editor.fullscreen.settings.visible ) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Don't modify scrolling when the Text editor is not active.
+ if ( document.activeElement && document.activeElement.id !== 'content' ) {
+ return;
+ }
+
</ins><span class="cx"> if ( typeof origEvent.deltaY !== 'undefined' ) {
</span><span class="cx"> delta = origEvent.deltaY;
</span><span class="cx">
</span><span class="lines">@@ -1084,6 +1091,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $content.scrollTop( $content.scrollTop() + delta );
</span><ins>+
+ top = $content.scrollTop();
+
+ if ( topx === top ) {
+ deltax += delta;
+
+ window.clearTimeout( reset );
+ reset = window.setTimeout( function() {
+ deltax = 0;
+ }, 1000 );
+ } else {
+ deltax = 0;
+ }
+
+ topx = top;
+
+ // Sensitivity: scroll the parent window when over-scrolling by more than 800px
+ if ( deltax > 1000 || deltax < -1000 ) {
+ return;
+ }
+
</ins><span class="cx"> event.preventDefault();
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswordpresspluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (27367 => 27368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-03-03 02:13:07 UTC (rev 27367)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-03-03 02:33:22 UTC (rev 27368)
</span><span class="lines">@@ -276,7 +276,8 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> editor.on( 'init', function() {
</span><del>- var env = tinymce.Env,
</del><ins>+ var env = tinymce.Env, topx, reset,
+ deltax = 0,
</ins><span class="cx"> bodyClass = ['mceContentBody'], // back-compat for themes that use this in editor-style.css...
</span><span class="cx"> doc = editor.getDoc();
</span><span class="cx">
</span><span class="lines">@@ -318,11 +319,16 @@
</span><span class="cx"> if ( ! ( 'ontouchstart' in window ) ) {
</span><span class="cx"> // When scrolling with mouse wheel or trackpad inside the editor, don't scroll the parent window
</span><span class="cx"> editor.dom.bind( doc, 'onwheel' in doc ? 'wheel' : 'mousewheel', function( event ) {
</span><del>- var delta, docElement = doc.documentElement;
</del><ins>+ var delta, top,
+ docElement = doc.documentElement;
</ins><span class="cx">
</span><span class="cx"> if ( editor.settings.wp_fullscreen ) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+ // Don't modify scrolling when the editor is not active.
+ if ( typeof doc.hasFocus === 'function' && ! doc.hasFocus() ) {
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> if ( typeof event.deltaY !== 'undefined' ) {
</span><span class="cx"> delta = event.deltaY;
</span><span class="lines">@@ -334,13 +340,34 @@
</span><span class="cx"> delta = -event.wheelDelta;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- event.preventDefault();
-
</del><span class="cx"> if ( env.webkit ) {
</span><span class="cx"> doc.body.scrollTop += delta;
</span><span class="cx"> } else {
</span><span class="cx"> docElement.scrollTop += delta;
</span><span class="cx"> }
</span><ins>+
+ top = docElement.scrollTop || doc.body.scrollTop;
+
+ if ( topx === top ) {
+ deltax += delta;
+
+ window.clearTimeout( reset );
+ // Sensitivity: delay before resetting the count of over-scroll pixels
+ reset = window.setTimeout( function() {
+ deltax = 0;
+ }, 1000 );
+ } else {
+ deltax = 0;
+ }
+
+ topx = top;
+
+ // Sensitivity: scroll the parent window when over-scrolling by more than 1000px
+ if ( deltax > 1000 || deltax < -1000 ) {
+ return;
+ }
+
+ event.preventDefault();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunksrcwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/version.php (27367 => 27368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/version.php 2014-03-03 02:13:07 UTC (rev 27367)
+++ trunk/src/wp-includes/version.php 2014-03-03 02:33:22 UTC (rev 27368)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global string $wp_version
</span><span class="cx"> */
</span><del>-$wp_version = '3.9-alpha-27234-src';
</del><ins>+$wp_version = '3.9-alpha-27368-src';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global string $tinymce_version
</span><span class="cx"> */
</span><del>-$tinymce_version = '4016-20140211';
</del><ins>+$tinymce_version = '4016-20140302';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the required PHP version
</span></span></pre>
</div>
</div>
</body>
</html>