Ticket #27389: 27389.9.diff

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

@@ -41 +41 @@
                                         doc = editor.getDoc();
                                         $( doc ).find( '[data-wpview-text="' + this.encodedText + '"]' ).each(function (i, elem) {
                                                 var node = $( elem );
-                                                node.html( html );
+                                                // The <ins> is used to mark the end of the wrapper div. Needed when comparing
+                                                // the content as string for preventing extra undo levels.
+                                                node.html( html ).append( '<ins data-wpview-end="1"></ins>' );
                                                 $( self ).trigger( 'ready', elem );
                                         });
                                 }
                         }, this );
-                }
+                },
+                unbind: function() {}
         } );
 
         // take advantage of the Backbone extend method
@@ -93 +96 @@
                 },
 
                 /**
+                 * wp.mce.views.unbind( editor )
+                 *
+                 * The editor DOM is being rebuilt.
+                 * Fire an event for DOM cleanup for the passed TinyMCE instance.
+                 */
+                unbind: function() {
+                        _.each( instances, function( instance ) {
+                                instance.unbind();
+                        } );
+                },
+
+                /**
                  * toViews( content )
                  * Scans a `content` string for each view's pattern, replacing any
                  * matches with wrapper elements, and creates a new instance for
@@ -339 +354 @@
          * @mixin
          */
         wp.mce.media = {
+                loaded: false,
                 /**
                  * @global wp.shortcode
                  *
@@ -410 +426 @@
          */
         wp.mce.media.View = wp.mce.View.extend({
                 initialize: function( options ) {
+                        this.players = [];
                         this.shortcode = options.shortcode;
                         _.bindAll( this, 'setPlayer' );
                         $(this).on( 'ready', this.setPlayer );
@@ -460 +477 @@
                         media = wp.media.view.MediaDetails.prepareSrc( media.get(0) );
 
                         setTimeout( function() {
-                                self.player = new MediaElementPlayer( media, this.mejsSettings );
-                        }, 75 );
+                                wp.mce.media.loaded = true;
+                                self.players.push( new MediaElementPlayer( media, self.mejsSettings ) );
+                        }, wp.mce.media.loaded ? 10 : 500 );
                 },
 
                 /**
@@ -475 +493 @@
                                 wp.media[ this.shortcode.tag ].defaults
                         );
                         return this.template({ model: attrs });
+                },
+
+                unbind: function() {
+                        var self = this;
+                        this.pauseAllPlayers();
+                        _.each( this.players, function (player) {
+                                self.removePlayer( player );
+                        } );
+                        this.players = [];
                 }
         });
         _.extend( wp.mce.media.View.prototype, wp.media.mixin );

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

@@ -128 +128 @@
                  *      MediaElement tries to pull the audio/video tag out of
                  *      its container and re-add it to the DOM.
                  */
-                removePlayer: function() {
-                        var t = this.player, featureIndex, feature;
+                removePlayer: function(t) {
+                        var featureIndex, feature;
 
                         // invoke features cleanup
                         for ( featureIndex in t.options.features ) {
@@ -165 +165 @@
                 unsetPlayer : function() {
                         if ( this.player ) {
                                 wp.media.mixin.pauseAllPlayers();
-                                wp.media.mixin.removePlayer.apply( this );
+                                wp.media.mixin.removePlayer( this.player );
                                 this.player = false;
                         }
                 }
@@ -914 +914 @@
 
         $( init );
 
-}(jQuery, _, Backbone));
- No newline at end of file
+}(jQuery, _, Backbone));

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

@@ -80 +80 @@
                         'contenteditable': 'true'
                 }, getViewText( viewNode ) );
 
-                viewNode.appendChild( clipboard );
+                // Prepend inside the wrapper
+                viewNode.insertBefore( clipboard, viewNode.firstChild );
 
                 // Both of the following are necessary to prevent manipulating the selection/focus
-                editor.dom.bind( clipboard, 'beforedeactivate focusin focusout', _stop );
-                editor.dom.bind( selected, 'beforedeactivate focusin focusout', _stop );
+                dom.bind( clipboard, 'beforedeactivate focusin focusout', _stop );
+                dom.bind( selected, 'beforedeactivate focusin focusout', _stop );
 
                 // Make sure that the editor is focused.
                 // It is possible that the editor is not focused when the mouse event fires
@@ -140 +141 @@
                 return;
         }
 
+        function emptyViews( content ) {
+                return content.replace(/(<div[^>]+wpview-wrap[^>]+>)[\s\S]+?data-wpview-end[^>]*><\/ins><\/div>/g, '$1</div>' );
+        }
+
         editor.on( 'BeforeAddUndo', function( event ) {
-                if ( selected && ! toRemove ) {
+                if ( event.lastLevel && emptyViews( event.level.content ) === emptyViews( event.lastLevel.content ) ) {
                         event.preventDefault();
                 }
         });
@@ -149 +154 @@
         // When the editor's content changes, scan the new content for
         // matching view patterns, and transform the matches into
         // view wrappers.
-        editor.on( 'BeforeSetContent', function( e ) {
-                if ( ! e.content ) {
+        editor.on( 'BeforeSetContent', function( event ) {
+                if ( ! event.content ) {
                         return;
                 }
 
-                e.content = wp.mce.views.toViews( e.content );
+                if ( ! event.initial ) {
+                        wp.mce.views.unbind( editor );
+                }
+
+                event.content = wp.mce.views.toViews( event.content );
         });
 
         // When the editor's content has been updated and the DOM has been
@@ -162 +171 @@
         editor.on( 'SetContent', function( event ) {
                 var body, padNode;
 
-                // don't (re-)render views if the format of the content is raw
-                // to avoid adding additional undo levels on undo/redo
-                if ( event.format !== 'raw' ) {
-                        wp.mce.views.render();
-                }
+                wp.mce.views.render();
 
                 // Add padding <p> if the noneditable node is last
                 if ( event.load || ! event.set ) {