Changeset 29302

Timestamp:

07/26/2014 12:07:55 AM (12 years ago)

Author:

azaozz

Message:

TinyMCE:

• Fix complex character input in Japanese, Chinese, etc. Was broken in getCursorOffset() in editor-expand.js.
• Disable auto-scrolling in some edge cases when editor expanding is enabled.

See #28328.

Location:

trunk/src

Files:

• wp-admin/js/editor-expand.js (modified) (4 diffs)
• wp-includes/js/tinymce/plugins/wpview/plugin.js (modified) (1 diff)

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

@@ -125 +125 @@
                 $statusBar = $contentWrap.find( '.mce-statusbar' ).filter( ':visible' );
 
-                // Adjust when switching editor modes.
-                editor.on( 'show', function() {
-                        setTimeout( function() {
-                                editor.execCommand( 'wpAutoResize' );
-                                adjust();
-                        }, 300 );
-                } );
+                function getCursorOffset() {
+                        var node = editor.selection.getNode(),
+                                view, offset;
+
+                        if ( editor.plugins.wpview && ( view = editor.plugins.wpview.getView( node ) ) ) {
+                                offset = view.getBoundingClientRect();
+                        } else {
+                                offset = node.getBoundingClientRect();
+                        }
+
+                        return offset.height ? offset : false;
+                }
 
                 // Make sure the cursor is always visible.
@@ -151 +156 @@
                         }
 
-                        cursorTop = offset.top + editor.getContentAreaContainer().getElementsByTagName( 'iframe' )[0].getBoundingClientRect().top;
+                        cursorTop = offset.top + editor.getContentAreaContainer().firstChild.getBoundingClientRect().top;
                         cursorBottom = cursorTop + offset.height;
                         cursorTop = cursorTop - buffer;
@@ -158 +163 @@
                         editorBottom = windowHeight - $bottom.outerHeight();
 
+                        // Don't scroll if the node is taller than the visible part of the editor
+                        if ( editorBottom - editorTop < offset.height ) {
+                                return;
+                        }
+
                         if ( cursorTop < editorTop && ( key === VK.UP || key === VK.LEFT || key === VK.BACKSPACE ) ) {
                                 window.scrollTo( window.pageXOffset, cursorTop + window.pageYOffset - editorTop );
@@ -165 +175 @@
                 } );
 
-                function getCursorOffset() {
-                        var selection = editor.selection,
-                                node = selection.getNode(),
-                                range = selection.getRng(),
-                                view, clone, offset;
-
-                        if ( tinymce.Env.ie && tinymce.Env.ie < 9 ) {
-                                return;
-                        }
-
-                        if ( editor.plugins.wpview && ( view = editor.plugins.wpview.getView( node ) ) ) {
-                                offset = view.getBoundingClientRect();
-                        } else if ( selection.isCollapsed() ) {
-                                clone = range.cloneRange();
-
-                                if ( clone.startContainer.length > 1 ) {
-                                        if ( clone.startContainer.length > clone.endOffset ) {
-                                                clone.setEnd( clone.startContainer, clone.endOffset + 1 );
-                                        } else {
-                                                clone.setStart( clone.startContainer, clone.endOffset - 1 );
-                                        }
-
-                                        selection.setRng( clone );
-                                        offset = selection.getRng().getBoundingClientRect();
-                                        selection.setRng( range );
-                                } else {
-                                        offset = node.getBoundingClientRect();
-                                }
-                        } else {
-                                offset = range.getBoundingClientRect();
-                        }
-
-                        if ( ! offset.height ) {
-                                return;
-                        }
-
-                        return offset;
-                }
+                // Adjust when switching editor modes.
+                editor.on( 'show', function() {
+                        setTimeout( function() {
+                                editor.execCommand( 'wpAutoResize' );
+                                adjust();
+                        }, 300 );
+                } );
 
                 editor.on( 'hide', function() {

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

@@ -287 +287 @@
 
                 editor.dom.bind( editor.getBody().parentNode, 'mousedown mouseup click', function( event ) {
-                        var view = getView( event.target ),
-                                deselectEventType;
+                        var view = getView( event.target );
 
                         firstFocus = false;