Changeset 27368

Timestamp:

03/03/2014 02:33:22 AM (11 years ago)

Author:

azaozz

Message:

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

Location:

trunk/src

Files:

• wp-admin/js/post.js (modified) (3 diffs)
• wp-includes/js/tinymce/plugins/wordpress/plugin.js (modified) (4 diffs)
• wp-includes/version.php (modified) (2 diffs)

trunk/src/wp-admin/js/post.js

@@ -371 +371 @@
 
 jQuery(document).ready( function($) {
-    var stamp, visibility, $submitButtons, updateVisibility, updateText, $content,
+    var stamp, visibility, $submitButtons, updateVisibility, updateText, $content, topx, reset,
+        deltax = 0,
         sticky = '',
         last = 0,
@@ -1068 +1069 @@
         // When scrolling with mouse wheel or trackpad inside the Text editor, don't scroll the whole window
         $content = $('#content').on( 'onwheel' in $document[0] ? 'wheel.text-editor-scroll' : 'mousewheel.text-editor-scroll', function( event ) {
-            var delta, origEvent = event.originalEvent;
+            var delta, top,
+                origEvent = event.originalEvent;
 
             if ( wp.editor && wp.editor.fullscreen.settings.visible ) {
+                return;
+            }
+
+            // Don't modify scrolling when the Text editor is not active.
+            if ( document.activeElement && document.activeElement.id !== 'content' ) {
                 return;
             }
@@ -1085 +1092 @@
 
             $content.scrollTop( $content.scrollTop() + delta );
+
+            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;
+            }
+
             event.preventDefault();
         });

trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -277 +277 @@
 
     editor.on( 'init', function() {
-        var env = tinymce.Env,
+        var env = tinymce.Env, topx, reset,
+            deltax = 0,
             bodyClass = ['mceContentBody'], // back-compat for themes that use this in editor-style.css...
             doc = editor.getDoc();
@@ -319 +320 @@
             // 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;
+                var delta, top,
+                    docElement = doc.documentElement;
 
                 if ( editor.settings.wp_fullscreen ) {
+                    return;
+                }
+                // Don't modify scrolling when the editor is not active.
+                if ( typeof doc.hasFocus === 'function' && ! doc.hasFocus() ) {
                     return;
                 }
@@ -335 +341 @@
                 }
 
-                event.preventDefault();
-
                 if ( env.webkit ) {
                     doc.body.scrollTop += delta;
@@ -342 +346 @@
                     docElement.scrollTop += delta;
                 }
+
+                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();
             });
         }

trunk/src/wp-includes/version.php

@@ -5 +5 @@
  * @global string $wp_version
  */
-$wp_version = '3.9-alpha-27234-src';
+$wp_version = '3.9-alpha-27368-src';
 
 /**
@@ -19 +19 @@
  * @global string $tinymce_version
  */
-$tinymce_version = '4016-20140211';
+$tinymce_version = '4016-20140302';
 
 /**