Merge pull request #14514 from edx/ammar/tnl-6513-frontend-hls-support

HLS playback support in video player

lms/static/karma_lms_coffee.conf.js

@@ -35,6 +35,7 @@ var options = {
         {pattern: 'xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/jquery-ui.min.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js', included: true},
+        {pattern: 'common/js/vendor/hls.js', included: true},
 
         {pattern: 'xmodule_js/src/capa/*.js', included: true},
         {pattern: 'xmodule_js/src/video/*.js', included: true},

lms/static/lms/js/require-config.js

@@ -108,7 +108,8 @@
             'handlebars': 'js/vendor/ova/catch/js/handlebars-1.1.2',
             'tinymce': 'js/vendor/tinymce/js/tinymce/tinymce.full.min',
             'jquery.tinymce': 'js/vendor/tinymce/js/tinymce/jquery.tinymce.min',
-            'picturefill': 'common/js/vendor/picturefill'
+            'picturefill': 'common/js/vendor/picturefill',
+            'hls': 'common/js/vendor/hls'
             // end of files needed by OVA
         },
         shim: {
@@ -224,6 +225,9 @@
             // global namespace instead of being registered in require.
             'draggabilly': {
                 exports: 'Draggabilly'
+            },
+            'hls': {
+                exports: 'Hls'
             }
         }
     });

lms/static/lms/js/spec/main_requirejs_coffee.js

@@ -35,11 +35,14 @@
         baseUrl: '/base/',
         paths: {
             moment: 'xmodule_js/common_static/common/js/vendor/moment-with-locales',
-            'draggabilly': 'xmodule_js/common_static/js/vendor/draggabilly',
-            'edx-ui-toolkit': 'edx-ui-toolkit'
+            draggabilly: 'xmodule_js/common_static/js/vendor/draggabilly',
+            'edx-ui-toolkit': 'edx-ui-toolkit',
+            hls: 'common/js/vendor/hls'
         },
-        'moment': {
-            exports: 'moment'
+        shim: {
+            moment: {
+                exports: 'moment'
+            }
         }
     });
 }).call(this, RequireJS.requirejs, RequireJS.define);