Changeset 32832

Timestamp:

06/18/2015 11:33:11 AM (10 years ago)

Author:

iseulde

Message:

TinyMCE: wptextpattern: fix issue that removes content

• If the resulting text node is empty, don't remove all the content from the paragraph.
• If there's an empty text node at the start of the paragraph, ignore it and consider the next node to be the start.

See #31441.

Location:

trunk

Files:

• src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js (modified) (2 diffs)
• tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js (modified) (1 diff)

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

@@ -88 +88 @@
             }
 
+            if ( ! child.nodeValue ) {
+                child = child.nextSibling;
+            }
+
             if ( child !== node ) {
                 return;
@@ -110 +114 @@
 
                 editor.undoManager.transact( function() {
+                    var $$parent;
+
                     if ( replace ) {
                         $$( node ).replaceWith( document.createTextNode( replace ) );
                     } else  {
-                        $$( node.parentNode ).empty().append( '<br>' );
+                        $$parent = $$( node.parentNode );
+
+                        $$( node ).remove();
+
+                        if ( ! $$parent.html() ) {
+                            $$parent.append( '<br>' );
+                        }
                     }
 

trunk/tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js

@@ -78 +78 @@
     } );
 
-    QUnit.test( 'Ordered list with content.', function( assert ) {
+    QUnit.test( 'Ordered list with content. (1)', function( assert ) {
         editor.setContent( '<p><strong>test</strong></p>' );
         editor.selection.setCursorLocation();
+
+        type( '* ', function() {
+            assert.equal( editor.getContent(), '<ul>\n<li><strong>test</strong></li>\n</ul>' );
+        }, assert.async() );
+    } );
+
+    QUnit.test( 'Ordered list with content. (2)', function( assert ) {
+        editor.setContent( '<p><strong>test</strong></p>' );
+        editor.selection.setCursorLocation( editor.$( 'p' )[0], 0 );
 
         type( '* ', function() {