Ticket #39337: 39337.2.patch

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

@@ -116 +116 @@
                                                 }
 
                                                 instance = self.createInstance( type, result.content, result.options );
-                                                text = instance.loader ? '.' : instance.text;
+                                                text = instance.text;
 
                                                 // Add the processed piece for the match.
                                                 pieces.push( {
@@ -428 +428 @@
                  */
                 replaceMarkers: function() {
                         this.getMarkers( function( editor, node ) {
-                                var $viewNode;
+                                var viewNode;
 
                                 if ( ! this.loader && $( node ).text() !== this.text ) {
                                         editor.dom.setAttrib( node, 'data-wpview-marker', null );
@@ -435 +435 @@
                                         return;
                                 }
 
-                                $viewNode = editor.$(
-                                        '<div class="wpview wpview-wrap" data-wpview-text="' + this.encodedText + '" data-wpview-type="' + this.type + '" contenteditable="false"></div>'
-                                );
+                                viewNode = editor.dom.create( 'div', {
+                                        'class': 'wpview wpview-wrap',
+                                        'data-wpview-text': this.encodedText,
+                                        'data-wpview-type': this.type,
+                                        'contenteditable': 'false'
+                                } );                                    
 
-                                editor.$( node ).replaceWith( $viewNode );
+                                editor.$( node ).replaceWith( viewNode );
+
+                                if ( ! viewNode.nextSibling ) {
+                                        editor.selection.select( viewNode );
+
+                                        setTimeout( function() {
+                                                editor.selection.collapse();
+                                        } );
+                                }
                         } );
                 },