Changeset 29272

Timestamp:

07/22/2014 09:48:41 PM (10 years ago)

Author:

azaozz

Message:

wpView: consolidate pausePlayers() and unsetPlayers(), they are almost the same. Prevent errors when instead of a player ME.js shows only a "Download File" placeholder (in IE). See #28905.

File:

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

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

@@ -505 +505 @@
                 this.shortcode = options.shortcode;
 
-                _.bindAll( this, 'setIframes', 'setNodes', 'fetch', 'pausePlayers' );
+                _.bindAll( this, 'setIframes', 'setNodes', 'fetch', 'stopPlayers' );
                 $( this ).on( 'ready', this.setNodes );
 
-                $( document ).on( 'media:edit', this.pausePlayers );
+                $( document ).on( 'media:edit', this.stopPlayers );
 
                 this.fetch();
 
                 this.getEditors( function( editor ) {
-                    editor.on( 'hide', self.pausePlayers );
+                    editor.on( 'hide', self.stopPlayers );
                 });
             },
@@ -554 +554 @@
             },
 
-            pausePlayers: function() {
+            stopPlayers: function( remove ) {
+                var rem = remove === 'remove';
+
                 this.getNodes( function( editor, node, content ) {
                     var p, win,
@@ -560 +562 @@
 
                     if ( iframe && ( win = iframe.contentWindow ) && win.mejs ) {
-                        for ( p in win.mejs.players ) {
-                            win.mejs.players[p].pause();
-                        }
+                        // Sometimes ME.js may show a "Download File" placeholder and player.remove() doesn't exist there.
+                        try {
+                            for ( p in win.mejs.players ) {
+                                win.mejs.players[p].pause();
+
+                                if ( rem ) {
+                                    win.mejs.players[p].remove();
+                                }
+                            }
+                        } catch( er ) {}
                     }
                 });
             },
 
-            unsetPlayers: function() {
-                this.getNodes( function( editor, node, content ) {
-                    var p, win,
-                        iframe = $( 'iframe.wpview-sandbox', content ).get(0);
-
-                    if ( iframe && ( win = iframe.contentWindow ) && win.mejs ) {
-                        for ( p in win.mejs.players ) {
-                            win.mejs.players[p].remove();
-                        }
-                    }
-                });
-            },
-
             unbind: function() {
-                this.pausePlayers();
-                this.unsetPlayers();
+                this.stopPlayers( 'remove' );
             }
         },