Changeset 33563

Timestamp:

08/03/2015 10:06:25 PM (10 years ago)

Author:

iseulde

Message:

TinyMCE: wptextpattern: trim whitespace

Props iseulde and azaozz.
Fixes #33246.

Location:

trunk

Files:

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

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

@@ -54 +54 @@
         } );
 
-        function firstNode( node ) {
+        function firstTextNode( node ) {
             var parent = editor.dom.getParent( node, 'p' ),
                 child;
@@ -75 +75 @@
 
             if ( ! child.data ) {
-                child = child.nextSibling;
+                if ( child.nextSibling && child.nextSibling.nodeType === 3 ) {
+                    child = child.nextSibling;
+                } else {
+                    child = null;
+                }
             }
 
@@ -87 +91 @@
                 text;
 
-            if ( ! node || firstNode( node ) !== node ) {
+            if ( ! node || firstTextNode( node ) !== node ) {
                 return;
             }
@@ -124 +128 @@
 
         function watchEnter() {
-            var selection = editor.selection,
-                rng = selection.getRng(),
-                offset = rng.startOffset,
+            var rng = editor.selection.getRng(),
                 start = rng.startContainer,
-                node = firstNode( start ),
+                node = firstTextNode( start ),
                 i = enterPatterns.length,
                 text, pattern;
@@ -149 +151 @@
             }
 
-            if ( node === start ) {
-                if ( tinymce.trim( text ) === pattern.start ) {
-                    return;
-                }
-
-                offset = Math.max( 0, offset - pattern.start.length );
+            if ( node === start && tinymce.trim( text ) === pattern.start ) {
+                return;
             }
 
@@ -167 +165 @@
                 editor.undoManager.transact( function() {
                     editor.formatter.apply( refPattern.format, {}, refNode );
-                    refNode.deleteData( 0, refPattern.start.length );
+                    refNode.replaceData( 0, refNode.data.length, tinymce.trim( refNode.data.slice( refPattern.start.length ) ) );
                 } );
 

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

@@ -151 +151 @@
 
         type( '\n', function() {
+            assert.equal( editor.$( 'h3' )[0].firstChild.data, 'test' );
             assert.equal( editor.getContent(), '<h3>test</h3>\n<p>&nbsp;</p>' );
         }, assert.async() );