Changeset 31817

Timestamp:

03/18/2015 08:25:09 PM (9 years ago)

Author:

azaozz

Message:

TinyMCE: strip tags from pasted URLs before testing if they are embeddable.
Props siobhan, iseulde. Fixes #31158.

File:

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

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

@@ -168 +168 @@
     // view wrappers.
     editor.on( 'BeforeSetContent', function( event ) {
-        var node;
-
-        if ( ! event.content ) {
+        var pastedStr = event.content,
+            trim = tinymce.trim,
+            node;
+
+        if ( ! pastedStr ) {
             return;
         }
@@ -180 +182 @@
         node = editor.selection.getNode();
 
+        pastedStr = pastedStr.replace( /<[^>]+>/g, '' );
+        pastedStr = trim( pastedStr );
+
         // 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 ( /^https?:\/\/\S+$/i.test( pastedStr ) ) {
+            event.content = pastedStr;
+
+            node = editor.dom.getParent( node, function( node ) {
+                if ( node.parentNode === editor.getBody() ) {
+                    return node;
+                }
+            } );
+
+            if ( node.nodeName !== 'P' || trim( node.textContent ) || trim( node.innerText ) ) {
+                return;
+            }
         }