Ticket #29841: 29841.patch

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

@@ -17 +17 @@
                 mediaWindows = [],
                 windowIdx = 0,
                 waitInterval = 50,
-                viewOptions = ['encodedText'];
+                viewOptions = ['encodedText'],
+                oEmbedProviders = [];
 
         // Create the `wp.mce` object if necessary.
         wp.mce = wp.mce || {};
 
+        // Convert PHP regex to JS regex.
+        _.each( window._wpMCEViewL10n.oEmbedProviders, function( provider, pattern ) {
+                var match = /^([^a-z0-9\\ ])?(.*)\1([a-z]*)$/.exec( pattern );
+
+                if ( ! match ) {
+                        return;
+                }
+
+                pattern = match[1] ? match[2].replace( new RegExp( '\\\\' + match[1], 'g' ), match[1] ) : match[2];
+                pattern = pattern.replace( /\//g, '\\/' );
+                pattern = new RegExp( pattern, 'i' );
+
+                oEmbedProviders.push( pattern );
+        } );
+
         /**
          * wp.mce.View
          *
@@ -111 +127 @@
                 setContent: function( html, option ) {
                         this.getNodes( function ( editor, node, content ) {
                                 var el = ( option === 'wrap' || option === 'replace' ) ? node : content,
-                                        insert = html;
+                                        insert = html,
+                                        view = editor.plugins.wpview.getView( editor.selection.getNode() ),
+                                        p;
 
                                 if ( _.isString( insert ) ) {
                                         insert = editor.dom.createFragment( insert );
                                 }
 
                                 if ( option === 'replace' ) {
-                                        editor.dom.replace( insert, el );
+                                        p = editor.dom.create( 'p', null, insert );
+
+                                        editor.dom.replace( p, el );
+
+                                        if ( view ) {
+                                                editor.selection.select( p, true );
+                                                editor.selection.collapse();
+                                        }
                                 } else {
                                         el.innerHTML = '';
                                         el.appendChild( insert );
+
+                                        if ( view ) {
+                                                editor.plugins.wpview.setViewCursor( false, view );
+                                        }
                                 }
                         } );
                 },
@@ -700 +729 @@
 
                                                 this.setError( this.error.message, 'admin-media' );
                                         } else {
-                                                this.setContent( '<p>' + this.original + '</p>', 'replace' );
+                                                this.setContent( this.original, 'replace' );
                                         }
                                 } else if ( this.error.statusText ) {
                                         this.setError( this.error.statusText, 'admin-media' );
                                 } else if ( this.original ) {
-                                        this.setContent( '<p>' + this.original + '</p>', 'replace' );
+                                        this.setContent( this.original, 'replace' );
                                 }
                         },
 
@@ -875 +904 @@
                                 return;
                         }
 
-                        return {
-                                index: match.index,
-                                content: match[0],
-                                options: {
-                                        url: match[1]
-                                }
-                        };
+                        if ( _.some( oEmbedProviders, function( re ) {
+                                return re.exec( match[1] );
+                        } ) ) {
+                                return {
+                                        index: match.index,
+                                        content: match[0],
+                                        options: {
+                                                url: match[1]
+                                        }
+                                };
+                        }
                 }
         } ) );
 

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

@@ -162 +162 @@
                         toolbar = editor.$( viewNode ).find( '.toolbar' ),
                         editorToolbar = tinymce.$( editor.editorContainer ).find( '.mce-toolbar-grp' )[0],
                         editorToolbarBottom = ( editorToolbar && editorToolbar.getBoundingClientRect().bottom ) || 0;
-                
+
                 if ( toolbar.length && editor.iframeElement ) {
                         // 48 = 43 for the toolbar + 5 buffer
                         delta = viewNode.getBoundingClientRect().top + editor.iframeElement.getBoundingClientRect().top - editorToolbarBottom - 48;
@@ -718 +718 @@
         return {
                 getViewText: getViewText,
                 setViewText: setViewText,
-                getView: getView
+                getView: getView,
+                setViewCursor: setViewCursor
         };
 });

src/wp-includes/script-loader.php

@@ -418 +418 @@
         $scripts->add( 'media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array( 'media-editor' ), false, 1 );
         $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models', 'media-audiovideo', 'wp-playlist' ), false, 1 );
 
+        require_once ABSPATH . WPINC . '/class-oembed.php';
+
+        did_action( 'init' ) && $scripts->localize( 'mce-view', '_wpMCEViewL10n', array(
+                'oEmbedProviders' => _wp_oembed_get_object()->providers
+        ) );
+
         if ( is_admin() ) {
                 $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array('jquery', 'wp-ajax-response'), false, 1 );
                 did_action( 'init' ) && $scripts->localize( 'admin-tags', 'tagsl10n', array(