Changeset 29127

Timestamp:

07/13/2014 12:33:58 AM (11 years ago)

Author:

azaozz

Message:

TinyMCE wpView: better handling of the Enter key, props avryl, see #28595

File:

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

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

@@ -75 +75 @@
     }
 
-    function handleEnter( view, before ) {
+    function handleEnter( view, before, keyCode ) {
         var dom = editor.dom,
-            padNode;
-
-        if ( ! before && view.nextSibling && dom.isEmpty( view.nextSibling ) && view.nextSibling.nodeName === 'P' ) {
-            padNode = view.nextSibling;
-        } else if ( before && view.previousSibling && dom.isEmpty( view.previousSibling ) && view.previousSibling.nodeName === 'P' ) {
-            padNode = view.previousSibling;
+            padNode = dom.create( 'p' );
+
+        if ( ! ( Env.ie && Env.ie < 11 ) ) {
+            padNode.innerHTML = '<br data-mce-bogus="1">';
+        }
+
+        if ( before ) {
+            view.parentNode.insertBefore( padNode, view );
         } else {
-            padNode = dom.create( 'p' );
-
-            if ( ! ( Env.ie && Env.ie < 11 ) ) {
-                padNode.innerHTML = '<br data-mce-bogus="1">';
-            }
-
-            if ( before ) {
-                view.parentNode.insertBefore( padNode, view );
-            } else {
-                dom.insertAfter( padNode, view );
-            }
+            dom.insertAfter( padNode, view );
         }
 
         deselect();
-        editor.getBody().focus();
-        editor.selection.setCursorLocation( padNode, 0 );
+
+        if ( before && keyCode === VK.ENTER ) {
+            setViewCursor( before, view );
+        } else {
+            editor.selection.setCursorLocation( padNode, 0 );
+        }
+
         editor.nodeChanged();
     }
@@ -457 +454 @@
             handleEnter( view );
         } else if ( cursorBefore ) {
-            handleEnter( view , true);
+            handleEnter( view , true, keyCode );
         }
 
@@ -631 +628 @@
                 // If the cursor lands anywhere else in the view, set the cursor before it.
                 // Only try this once to prevent a loop. (You never know.)
-                } else if ( ! getParent( event.element, 'wpview-body' ) && ! setViewCursorTries ) {
+                } else if ( ! getParent( event.element, 'wpview-clipboard' ) && ! setViewCursorTries ) {
                     deselect();
                     setViewCursorTries++;