Changeset 36719

Timestamp:

02/26/2016 12:51:01 AM (9 years ago)

Author:

iseulde

Message:

TinyMCE: textpattern: clean up

• Use editor.once instead of storing into variables.
• Add pattern for hr.

See #33300.

Location:

trunk

Files:

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

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

@@ -26 +26 @@
             { start: '#####', format: 'h5' },
             { start: '######', format: 'h6' },
-            { start: '>', format: 'blockquote' }
+            { start: '>', format: 'blockquote' },
+            { regExp: /^\s*(?:(?:\* ?){3,}|(?:_ ?){3,}|(?:- ?){3,})\s*$/, element: 'hr' }
         ];
 
@@ -38 +39 @@
 
         var canUndo;
-        var refNode;
-        var refPattern;
         var chars = [];
-        var zeroWidthSpaceNode;
 
         tinymce.each( inlinePatterns, function( pattern ) {
@@ -52 +50 @@
 
         editor.on( 'selectionchange', function() {
-            var offset;
-
             canUndo = null;
-
-            if ( zeroWidthSpaceNode ) {
-                offset = zeroWidthSpaceNode.data.indexOf( '\u200b' );
-
-                if ( offset !== -1 ) {
-                    zeroWidthSpaceNode.deleteData( offset, offset + 1 );
-                }
-            }
         } );
 
@@ -73 +61 @@
 
             if ( event.keyCode === VK.ENTER && ! VK.modifierPressed( event ) ) {
-                watchEnter();
+                enter();
             }
         }, true );
@@ -80 +68 @@
             if ( event.keyCode === VK.SPACEBAR && ! event.ctrlKey && ! event.metaKey && ! event.altKey ) {
                 space();
-            } else if ( event.keyCode === VK.ENTER && ! VK.modifierPressed( event ) ) {
-                enter();
             } else if ( event.keyCode > 47 && ! ( event.keyCode >= 91 && event.keyCode <= 93 ) ) {
                 inline();
@@ -156 +142 @@
                 setTimeout( function() {
                     canUndo = 'space';
-                    zeroWidthSpaceNode = zero;
+
+                    editor.once( 'selectionchange', function() {
+                        var offset;
+
+                        if ( zero ) {
+                            offset = zero.data.indexOf( '\u200b' );
+
+                            if ( offset !== -1 ) {
+                                zero.deleteData( offset, offset + 1 );
+                            }
+                        }
+                    } );
                 } );
             }
@@ -234 +231 @@
         }
 
-        function watchEnter() {
+        function enter() {
             var rng = editor.selection.getRng(),
                 start = rng.startContainer,
@@ -248 +245 @@
 
             while ( i-- ) {
-                 if ( text.indexOf( enterPatterns[ i ].start ) === 0 ) {
-                    pattern = enterPatterns[ i ];
-                    break;
-                 }
+                if ( enterPatterns[ i ].start ) {
+                    if ( text.indexOf( enterPatterns[ i ].start ) === 0 ) {
+                        pattern = enterPatterns[ i ];
+                        break;
+                    }
+                } else if ( enterPatterns[ i ].regExp ) {
+                    if ( enterPatterns[ i ].regExp.test( text ) ) {
+                        pattern = enterPatterns[ i ];
+                        break;
+                    }
+                }
             }
 
@@ -262 +266 @@
             }
 
-            refNode = node;
-            refPattern = pattern;
-        }
-
-        function ltrim( text ) {
-            return text ? text.replace( /^\s+/, '' ) : '';
-        }
-
-        function enter() {
-            if ( refNode ) {
+            editor.once( 'keyup', function() {
                 editor.undoManager.add();
 
                 editor.undoManager.transact( function() {
-                    editor.formatter.apply( refPattern.format, {}, refNode );
-                    refNode.replaceData( 0, refNode.data.length, ltrim( refNode.data.slice( refPattern.start.length ) ) );
+                    if ( pattern.format ) {
+                        editor.formatter.apply( pattern.format, {}, node );
+                        node.replaceData( 0, node.data.length, ltrim( node.data.slice( pattern.start.length ) ) );
+                    } else if ( pattern.element ) {
+                        editor.getBody().replaceChild( document.createElement( pattern.element ), node.parentNode );
+                    }
                 } );
 
@@ -283 +282 @@
                     canUndo = 'enter';
                 } );
-            }
-
-            refNode = null;
-            refPattern = null;
+            } );
+        }
+
+        function ltrim( text ) {
+            return text ? text.replace( /^\s+/, '' ) : '';
         }
     } );

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

@@ -307 +307 @@
 
     QUnit.test( 'Inline: no change.', function( assert ) {
-        type( '******', function() {
-            assert.equal( editor.getContent(), '<p>******</p>' );
+        type( 'test ******', function() {
+            assert.equal( editor.getContent(), '<p>test ******</p>' );
+        }, assert.async() );
+    } );
+
+    QUnit.test( 'Horizontal Rule', function( assert ) {
+        type( '   ---   \n', function() {
+            assert.equal( editor.getContent(), '<hr />\n<p>&nbsp;</p>' );
         }, assert.async() );
     } );