Changeset 45631

Timestamp:

07/12/2019 03:24:20 AM (5 years ago)

Author:

azaozz

Message:

TinyMCE: fix adding of too many undo levels for wpviews. The HTML changes several times when a wpview is added. We only want one undo level. Also fixes cases when the cursor is next to an embeddable URL in the Text tab and the user switches to the Visual tab.

See #45307.

Location:

trunk/src/js/_enqueues

Files:

• vendor/tinymce/plugins/wpview/plugin.js (modified) (2 diffs)
• wp/mce-view.js (modified) (2 diffs)

trunk/src/js/_enqueues/vendor/tinymce/plugins/wpview/plugin.js

@@ -26 +26 @@
             }
 
-            if ( ! content ) {
+            if ( ! content || content.indexOf( ' data-wpview-' ) === -1 ) {
                 return content;
             }
@@ -112 +112 @@
         } );
 
-        // Replace views with their text inside undo levels.
-        // This also prevents that new levels are added when there are changes inside the views.
+        // Prevent adding of undo levels when replacing wpview markers
+        // or when there are changes only in the (non-editable) previews.
         editor.on( 'beforeaddundo', function( event ) {
-            event.level.content = resetViews( event.level.content );
+            var lastContent;
+            var newContent = event.level.content || ( event.level.fragments && event.level.fragments.join( '' ) );
+
+            if ( ! event.lastLevel ) {
+                lastContent = editor.startContent;
+            } else {
+                lastContent = event.lastLevel.content || ( event.lastLevel.fragments && event.lastLevel.fragments.join( '' ) );
+            }
+
+            if (
+                ! newContent ||
+                ! lastContent ||
+                newContent.indexOf( ' data-wpview-' ) === -1 ||
+                lastContent.indexOf( ' data-wpview-' ) === -1
+            ) {
+                return;
+            }
+
+            if ( resetViews( lastContent ) === resetViews( newContent ) ) {
+                event.preventDefault();
+            }
         } );
 

trunk/src/js/_enqueues/wp/mce-view.js

@@ -445 +445 @@
                 );
 
-                editor.$( node ).replaceWith( $viewNode );
+                editor.undoManager.ignore( function() {
+                    editor.$( node ).replaceWith( $viewNode );
+                } );
 
                 if ( selected ) {
                     setTimeout( function() {
-                        editor.selection.select( $viewNode[0] );
-                        editor.selection.collapse();
+                        editor.undoManager.ignore( function() {
+                            editor.selection.select( $viewNode[0] );
+                            editor.selection.collapse();
+                        } );
                     } );
                 }
@@ -962 +966 @@
     views.register( 'embedURL', _.extend( {}, embed, {
         match: function( content ) {
-            var re = /(^|<p>)(https?:\/\/[^\s"]+?)(<\/p>\s*|$)/gi,
-                match = re.exec( content );
+            // There may be a "bookmark" node next to the URL...
+            var re = /(^|<p>(?:<span data-mce-type="bookmark"[^>]+>\s*<\/span>)?)(https?:\/\/[^\s"]+?)((?:<span data-mce-type="bookmark"[^>]+>\s*<\/span>)?<\/p>\s*|$)/gi;
+            var match = re.exec( content );
 
             if ( match ) {