Changeset 41781

Timestamp:

10/06/2017 04:31:01 PM (9 years ago)

Author:

joemcgill

Message:

Media: Fix MEJS error when removing a media player.

This fixes a bug introduced by the upgrade to MediaElement.js, where code
calling wp.media.mixin.removePlayer() would result in a JS error.

Props rafa8626, afercia.
Fixes #41787.

Location:

trunk/src/wp-includes/js

Files:

• media-audiovideo.js (modified) (2 diffs)
• media/audiovideo.manifest.js (modified) (2 diffs)

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

@@ -130 +130 @@
 
                 if ( ! t.isDynamic ) {
-                        t.$node.remove();
-                }
-
-                if ( 'native' !== t.media.pluginType ) {
-                        t.$media.remove();
+                        t.node.remove();
+                }
+
+                if ( 'html5' !== t.media.rendererName ) {
+                        t.media.remove();
                 }
 
@@ -140 +140 @@
 
                 t.container.remove();
-                t.globalUnbind();
-                delete t.node.player;
+                t.globalUnbind('resize', t.globalResizeCallback);
+                t.globalUnbind('keydown', t.globalKeydownCallback);
+                t.globalUnbind('click', t.globalClickCallback);
+                delete t.media.player;
         },
 

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

@@ -61 +61 @@
 
                 if ( ! t.isDynamic ) {
-                        t.$node.remove();
-                }
-
-                if ( 'native' !== t.media.pluginType ) {
-                        t.$media.remove();
+                        t.node.remove();
+                }
+
+                if ( 'html5' !== t.media.rendererName ) {
+                        t.media.remove();
                 }
 
@@ -71 +71 @@
 
                 t.container.remove();
-                t.globalUnbind();
-                delete t.node.player;
+                t.globalUnbind('resize', t.globalResizeCallback);
+                t.globalUnbind('keydown', t.globalKeydownCallback);
+                t.globalUnbind('click', t.globalClickCallback);
+                delete t.media.player;
         },