Changeset 44649

Timestamp:

01/18/2019 04:32:46 PM (6 years ago)

Author:

azaozz

Message:

TinyMCE: treat HTML comments same as tags when keeping cursor position. Fixes breaking the More and Nextpage tags when switching from Text to Visual.

Props iCaleb, jeremeylduvall.
Fixes #45947.

File:

• trunk/src/js/_enqueues/wp/editor/base.js (modified) (3 diffs)

trunk/src/js/_enqueues/wp/editor/base.js

@@ -189 +189 @@
 
         /**
-         * Checks if a cursor is inside an HTML tag.
+         * Checks if a cursor is inside an HTML tag or comment.
          *
          * In order to prevent breaking HTML tags when selecting text, the cursor
@@ -212 +212 @@
                 // find what the tag is
                 var tagContent = content.substr( lastLtPos ),
-                    tagMatch = tagContent.match( /<\s*(\/)?(\w+)/ );
+                    tagMatch = tagContent.match( /<\s*(\/)?(\w+|\!-{2}.*-{2})/ );
 
                 if ( ! tagMatch ) {
@@ -383 +383 @@
 
         /**
-         * Gets adjusted selection cursor positions according to HTML tags/shortcodes
+         * Gets adjusted selection cursor positions according to HTML tags, comments, and shortcodes.
          *
          * Shortcodes and HTML codes are a bit of a special case when selecting, since they may render