Changeset 27729

Timestamp:

03/26/2014 02:07:23 AM (10 years ago)

Author:

azaozz

Message:

TinyMCE: fix the More and Next Page tags behavior:

• Append them inside top level <p> tags.
• If the caret is not in a top level <p>, create new paragraph after the current top level tag.
• Do not change placement when edited in the Text editor.

See #27378

Location:

trunk/src/wp-includes/js

Files:

• quicktags.js (modified) (1 diff)
• tinymce/plugins/wordpress/plugin.js (modified) (3 diffs)

trunk/src/wp-includes/js/quicktags.js

@@ -644 +644 @@
     edButtons[100] = new qt.TagButton('li','li','\t<li>','</li>\n','l'),
     edButtons[110] = new qt.TagButton('code','code','<code>','</code>','c'),
-    edButtons[120] = new qt.TagButton('more','more','\n\n<!--more-->\n\n','','t'),
+    edButtons[120] = new qt.TagButton('more','more','<!--more-->\n\n','','t'),
     edButtons[140] = new qt.CloseButton();
 

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

@@ -131 +131 @@
     });
 
-    // Make sure the "more" tag is in a separate paragraph
-    editor.on( 'PreProcess', function( event ) {
-        var more;
-
-        if ( event.save ) {
-            more = editor.dom.select( 'img.wp-more-tag', event.node );
-
-            if ( more.length ) {
-                tinymce.each( more, function( node ) {
-                    var parent = node.parentNode, p;
-
-                    if ( parent.nodeName === 'P' && parent.childNodes.length > 1 ) {
-                        p = editor.dom.create('p');
-                        parent.parentNode.insertBefore( p, parent );
-                        p.appendChild( node );
-                    }
-                });
-            }
-        }
-    });
-
     // Register commands
     editor.addCommand( 'WP_More', function( tag ) {
-        var parent, html, title, p1, p2,
+        var parent, html, title,
             classname = 'wp-more-tag',
-            spacer = tinymce.Env.ie ? '' : '<br data-mce-bogus="1" />',
             dom = editor.dom,
             node = editor.selection.getNode();
@@ -166 +144 @@
             'data-mce-resize="false" data-mce-placeholder="1" />';
 
-        if ( node.nodeName === 'BODY' ) {
-            editor.insertContent( '<p>' + html + '</p><p></p>' );
+        // Most common case
+        if ( node.nodeName === 'BODY' || ( node.nodeName === 'P' && node.parentNode.nodeName === 'BODY' ) ) {
+            editor.insertContent( html );
             return;
         }
@@ -181 +160 @@
 
         if ( parent ) {
-            p1 = dom.create( 'p', null, html );
-            dom.insertAfter( p1, parent );
-
-            if ( ! ( p2 = p1.nextSibling ) ) {
-                p2 = dom.create( 'p', null, spacer );
-                dom.insertAfter( p2, p1 );
+            if ( parent.nodeName === 'P' ) {
+                parent.appendChild( dom.create( 'p', null, html ).firstChild );
+            } else {
+                dom.insertAfter( dom.create( 'p', null, html ), parent );
             }
 
             editor.nodeChanged();
-            editor.selection.setCursorLocation( p2, 0 );
         }
     });