Changeset 30257 for branches/4.0

Timestamp:

11/06/2014 08:12:25 AM (11 years ago)

Author:

nacin

Message:

TinyMCE wpView: when pasting/inserting content before a view, add new paragraph above it and insert the content there.

Merges [29766] to the 4.0 branch.

props avryl.
fixes #29380.

Location:

branches/4.0

Files:

• . (modified) (1 prop)
• src/wp-includes/js/tinymce/plugins/wpview/plugin.js (modified) (4 diffs)

branches/4.0/src/wp-includes/js/tinymce/plugins/wpview/plugin.js

@@ -13 +13 @@
         _noop = function() { return false; },
         isios = /iPad|iPod|iPhone/.test( navigator.userAgent ),
-        cursorInterval, lastKeyDownNode, setViewCursorTries, focus, execCommandView;
+        cursorInterval, lastKeyDownNode, setViewCursorTries, focus, execCommandView, execCommandBefore;
 
     function getView( node ) {
@@ -369 +369 @@
     function isSpecialKey( key ) {
         return ( ( key <= 47 && key !== VK.SPACEBAR && key !== VK.ENTER && key !== VK.DELETE && key !== VK.BACKSPACE && ( key < 37 || key > 40 ) ) ||
-            key >= 224 || // OEM or non-printable 
+            key >= 224 || // OEM or non-printable
             ( key >= 144 && key <= 150 ) || // Num Lock, Scroll Lock, OEM
             ( key >= 91 && key <= 93 ) || // Windows keys
@@ -650 +650 @@
             view;
 
-        if ( node && ( node.className === 'wpview-selection-before' || node.className === 'wpview-selection-after' ) && ( view = getView( node ) ) ) {
-            handleEnter( view );
+        if ( node && ( ( execCommandBefore = node.className === 'wpview-selection-before' ) || node.className === 'wpview-selection-after' ) && ( view = getView( node ) ) ) {
+            handleEnter( view, execCommandBefore );
             execCommandView = view;
         }
@@ -666 +666 @@
 
         if ( execCommandView ) {
-            node = execCommandView.nextSibling;
+            node = execCommandView[ execCommandBefore ? 'previousSibling' : 'nextSibling' ];
 
             if ( node && node.nodeName === 'P' && editor.dom.isEmpty( node ) ) {
                 editor.dom.remove( node );
-                setViewCursor( false, execCommandView );
+                setViewCursor( execCommandBefore, execCommandView );
             }