Changeset 31832

Timestamp:

03/19/2015 07:07:48 AM (11 years ago)

Author:

azaozz

Message:

TinyMCE: revert stripping of tags from pasted URLs on beforeSetContent [31817] and [31819]. Clean up URLs on pastePreProcess.
See #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

@@ -168 +168 @@
         // view wrappers.
         editor.on( 'BeforeSetContent', function( event ) {
-                var pastedStr = event.content,
-                        trim = tinymce.trim,
-                        node;
-
-                if ( ! pastedStr ) {
+                var node;
+
+                if ( ! event.content ) {
                         return;
                 }
 
-                if ( selected ) {
-                        removeView( selected );
-                }
-
                 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 ( /^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 || node.innerText ) ) {
-                                return;
-                        }
+                if ( event.content.match( /^\s*(https?:\/\/[^\s"]+)\s*$/i ) &&
+                        ( node.nodeName !== 'P' || node.parentNode !== editor.getBody() || ! editor.dom.isEmpty( node ) ) ) {
+
+                        return;
                 }
 
                 event.content = wp.mce.views.setMarkers( event.content );
+        });
+
+        // When pasting strip all tags and check if the string is an URL.
+        // Then replace the pasted content with the cleaned URL.
+        editor.on( 'pastePreProcess', function( event ) {
+                var pastedStr = event.content;
+
+                if ( pastedStr ) {
+                        pastedStr = tinymce.trim( pastedStr.replace( /<[^>]+>/g, '' ) );
+
+                        if ( /^https?:\/\/\S+$/i.test( pastedStr ) ) {
+                                event.content = pastedStr;
+                        }
+                }
         });