Merge pull request #27 from ganigeorgiev/master

Added video.js v6 support
Peer5 · Aug 29, 2017 · a2a5ff6 · a2a5ff6
2 parents 7db656f + 3ca5be6
commit a2a5ff6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/videojs5.hlsjs.js → src/videojs.hlsjs.js b/src/videojs5.hlsjs.js → src/videojs.hlsjs.js
@@ -150,8 +150,16 @@ var HlsSourceHandler = {
 if (Hls.isSupported()) {
   var videojs = require('video.js'); // resolved UMD-wise through webpack
 
+  // support es6 style import
+  videojs = videojs.default || videojs;
+
   if (videojs) {
-    videojs.getComponent('Html5').registerSourceHandler(HlsSourceHandler, 0);
+    var html5Tech = videojs.getTech && videojs.getTech('Html5'); // videojs6 (partially on videojs5 too)
+    html5Tech = html5Tech || (videojs.getComponent && videojs.getComponent('Html5')); // videojs5
+
+    if (html5Tech) {
+      html5Tech.registerSourceHandler(HlsSourceHandler, 0);
+    }
   }
   else {
     console.warn('videojs-contrib-hls.js: Couldn\'t find find window.videojs nor require(\'video.js\')');

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = {
-  entry: __dirname + '/src/videojs5.hlsjs',
+  entry: __dirname + '/src/videojs.hlsjs',
   devtool: 'source-map',
   output: {
     path: __dirname + '/dist',