Changeset 41656

Timestamp:

10/01/2017 10:32:58 AM (7 years ago)

Author:

azaozz

Message:

Editor: Use editor.$ to improve removeSelectionMarker().

See #42029

File:

• trunk/src/wp-admin/js/editor.js (modified) (1 diff)

trunk/src/wp-admin/js/editor.js

@@ -509 +509 @@
 
 
-            removeSelectionMarker( editor, startNode );
-            removeSelectionMarker( editor, endNode );
-        }
-
-        /**
-         * @summary Remove selection marker with optional `<p>` parent.
-         *
-         * By default TinyMCE puts every inline node at the main level in a `<p>` wrapping tag.
-         *
-         * In the case with selection markers, when removed they leave an empty `<p>` behind,
-         * which adds an empty paragraph line with `&nbsp;` when switched to Text mode.
-         *
-         * In order to prevent that the wrapping `<p>` needs to be removed when removing the
-         * selection marker.
-         *
-         * @param {object} editor The TinyMCE Editor instance
-         * @param {object} marker The marker to be removed from the editor DOM
-         */
-        function removeSelectionMarker( editor, marker ) {
-            var markerParent = editor.$( marker ).parent();
-
-            if (
-                ! markerParent.length ||
-                markerParent.prop('tagName').toLowerCase() !== 'p' ||
-                markerParent[0].childNodes.length > 1 ||
-                ! markerParent.prop('outerHTML').match(/^<p>/)
-            ) {
-                /**
-                 * The selection marker is not self-contained in a <p>.
-                 * In this case only the selection marker is removed, since
-                 * it will affect the content.
-                 */
-                marker.remove();
-            }
-            else {
-                /**
-                 * The marker is self-contained in an blank `<p>` tag.
-                 *
-                 * This is usually inserted by TinyMCE
-                 */
-                markerParent.remove();
+            removeSelectionMarker( startNode );
+            removeSelectionMarker( endNode );
+        }
+
+        /**
+         * @summary Remove selection marker and the parent node if it is an empty paragraph.
+         *
+         * By default TinyMCE wraps loose inline tags in a `<p>`.
+         * When removing selection markers an empty `<p>` may be left behind, remove it.
+         *
+         * @param {object} $marker The marker to be removed from the editor DOM, wrapped in an instnce of `editor.$`
+         */
+        function removeSelectionMarker( $marker ) {
+            var $markerParent = $marker.parent();
+
+            $marker.remove();
+
+            //Remove empty paragraph left over after removing the marker.
+            if ( $markerParent.is( 'p' ) && ! $markerParent.children().length && ! $markerParent.text() ) {
+                $markerParent.remove();
             }
         }