Ticket #31412: 31412.8.patch

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

@@ -651 +651 @@
                         var media = wp.media[ this.type ],
                                 frame = media.edit( text );
 
-                        this.stopPlayers && this.stopPlayers();
+                        this.pausePlayers && this.pausePlayers();
 
                         _.each( this.state, function( state ) {
                                 frame.state( state ).on( 'update', function( selection ) {
@@ -728 +728 @@
                                 self.render();
                         } )
                         .fail( function( response ) {
-                                if ( self.type === 'embedURL' ) {
+                                if ( self.url ) {
                                         self.removeMarkers();
                                 } else {
                                         self.setError( response.message || response.statusText, 'admin-media' );
@@ -737 +737 @@
 
                         this.getEditors( function( editor ) {
                                 editor.on( 'wpview-selected', function() {
-                                        self.stopPlayers();
+                                        self.pausePlayers();
                                 } );
                         } );
                 },
 
-                stopPlayers: function( remove ) {
+                pausePlayers: function() {
                         this.getNodes( function( editor, node, content ) {
                                 var win = $( 'iframe.wpview-sandbox', content ).get( 0 );
 
                                 if ( win && ( win = win.contentWindow ) && win.mejs ) {
                                         _.each( win.mejs.players, function( player ) {
                                                 try {
-                                                        player[ remove ? 'remove' : 'pause' ]();
+                                                        player.pause();
                                                 } catch ( e ) {}
                                         } );
                                 }
@@ -762 +762 @@
 
                 edit: function( text, update ) {
                         var media = wp.media.embed,
-                                isURL = 'embedURL' === this.type,
-                                frame = media.edit( text, isURL );
+                                frame = media.edit( text, !! this.url ),
+                                self = this;
 
-                        this.stopPlayers();
+                        this.pausePlayers();
 
                         frame.state( 'embed' ).props.on( 'change:url', function( model, url ) {
                                 if ( url ) {
@@ -774 +774 @@
                         } );
 
                         frame.state( 'embed' ).on( 'select', function() {
-                                if ( isURL ) {
+                                if ( self.url ) {
                                         update( frame.state( 'embed' ).metadata.url );
                                 } else {
                                         update( media.shortcode( frame.state( 'embed' ).metadata ).string() );
@@ -808 +808 @@
         views.register( 'embedURL', _.extend( {}, embed, {
                 match: function( content ) {
                         var re = /(^|<p>)(https?:\/\/[^\s"]+?)(<\/p>\s*|$)/gi,
-                                match = re.exec( tinymce.trim( content ) );
+                                match = re.exec( content );
 
                         if ( match ) {
                                 return {