Changeset 31143

Timestamp:

01/11/2015 08:41:36 PM (12 years ago)

Author:

azaozz

Message:

TinyMCE wpView: when clicking in the editor optimize the caret placement before or after a view. Props avryl, fixes #30938.

File:

• trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js (modified) (3 diffs)

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

@@ -163 +163 @@
                         editorToolbar = tinymce.$( editor.editorContainer ).find( '.mce-toolbar-grp' )[0],
                         editorToolbarBottom = ( editorToolbar && editorToolbar.getBoundingClientRect().bottom ) || 0;
-                
+
                 if ( toolbar.length && editor.iframeElement ) {
                         // 48 = 43 for the toolbar + 5 buffer
@@ -265 +265 @@
                         setViewCursor( false, view );
                         event.preventDefault();
-                } else {
+                } else if ( x < bodyRect.left || x > bodyRect.right ) {
                         tinymce.each( editor.dom.select( '.wpview-wrap' ), function( view ) {
                                 var rect = view.getBoundingClientRect();
+
+                                if ( y < rect.top ) {
+                                        return false;
+                                }
 
                                 if ( y >= rect.top && y <= rect.bottom ) {
@@ -277 +281 @@
                                                 event.preventDefault();
                                         }
-                                        return;
+
+                                        return false;
                                 }
                         });