Changeset 27770

Timestamp:

03/27/2014 02:34:25 AM (10 years ago)

Author:

azaozz

Message:

Remove containment of scrolling inside the editor for now. See #27013

Location:

trunk/src

Files:

• wp-admin/js/post.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wordpress/plugin.js (modified) (1 diff)

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

@@ -1069 +1069 @@
         });
     }
-
-    if ( ! ( 'ontouchstart' in window ) ) {
-        // 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, 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;
-            }
-
-            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 );
-
-            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

@@ -310 +310 @@
         if ( typeof window.jQuery !== 'undefined' ) {
             window.jQuery( document ).triggerHandler( 'tinymce-editor-init', [editor] );
-        }
-
-        if ( ! ( 'ontouchstart' in window ) ) {
-            // When scrolling with mouse wheel or trackpad inside the editor, don't scroll the parent window
-            dom.bind( doc, 'onwheel' in doc ? 'wheel' : 'mousewheel', function( event ) {
-                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;
-                }
-
-                if ( typeof event.deltaY !== 'undefined' ) {
-                    delta = event.deltaY;
-
-                    if ( typeof event.deltaMode !== 'undefined' && event.deltaMode === event.DOM_DELTA_LINE ) {
-                        delta *= 20;
-                    }
-                } else {
-                    delta = -event.wheelDelta;
-                }
-
-                if ( env.webkit ) {
-                    doc.body.scrollTop += delta;
-                } else {
-                    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();
-            });
         }