Changeset 31485

Timestamp:

02/20/2015 11:16:34 PM (9 years ago)

Author:

azaozz

Message:

TinyMCE wpView: don't insert nested paragraphs when inserting embeddable URLs. Props iseulde, fixes #29526.

File:

• trunk/src/wp-includes/js/mce-view.js (modified) (2 diffs)

trunk/src/wp-includes/js/mce-view.js

@@ -878 +878 @@
     wp.mce.views.register( 'embedURL', _.extend( {}, wp.mce.embedMixin, {
         toView: function( content ) {
-            var re = /(?:^|<p>)(https?:\/\/[^\s"]+?)(?:<\/p>\s*|$)/gi,
+            var re = /(^|<p>)(https?:\/\/[^\s"]+?)(<\/p>\s*|$)/gi,
                 match = re.exec( tinymce.trim( content ) );
 
@@ -886 +886 @@
 
             return {
-                index: match.index,
-                content: match[0],
+                index: match.index + match[1].length,
+                content: match[2],
                 options: {
-                    url: match[1]
+                    url: match[2]
                 }
             };