Changeset 27110

Timestamp:

02/06/2014 07:33:13 PM (12 years ago)

Author:

azaozz

Message:

Fix scrolling inside the Visual editor on MacOS, add the same functionality to the Text editor, see #27013

Location:

trunk/src

Files:

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

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

@@ -375 +375 @@
                 last = 0,
                 co = $('#content'),
+                $document = $(document),
                 $editSlugWrap = $('#edit-slug-box'),
                 postId = $('#post_ID').val() || 0,
@@ -510 +511 @@
         }
 
-        $(document).on( 'autosave-disable-buttons.edit-post', function() {
+        $document.on( 'autosave-disable-buttons.edit-post', function() {
                 $submitButtons.addClass( 'disabled' );
         }).on( 'autosave-enable-buttons.edit-post', function() {
@@ -941 +942 @@
         // word count
         if ( typeof(wpWordCount) != 'undefined' ) {
-                $(document).triggerHandler('wpcountwords', [ co.val() ]);
+                $document.triggerHandler('wpcountwords', [ co.val() ]);
 
                 co.keyup( function(e) {
@@ -950 +951 @@
 
                         if ( 13 == k || 8 == last || 46 == last )
-                                $(document).triggerHandler('wpcountwords', [ co.val() ]);
+                                $document.triggerHandler('wpcountwords', [ co.val() ]);
 
                         last = k;
@@ -986 +987 @@
         ( function() {
                 var editor, offset, mce,
-                        $document = $( document ),
                         $textarea = $('textarea#content'),
                         $handle = $('#post-status-info');
@@ -1064 +1064 @@
                 });
         }
+
+        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();
+                });
+        }
 });

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

@@ -316 +316 @@
                 }
 
-                // 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;
-
-                        if ( editor.settings.wp_fullscreen || 'ontouchstart' in window ) {
-                                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;
-                        }
-
-                        // Reverse direction for MacOS
-                        if ( env.mac ) {
-                                delta *= -1;
-                        }
-
-                        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;
-                        }
-                });
+                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;
+
+                                if ( editor.settings.wp_fullscreen ) {
+                                        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;
+                                }
+
+                                event.preventDefault();
+
+                                if ( env.webkit ) {
+                                        doc.body.scrollTop += delta;
+                                } else {
+                                        docElement.scrollTop += delta;
+                                }
+                        });
+                }
         });