<!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>[27110] trunk/src: Fix scrolling inside the Visual editor on MacOS, add the same functionality to the Text editor, 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/27110">27110</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-02-06 19:33:13 +0000 (Thu, 06 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix scrolling inside the Visual editor on MacOS, add the same functionality to the Text editor, 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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjspostjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/post.js (27109 => 27110)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/post.js 2014-02-06 17:56:30 UTC (rev 27109)
+++ trunk/src/wp-admin/js/post.js 2014-02-06 19:33:13 UTC (rev 27110)
</span><span class="lines">@@ -374,6 +374,7 @@
</span><span class="cx"> sticky = '',
</span><span class="cx"> last = 0,
</span><span class="cx"> co = $('#content'),
</span><ins>+ $document = $(document),
</ins><span class="cx"> $editSlugWrap = $('#edit-slug-box'),
</span><span class="cx"> postId = $('#post_ID').val() || 0,
</span><span class="cx"> $submitpost = $('#submitpost'),
</span><span class="lines">@@ -509,7 +510,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $(document).on( 'autosave-disable-buttons.edit-post', function() {
</del><ins>+ $document.on( 'autosave-disable-buttons.edit-post', function() {
</ins><span class="cx"> $submitButtons.addClass( 'disabled' );
</span><span class="cx"> }).on( 'autosave-enable-buttons.edit-post', function() {
</span><span class="cx"> if ( ! wp.heartbeat || ! wp.heartbeat.hasConnectionError() ) {
</span><span class="lines">@@ -940,7 +941,7 @@
</span><span class="cx">
</span><span class="cx"> // word count
</span><span class="cx"> if ( typeof(wpWordCount) != 'undefined' ) {
</span><del>- $(document).triggerHandler('wpcountwords', [ co.val() ]);
</del><ins>+ $document.triggerHandler('wpcountwords', [ co.val() ]);
</ins><span class="cx">
</span><span class="cx"> co.keyup( function(e) {
</span><span class="cx"> var k = e.keyCode || e.charCode;
</span><span class="lines">@@ -949,7 +950,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if ( 13 == k || 8 == last || 46 == last )
</span><del>- $(document).triggerHandler('wpcountwords', [ co.val() ]);
</del><ins>+ $document.triggerHandler('wpcountwords', [ co.val() ]);
</ins><span class="cx">
</span><span class="cx"> last = k;
</span><span class="cx"> return true;
</span><span class="lines">@@ -985,7 +986,6 @@
</span><span class="cx"> // Resize the visual and text editors
</span><span class="cx"> ( function() {
</span><span class="cx"> var editor, offset, mce,
</span><del>- $document = $( document ),
</del><span class="cx"> $textarea = $('textarea#content'),
</span><span class="cx"> $handle = $('#post-status-info');
</span><span class="cx">
</span><span class="lines">@@ -1063,4 +1063,28 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> }
</span><ins>+
+ if ( ! ( 'ontouchstart' in window ) ) {
+ // When scrolling with mouse wheel or trackpad inside the Text editor, don't scroll the whole window
+ var $content = $('#content').on( 'onwheel' in $document[0] ? 'wheel.text-editor-scroll' : 'mousewheel.text-editor-scroll', function( event ) {
+ var delta, origEvent = event.originalEvent;
+
+ if ( wp.editor && wp.editor.fullscreen.settings.visible ) {
+ return;
+ }
+
+ if ( typeof origEvent.deltaY !== 'undefined' ) {
+ delta = origEvent.deltaY;
+
+ if ( typeof origEvent.deltaMode !== 'undefined' && origEvent.deltaMode === origEvent.DOM_DELTA_LINE ) {
+ delta *= 20;
+ }
+ } else {
+ delta = -origEvent.wheelDelta;
+ }
+
+ $content.scrollTop( $content.scrollTop() + delta );
+ event.preventDefault();
+ });
+ }
</ins><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 (27109 => 27110)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-02-06 17:56:30 UTC (rev 27109)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-02-06 19:33:13 UTC (rev 27110)
</span><span class="lines">@@ -315,43 +315,34 @@
</span><span class="cx"> window.jQuery( document ).triggerHandler( 'tinymce-editor-init', [editor] );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // When scrolling with mouse wheel or trackpad inside the editor, don't scroll the parent window
- editor.dom.bind( doc, 'onwheel' in doc ? 'wheel' : 'mousewheel', function( event ) {
- var delta, docElement = doc.documentElement;
</del><ins>+ if ( ! ( 'ontouchstart' in window ) ) {
+ // When scrolling with mouse wheel or trackpad inside the editor, don't scroll the parent window
+ editor.dom.bind( doc, 'onwheel' in doc ? 'wheel' : 'mousewheel', function( event ) {
+ var delta, docElement = doc.documentElement;
</ins><span class="cx">
</span><del>- if ( editor.settings.wp_fullscreen || 'ontouchstart' in window ) {
- return;
- }
</del><ins>+ if ( editor.settings.wp_fullscreen ) {
+ return;
+ }
</ins><span class="cx">
</span><del>- if ( typeof event.deltaY !== 'undefined' ) {
- delta = event.deltaY;
</del><ins>+ if ( typeof event.deltaY !== 'undefined' ) {
+ delta = event.deltaY;
</ins><span class="cx">
</span><del>- if ( typeof event.deltaMode !== 'undefined' && event.deltaMode === event.DOM_DELTA_LINE ) {
- delta *= 20;
</del><ins>+ if ( typeof event.deltaMode !== 'undefined' && event.deltaMode === event.DOM_DELTA_LINE ) {
+ delta *= 20;
+ }
+ } else {
+ delta = -event.wheelDelta;
</ins><span class="cx"> }
</span><del>- } else {
- delta = -event.wheelDelta;
- }
</del><span class="cx">
</span><del>- // Reverse direction for MacOS
- if ( env.mac ) {
- delta *= -1;
- }
</del><ins>+ event.preventDefault();
</ins><span class="cx">
</span><del>- event.preventDefault();
-
- if ( ( docElement.scrollTop === 0 && delta < 0 ) ||
- ( docElement.clientHeight + docElement.scrollTop === docElement.scrollHeight && delta > 0 ) ) {
-
- return;
- }
-
- if ( env.webkit ) {
- doc.body.scrollTop += delta;
- } else {
- docElement.scrollTop += delta;
- }
- });
</del><ins>+ if ( env.webkit ) {
+ doc.body.scrollTop += delta;
+ } else {
+ docElement.scrollTop += delta;
+ }
+ });
+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Word count
</span></span></pre>
</div>
</div>
</body>
</html>