MDL-57101 media_videojs: Dynamic loader works on self-matching nodes

eSrem · Dec 1, 2016 · b52c562 · b52c562
1 parent 36e6789
commit b52c562
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/media/player/videojs/amd/build/loader.min.js b/media/player/videojs/amd/build/loader.min.js
diff --git a/media/player/videojs/amd/src/loader.js b/media/player/videojs/amd/src/loader.js
@@ -40,8 +40,15 @@ define(['jquery', 'media_videojs/video'], function($, videojs) {
      * @param {NodeList} nodes List of new nodes.
      */
     var notifyVideoJS = function(e, nodes) {
-        nodes.find('.mediaplugin_videojs audio, .mediaplugin_videojs video')
-            .each(function() {
+        var selector = '.mediaplugin_videojs';
+
+        // Find the descendants matching the expected parent of the audio and video
+        // tags. Then also addBack the nodes matching the same selector. Finally,
+        // we find the audio and video tags contained in those parents. Kind thanks
+        // to jQuery for the simplicity.
+        nodes.find(selector)
+            .addBack(selector)
+            .find('audio, video').each(function() {
                 var id = $(this).attr('id'),
                     config = $(this).data('setup');