Changeset 26941

Timestamp:

01/14/2014 05:45:53 AM (11 years ago)

Author:

azaozz

Message:

TinyMCE: improve handling of Read More and Nextpage tags. See #24067, fixes #16239.

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','<!--more-->','','t'),
+    edButtons[120] = new qt.TagButton('more','more','\n\n<!--more-->\n\n','','t'),
     edButtons[140] = new qt.CloseButton();
 

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

@@ -127 +127 @@
     });
 
+    // 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,
+        var parent, html, title, p1, p2,
             classname = 'wp-more-tag',
+            spacer = tinymce.Env.ie ? '' : '<br data-mce-bogus="1" />',
             dom = editor.dom,
             node = editor.selection.getNode();
@@ -137 +159 @@
         classname += ' mce-wp-' + tag;
         title = tag === 'more' ? 'More...' : 'Next Page';
-        html = '<img src="' + tinymce.Env.transparentSrc + '" title="' + title + '" class="' + classname + '" data-mce-resize="false" data-mce-placeholder="1" />';
+        html = '<img src="' + tinymce.Env.transparentSrc + '" title="' + title + '" class="' + classname + '" ' +
+            'data-mce-resize="false" data-mce-placeholder="1" />';
 
         if ( node.nodeName === 'BODY' ) {
-            editor.insertContent( '<p>' + html + '</p>' );
+            editor.insertContent( '<p>' + html + '</p><p></p>' );
             return;
         }
@@ -154 +177 @@
 
         if ( parent ) {
-            dom.insertAfter( dom.create( 'p', null, html ), 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 );
+            }
+
+            editor.nodeChanged();
+            editor.selection.setCursorLocation( p2, 0 );
         }
     });