Merge 41f4f93 into 0594d5c

CHANGES.md

@@ -1,5 +1,11 @@
 # videojs-wavesurfer changelog
 
+## 3.10.0 - unreleased
+
+- Fix deprecation warnings for video.js v8.x
+- Limit wavesurfer.js version; v7.x or newer is not supported
+
+
 ## 3.9.0 - 2022/10/03
 
 - Bump required wavesurfer.js version to 6.3.0 or newer

karma.conf.js

@@ -131,6 +131,13 @@ module.exports = function(config) {
                     if (ch > -1) {
                         availableBrowsers[ch] = 'Chromium_dev';
                     }
+                    if (availableBrowsers.indexOf('IE') > -1) {
+                        // remove obsolete IE
+                        let i = result.indexOf('IE');
+                        if (i !== -1) {
+                            result.splice(i, 1);
+                        }
+                    }
                     return result;
                 }
             }

src/js/videojs.wavesurfer.js

@@ -46,7 +46,12 @@ class Wavesurfer extends Plugin {
         player.addClass(wavesurferStyleName);
 
         // parse options
-        options = videojs.mergeOptions(pluginDefaultOptions, options);
+        if (videojs.obj !== undefined) {
+            // video.js v8 and newer
+            options = videojs.obj.merge(pluginDefaultOptions, options);
+        } else {
+            options = videojs.mergeOptions(pluginDefaultOptions, options);
+        }
         this.waveReady = false;
         this.waveFinished = false;
         this.liveMode = false;
@@ -826,7 +831,12 @@ class Wavesurfer extends Plugin {
     setFormatTime(customImplementation) {
         this._formatTime = customImplementation;
 
-        videojs.setFormatTime(this._formatTime);
+        if (videojs.time) {
+            // video.js v8 and newer
+            videojs.time.setFormatTime(this._formatTime);
+        } else {
+            videojs.setFormatTime(this._formatTime);
+        }
     }
 }
 

test/test-helpers.js

@@ -4,7 +4,7 @@
 
 import document from 'global/document';
 
-import {Player, mergeOptions} from 'video.js';
+import {Player, obj} from 'video.js';
 
 const TestHelpers = {
 
@@ -75,7 +75,7 @@ const TestHelpers = {
         document.getElementsByTagName('body')[0].appendChild(elementTag);
 
         // default options
-        let opts = mergeOptions({
+        let opts = obj.merge({
             controls: true,
             autoplay: false,
             fluid: false,