Changeset 42575

Timestamp:

01/23/2018 05:47:52 PM (9 years ago)

Author:

azaozz

Message:

Merged revision 42574 from trunk:

Editor: when keeping the scroll position treat all shortcodes as preview-able. Otherwise in some cases the marker span can get stuck inside the shortcode and break the markup.

Props azaozz, lizkarkoski and othellobloke for testing.
Fixes #42908 for 4.9.3.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/js/editor.js (modified) (6 diffs)

branches/4.9/src/wp-admin/js/editor.js

@@ -282 +282 @@
 
                 /**
-                 * @summary Check if a shortcode has Live Preview enabled for it.
-                 *
-                 * Previewable shortcodes here refers to shortcodes that have Live Preview enabled.
-                 *
-                 * These shortcodes get rewritten when the editor is in Visual mode, which means that
-                 * we don't want to change anything inside them, i.e. inserting a selection marker
-                 * inside the shortcode will break it :(
-                 *
-                 * @link wp-includes/js/mce-view.js
-                 *
-                 * @param {string} shortcode The shortcode to check.
-                 * @return {boolean} If a shortcode has Live Preview or not
-                 */
-                function isShortcodePreviewable( shortcode ) {
-                        var defaultPreviewableShortcodes = [ 'caption' ];
-
-                        return (
-                                defaultPreviewableShortcodes.indexOf( shortcode ) !== -1 ||
-                                wp.mce.views.get( shortcode ) !== undefined
-                        );
-
-                }
-
-                /**
                  * @summary Get all shortcodes and their positions in the content
                  *
@@ -341 +317 @@
                                 var showAsPlainText = shortcodeMatch[1] === '[';
 
-                                /**
-                                 * For more context check the docs for:
-                                 *
-                                 * @link isShortcodePreviewable
-                                 *
-                                 * In addition, if the shortcode will get rendered as plain text ( see above ),
-                                 * we can treat it as text and use the selection markers in it.
-                                 */
-                                var isPreviewable = ! showAsPlainText && isShortcodePreviewable( shortcodeMatch[2] );
-
                                 shortcodeInfo = {
                                         shortcodeName: shortcodeMatch[2],
@@ -356 +322 @@
                                         startIndex: shortcodeMatch.index,
                                         endIndex: shortcodeMatch.index + shortcodeMatch[0].length,
-                                        length: shortcodeMatch[0].length,
-                                        isPreviewable: isPreviewable
+                                        length: shortcodeMatch[0].length
                                 };
 
@@ -383 +348 @@
                                         endIndex: shortcodeMatch.index + shortcodeMatch[ 0 ].length,
                                         length: shortcodeMatch[ 0 ].length,
-                                        isPreviewable: true,
                                         urlAtStartOfContent: shortcodeMatch[ 1 ] === '',
                                         urlAtEndOfContent: shortcodeMatch[ 3 ] === ''
@@ -466 +430 @@
 
                         var isCursorStartInShortcode = getShortcodeWrapperInfo( content, cursorStart );
-                        if ( isCursorStartInShortcode && isCursorStartInShortcode.isPreviewable ) {
+                        if ( isCursorStartInShortcode && ! isCursorStartInShortcode.showAsPlainText ) {
                                 /**
                                  * If a URL is at the start or the end of the content,
@@ -483 +447 @@
 
                         var isCursorEndInShortcode = getShortcodeWrapperInfo( content, cursorEnd );
-                        if ( isCursorEndInShortcode && isCursorEndInShortcode.isPreviewable ) {
+                        if ( isCursorEndInShortcode && ! isCursorEndInShortcode.showAsPlainText ) {
                                 if ( isCursorEndInShortcode.urlAtEndOfContent ) {
                                         cursorEnd = isCursorEndInShortcode.startIndex;