Changeset 30817

Timestamp:

12/11/2014 09:33:46 AM (10 years ago)

Author:

nacin

Message:

Editor focus: Don't trigger when typing while the mouse is outside the editor.

props avryl.
fixes #20668.

File:

• trunk/src/wp-admin/js/editor-expand.js (modified) (6 diffs)

trunk/src/wp-admin/js/editor-expand.js

@@ -804 +804 @@
         } );
 
+        function recalcEditorRect() {
+            editorRect = $editor.offset();
+            editorRect.right = editorRect.left + $editor.outerWidth();
+            editorRect.bottom = editorRect.top + $editor.outerHeight();
+        }
+
         function activate() {
             if ( ! _isActive ) {
@@ -910 +916 @@
                     // Always recalculate the editor area entering the overlay with the mouse.
                     .on( 'mouseenter.focus', function() {
-                        editorRect = $editor.offset();
-                        editorRect.right = editorRect.left + $editor.outerWidth();
-                        editorRect.bottom = editorRect.top + $editor.outerHeight();
+                        recalcEditorRect();
 
                         $window.on( 'scroll.focus', function() {
@@ -938 +942 @@
                     // Fade in when the mouse moves away form the editor area.
                     .on( 'mousemove.focus', function( event ) {
-                        var nx = event.pageX,
-                            ny = event.pageY;
+                        var nx = event.clientX,
+                            ny = event.clientY,
+                            pageYOffset = window.pageYOffset,
+                            pageXOffset = window.pageXOffset;
 
                         if ( x && y && ( nx !== x || ny !== y ) ) {
                             if (
-                                ( ny <= y && ny < editorRect.top ) ||
-                                ( ny >= y && ny > editorRect.bottom ) ||
-                                ( nx <= x && nx < editorRect.left ) ||
-                                ( nx >= x && nx > editorRect.right )
+                                ( ny <= y && ny < editorRect.top - pageYOffset ) ||
+                                ( ny >= y && ny > editorRect.bottom - pageYOffset ) ||
+                                ( nx <= x && nx < editorRect.left - pageXOffset ) ||
+                                ( nx >= x && nx > editorRect.right - pageXOffset )
                             ) {
                                 traveledX += Math.abs( x - nx );
@@ -952 +958 @@
 
                                 if ( (
-                                    ny <= editorRect.top - buffer ||
-                                    ny >= editorRect.bottom + buffer ||
-                                    nx <= editorRect.left - buffer ||
-                                    nx >= editorRect.right + buffer
+                                    ny <= editorRect.top - buffer - pageYOffset ||
+                                    ny >= editorRect.bottom + buffer - pageYOffset ||
+                                    nx <= editorRect.left - buffer - pageXOffset ||
+                                    nx >= editorRect.right + buffer - pageXOffset
                                 ) && (
                                     traveledX > 10 ||
@@ -1152 +1158 @@
                     editor.on( 'focus', focus );
                     editor.on( 'blur', blur );
+                    editor.on( 'wp-autoresize', recalcEditorRect );
                 };
 
@@ -1159 +1166 @@
                     editor.off( 'focus', focus );
                     editor.off( 'blur', blur );
+                    editor.off( 'wp-autoresize', recalcEditorRect );
                 };