Ticket #31669: 31669.5.patch

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

@@ -77 +77 @@
                  */
                 unbind: function() {
                         _.each( instances, function( instance ) {
-                                instance.unbind();
+                                instance.unbindAll();
                         } );
                 },
 
@@ -87 +87 @@
                  * and creates a new instance for every match.
                  *
                  * @param {String} content The string to scan.
+                 *
+                 * @return {String} The string with markers.
                  */
                 setMarkers: function( content ) {
                         var pieces = [ { content: content } ],
@@ -140 +142 @@
                 },
 
                 /**
+                 * The opposite of `setMarkers`.
+                 * Replaces all view markup in a given string with the view text.
+                 *
+                 * @param {String} content The string to scan.
+                 *
+                 * @return {String} The string with view text.
+                 */
+                reset: function( content ) {
+                        function callback() {
+                                return '<p>' + decodeURIComponent( arguments[1] ) + '</p>';
+                        }
+
+                        content = content.replace( /<[^>]+data-wpview-text="([^"]+)"[^>]*>[\s\S]+?wpview-selection-after[^>]+>[^>]+>[^>]+>/g, callback );
+                        content = content.replace( /<[^>]+data-wpview-marker="([^"]+)"[^>]*>[^>]+>/g, callback );
+
+                        return content;
+                },
+
+                /**
                  * Create a view instance.
                  *
                  * @param {String} type    The view type.
@@ -298 +319 @@
                 /**
                  * Renders all view nodes tied to this view instance that are not yet rendered.
                  *
+                 * @param {String} content The content to render. Optional.
                  * @param {Boolean} force Rerender all view nodes tied to this view instance.
                  */
-                render: function( force ) {
+                render: function( content, force ) {
+                        if ( content != null ) {
+                                this.content = content;
+                        }
+
+                        content = this.getContent();
+
                         // If there's nothing to render an no loader needs to be shown, stop.
-                        if ( ! this.loader && ! this.getContent() ) {
+                        if ( ! this.loader && ! content ) {
                                 return;
                         }
 
                         // We're about to rerender all views of this instance, so unbind rendered views.
-                        force && this.unbind();
+                        force && this.unbindAll();
 
                         // Replace any left over markers.
                         this.replaceMarkers();
 
-                        if ( this.getContent() ) {
-                                this.setContent( this.getContent(), function( editor, node ) {
-                                        $( node ).data( 'rendered', true ).trigger( 'wp-mce-view-bind' );
+                        if ( content ) {
+                                this.setContent( content, function( editor, node ) {
+                                        $( node ).data( 'rendered', true );
+                                        this.bind.apply( this, arguments );
                                 }, force ? null : false );
                         } else {
                                 this.setLoader();
@@ -322 +351 @@
                 },
 
                 /**
+                 * Binds a given node after its content is added to the DOM.
+                 */
+                bind: function() {},
+
+                /**
+                 * Unbinds a given node before its content is removed from the DOM.
+                 */
+                unbind: function() {},
+
+                /**
                  * Unbinds all view nodes tied to this view instance.
                  * Runs before their content is removed from the DOM.
                  */
-                unbind: function() {
+                unbindAll: function() {
                         this.getNodes( function( editor, node ) {
+                                this.unbind.apply( this, arguments );
                                 $( node ).trigger( 'wp-mce-view-unbind' );
                         }, true );
                 },
@@ -461 +501 @@
                  * @param {Boolean}  rendered Only set for (un)rendered nodes. Optional.
                  */
                 setIframes: function( head, body, callback, rendered ) {
-                        var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
+                        var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver,
+                                self = this;
 
                         this.getNodes( function( editor, node, content ) {
                                 // Seems Firefox needs a bit of time to insert/set the view nodes,
@@ -582 +623 @@
                                                 editor.off( 'wp-body-class-change', classChange );
                                         } );
 
-                                        callback && callback.apply( this, arguments );
+                                        callback && callback.apply( self, arguments );
                                 }, 50 );
                         }, rendered );
                 },
@@ -663 +704 @@
                  * @param {HTMLElement}    node   The view node to remove.
                  */
                 remove: function( editor, node ) {
+                        this.unbind.call( this, editor, node, $( node ).find( '.wpview-content' ).get( 0 ) );
                         $( node ).trigger( 'wp-mce-view-unbind' );
                         editor.dom.remove( node );
                 }
@@ -726 +768 @@
                                         }
                                 } );
 
