Ticket #32078: 32078.3.patch

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

@@ -102 +102 @@
 
                                 _.each( current, function( piece ) {
                                         var remaining = piece.content,
-                                                result;
+                                                result, text;
 
                                         // Ignore processed pieces, but retain their location.
                                         if ( piece.processed ) {
@@ -119 +119 @@
                                                 }
 
                                                 instance = self.createInstance( type, result.content, result.options );
+                                                text = instance.loader ? '.' : instance.text;
 
                                                 // Add the processed piece for the match.
                                                 pieces.push( {
-                                                        content: '<p data-wpview-marker="' + instance.encodedText + '">' + instance.text + '</p>',
+                                                        content: '<p data-wpview-marker="' + instance.encodedText + '">' + text + '</p>',
                                                         processed: true
                                                 } );
 
@@ -416 +417 @@
                  */
                 replaceMarkers: function() {
                         this.getMarkers( function( editor, node ) {
-                                if ( $( node ).text() !== this.text ) {
+
+                                if ( ! this.loader && $( node ).text() !== this.text ) {
                                         editor.dom.setAttrib( node, 'data-wpview-marker', null );
                                         return;
                                 }

src/wp-includes/js/media/views/frame/video-details.js

@@ -120 +120 @@
 
                         if ( -1 === content.indexOf( attachment.get( 'url' ) ) ) {
                                 content += [
-                                        '<track srclang="en" label="English"kind="subtitles" src="',
+                                        '<track srclang="en" label="English" kind="subtitles" src="',
                                         attachment.get( 'url' ),
                                         '" />'
                                 ].join('');

src/wp-includes/js/media-audiovideo.js

@@ -704 +704 @@
 
                         if ( -1 === content.indexOf( attachment.get( 'url' ) ) ) {
                                 content += [
-                                        '<track srclang="en" label="English"kind="subtitles" src="',
+                                        '<track srclang="en" label="English" kind="subtitles" src="',
                                         attachment.get( 'url' ),
                                         '" />'
                                 ].join('');

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

@@ -152 +152 @@
                 };
         }
 
-        // Remove the content of view wrappers from HTML string
-        function emptyViews( content ) {
-                content = content.replace( /<div[^>]+data-wpview-text="([^"]+)"[^>]*>[\s\S]+?wpview-selection-after[^>]+>[^<>]*<\/p>\s*<\/div>/g, function( all, match ) {
-                        return '<p>' + window.decodeURIComponent( match ) + '</p>';
-                });
+        function resetViewsCallback( match, viewText ) {
+                return '<p>' + window.decodeURIComponent( viewText ) + '</p>';
+        }
 
-                return content.replace( / data-wpview-marker="[^"]+"/g, '' );
+        // Remove the content of view wrappers from HTML string
+        function resetViews( content ) {
+                return content
+                        .replace( /<div[^>]+data-wpview-text="([^"]+)"[^>]*>[\s\S]+?wpview-selection-after[^>]+>[^<>]*<\/p>\s*<\/div>/g, resetViewsCallback )
+                        .replace( /<p[^>]+data-wpview-marker="([^"]+)"[^>]*>[\s\S]+?<\/p>/g, resetViewsCallback );
         }
 
         // Prevent adding undo levels on changes inside a view wrapper
         editor.on( 'BeforeAddUndo', function( event ) {
                 if ( event.level.content ) {
-                        event.level.content = emptyViews( event.level.content );
+                        event.level.content = resetViews( event.level.content );
                 }
-        });
+        } );
 
         // When the editor's content changes, scan the new content for
         // matching view patterns, and transform the matches into
@@ -348 +350 @@
                 }
         });
 
-        function resetViews( rootNode ) {
-                // Replace view nodes
-                $( 'div[data-wpview-text]', rootNode ).each( function( i, node ) {
-                        var $node = $( node ),
-                                text = window.decodeURIComponent( $node.attr( 'data-wpview-text' ) || '' );
-
-                        if ( text && node.parentNode ) {
-                                $node.replaceWith( $( editor.dom.create('p') ).text( text ) );
-                        }
-                });
-
-                // Remove marker attributes
-                $( 'p[data-wpview-marker]', rootNode ).attr( 'data-wpview-marker', null );
-        }
-
-        editor.on( 'PreProcess', function( event ) {
-                // Replace the view nodes with their text in the DOM clone.
-                resetViews( event.node );
-        }, true );
-
         editor.on( 'hide', function() {
-                // Replace the view nodes with their text directly in the editor body.
                 wp.mce.views.unbind();
                 deselect();
-                resetViews( editor.getBody() );
-        });
+                $( '.wpview-content' ).empty();
+        } );
+
+        editor.on( 'PostProcess', function( event ) {
+                event.content = resetViews( event.content );
+        } );
 
         // Excludes arrow keys, delete, backspace, enter, space bar.
         // Ref: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.keyCode