Changeset 34346

Timestamp:

09/20/2015 03:16:23 AM (9 years ago)

Author:

wonderboymusic

Message:

MediaElement, update wp-mediaelement.js:

• create a public initialize method on the wp.mediaelement namespace
• make it idempotent to prevent nasty side-effects caused by initializing media elements more than once

Props bradyvercher.
Fixes #32423.

File:

• trunk/src/wp-includes/js/mediaelement/wp-mediaelement.js (modified) (1 diff)

trunk/src/wp-includes/js/mediaelement/wp-mediaelement.js

@@ -1 +1 @@
 /* global mejs, _wpmejsSettings */
-(function ($) {
+(function( window, $ ) {
+
+    window.wp = window.wp || {};
+
     // add mime-type aliases to MediaElement plugin support
     mejs.plugins.silverlight[0].types.push('video/x-ms-wmv');
     mejs.plugins.silverlight[0].types.push('audio/x-ms-wma');
 
-    $(function () {
+    function wpMediaElement() {
         var settings = {};
 
-        if ( typeof _wpmejsSettings !== 'undefined' ) {
-            settings = _wpmejsSettings;
+        /**
+         * Initialize media elements.
+         *
+         * Ensures media elements that have already been initialized won't be
+         * processed again.
+         *
+         * @since 4.4.0
+         */
+        function initialize() {
+            if ( typeof _wpmejsSettings !== 'undefined' ) {
+                settings = _wpmejsSettings;
+            }
+
+            settings.success = settings.success || function (mejs) {
+                var autoplay, loop;
+
+                if ( 'flash' === mejs.pluginType ) {
+                    autoplay = mejs.attributes.autoplay && 'false' !== mejs.attributes.autoplay;
+                    loop = mejs.attributes.loop && 'false' !== mejs.attributes.loop;
+
+                    autoplay && mejs.addEventListener( 'canplay', function () {
+                        mejs.play();
+                    }, false );
+
+                    loop && mejs.addEventListener( 'ended', function () {
+                        mejs.play();
+                    }, false );
+                }
+            };
+
+            // Only initialize new media elements.
+            $( '.wp-audio-shortcode, .wp-video-shortcode' )
+                .not( '.mejs-container' )
+                .filter(function () {
+                    return ! $( this ).parent().hasClass( '.mejs-mediaelement' );
+                })
+                .mediaelementplayer( settings );
         }
 
-        settings.success = settings.success || function (mejs) {
-            var autoplay, loop;
+        return {
+            initialize: initialize
+        };
+    }
 
-            if ( 'flash' === mejs.pluginType ) {
-                autoplay = mejs.attributes.autoplay && 'false' !== mejs.attributes.autoplay;
-                loop = mejs.attributes.loop && 'false' !== mejs.attributes.loop;
+    window.wp.mediaelement = new wpMediaElement();
 
-                autoplay && mejs.addEventListener( 'canplay', function () {
-                    mejs.play();
-                }, false );
+    $( document ).on( 'ready', window.wp.mediaelement.initialize );
 
-                loop && mejs.addEventListener( 'ended', function () {
-                    mejs.play();
-                }, false );
-            }
-        };
-
-        $('.wp-audio-shortcode, .wp-video-shortcode').mediaelementplayer( settings );
-    });
-
-}(jQuery));
+})( window, jQuery );