Changeset 29191

Timestamp:

07/16/2014 06:18:18 PM (10 years ago)

Author:

wonderboymusic

Message:

Cleanup after [29179]:

• Pause players when media is edited via modal
• Remove players on unind
• Account for failure when an empty node is passed to an mce.view.View

See #28905.

File:

• trunk/src/wp-includes/js/mce-view.js (modified) (3 diffs)

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

@@ -130 +130 @@
 
                     node = $( node ).find( '.wpview-content' )[0];
-
-                    if ( node ) {
-                        node.innerHTML = '';
-                    }
+                    if ( ! node ) {
+                        return;
+                    }
+                    node.innerHTML = '';
 
                     iframe = dom.add( node, 'iframe', {
@@ -512 +512 @@
                 _.bindAll( this, 'createIframe', 'setNode', 'fetch', 'pausePlayers' );
                 $( this ).on( 'ready', this.setNode );
+
+                $( document ).on( 'media:edit', this.pausePlayers );
             },
 
             setNode: function ( event, editor, node ) {
-                this.node = node;
+                if ( node ) {
+                    this.node = node;
+                }
                 editor.on( 'hide', this.pausePlayers );
 
@@ -574 +578 @@
             pausePlayers: function() {
                 var p, win = $( 'iframe', this.node ).get(0).contentWindow;
-                if ( win.mejs ) {
+                if ( win && win.mejs ) {
                     for ( p in win.mejs.players ) {
                         win.mejs.players[p].pause();
+                    }
+                }
+            },
+
+            unsetPlayers: function() {
+                var p, win = $( 'iframe', this.node ).get(0).contentWindow;
+                if ( win && win.mejs ) {
+                    for ( p in win.mejs.players ) {
                         win.mejs.players[p].remove();
                     }
                 }
+            },
+
+            unbind: function() {
+                this.pausePlayers();
+                this.unsetPlayers();
             }
         },