-                                self.content = self.template( {
+                                self.render( self.template( {
                                         attachments: attachments,
                                         columns: attrs.columns ? parseInt( attrs.columns, 10 ) : wp.media.galleryDefaults.columns
-                                } );
-
-                                self.render();
+                                } ) );
                         } )
                         .fail( function( jqXHR, textStatus ) {
                                 self.setError( textStatus );
@@ -752 +792 @@
                                 } );
                         }
 
-                        wp.ajax.send( this.action, {
-                                data: {
-                                        post_ID: postID,
-                                        type: this.shortcode.tag,
-                                        shortcode: this.shortcode.string()
-                                }
+                        wp.ajax.post( this.action, {
+                                post_ID: postID,
+                                type: this.shortcode.tag,
+                                shortcode: this.shortcode.string()
                         } )
                         .done( function( response ) {
-                                self.content = response;
-                                self.render();
+                                self.render( response );
                         } )
                         .fail( function( response ) {
                                 if ( self.url ) {

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

@@ -151 +151 @@
                 };
         }
 
-        // Remove the content of view wrappers from HTML string
-        function emptyViews( content ) {
-                return content.replace(/<div[^>]+data-wpview-text=\"([^"]+)"[^>]*>[\s\S]+?wpview-selection-after[^>]+>(?:&nbsp;|\u00a0)*<\/p><\/div>/g, '$1' );
-        }
-
         // Prevent adding undo levels on changes inside a view wrapper
         editor.on( 'BeforeAddUndo', function( event ) {
-                if ( event.lastLevel && emptyViews( event.level.content ) === emptyViews( event.lastLevel.content ) ) {
-                        event.preventDefault();
+                if ( event.level.content ) {
+                        event.level.content = wp.mce.views.reset( event.level.content );
                 }
-        });
+        } );
 
         // When the editor's content changes, scan the new content for
         // matching view patterns, and transform the matches into
@@ -169 +164 @@
         editor.on( 'BeforeSetContent', function( event ) {
                 var node;
 
-                if ( ! event.content ) {
+                if ( ! event.selection ) {
+                        wp.mce.views.unbind();
+                }
+
+                if ( ! event.content || event.wphide ) {
                         return;
                 }
 
@@ -330 +329 @@
                 }
         });
 
-        editor.on( 'PreProcess', function( event ) {
-                // Empty the wpview wrap nodes
-                tinymce.each( editor.dom.select( 'div[data-wpview-text]', event.node ), function( node ) {
-                        node.textContent = node.innerText = '\u00a0';
-                });
-    });
+        editor.on( 'PostProcess', function( event ) {
+                event.content = wp.mce.views.reset( event.content );
+        } );
 
-    editor.on( 'PostProcess', function( event ) {
-                if ( event.content ) {
-                        event.content = event.content.replace( /<div [^>]*?data-wpview-text="([^"]*)"[^>]*>[\s\S]*?<\/div>/g, function( match, shortcode ) {
-                                if ( shortcode ) {
-                                        return '<p>' + window.decodeURIComponent( shortcode ) + '</p>';
-                                }
-                                return ''; // If error, remove the view wrapper
-                        });
-                }
-        });
+        editor.on( 'hide', function() {
+                var data = editor.undoManager.data;
+
+                editor.setContent( data[ data.length - 1 ].content, { format: 'raw', wphide: true } );
+        } );
 
         // Excludes arrow keys, delete, backspace, enter, space bar.
         // Ref: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.keyCode