Changeset 31856

Timestamp:

03/20/2015 08:33:55 PM (11 years ago)

Author:

azaozz

Message:

TinyMCE: when pasting an URL, check if the node it is pasted at is empty and remove any empty inline child elements.
Fixes #31158.

File:

• trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js (modified) (1 diff)

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

@@ -174 +174 @@
                 }
 
-                node = editor.selection.getNode();
-
-                // When a url is pasted, only try to embed it when pasted in an empty paragrapgh.
-                if ( event.content.match( /^\s*(https?:\/\/[^\s"]+)\s*$/i ) &&
-                        ( node.nodeName !== 'P' || node.parentNode !== editor.getBody() || ! editor.dom.isEmpty( node ) ) ) {
-
-                        return;
+                if ( ! event.load ) {
+                        node = editor.selection.getNode();
+
+                        if ( node && node !== editor.getBody() && /^\s*https?:\/\/\S+\s*$/i.test( event.content ) ) {
+                                // When a url is pasted or inserted, only try to embed it when it is in an empty paragrapgh.
+                                node = editor.dom.getParent( node, 'p' );
+
+                                if ( node && /^[\s\uFEFF\u00A0]*$/.test( node.textContent || node.innerText ) ) {
+                                        // Make sure there are no empty inline elements in the <p>
+                                        node.innerHTML = '';
+                                } else {
+                                        return;
+                                }
+                        }
                 }