Merge branch 'master' into ff-travis

.gitignore

@@ -19,6 +19,7 @@ dist/
 docs/
 tmp
 coverage/
+.build_cache/
 
 # Test
 .chrome

CHANGES.md

@@ -1,6 +1,26 @@
 videojs-wavesurfer changelog
 ============================
 
+2.8.0 - unreleased
+------------------
+
+- Move event types to separate class
+
+
+2.7.0 - 2019/02/08
+------------------
+
+- Fix hiding `playToggle` control
+- Fix ES export syntax for `Wavesurfer`
+
+
+2.6.4 - 2019/02/04
+------------------
+
+- Bump required wavesurfer.js version to 2.1.3 for Safari browser
+  improvement
+
+
 2.6.3 - 2018/12/03
 ------------------
 

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2018 Collab
+Copyright (c) 2014-2019 Collab
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -13,6 +13,8 @@ input](#microphone-plugin).
 [![License](https://img.shields.io/npm/l/videojs-wavesurfer.svg)](LICENSE)
 [![Build Status](https://travis-ci.org/collab-project/videojs-wavesurfer.svg?branch=master)](https://travis-ci.org/collab-project/videojs-wavesurfer)
 [![Coverage Status](https://coveralls.io/repos/github/collab-project/videojs-wavesurfer/badge.svg?branch=master)](https://coveralls.io/github/collab-project/videojs-wavesurfer?branch=master)
+![Size](https://img.shields.io/bundlephobia/minzip/videojs-wavesurfer.svg?style=flat)
+![Stars](https://img.shields.io/github/stars/collab-project/videojs-wavesurfer.svg?style=social)
 
 Table of Contents
 -----------------

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "videojs-wavesurfer",
-  "version": "2.6.3",
+  "version": "2.7.0",
   "homepage": "https://github.com/collab-project/videojs-wavesurfer",
   "description": "video.js plugin that adds a navigable waveform for audio and video files.",
   "license": "MIT",
@@ -37,6 +37,6 @@
   ],
   "dependencies": {
     "video.js": ">=6.0.0",
-    "wavesurfer.js": ">=2.1.1"
+    "wavesurfer.js": ">=2.1.3"
   }
 }

build-config/fragments/common.js

@@ -62,7 +62,10 @@ module.exports = {
                 include: path.resolve(rootDir, 'src', 'js'),
                 exclude: /(node_modules|bower_components|test)/,
                 use: {
-                    loader: 'babel-loader'
+                    loader: 'babel-loader',
+                    options: {
+                        comments: false
+                    }
                 }
             },
             {

build-config/fragments/dev.js

@@ -10,7 +10,6 @@ const contentBase = path.resolve(__dirname, '..', '..');
 
 module.exports = {
     mode: 'development',
-    devtool: 'source-map',
     devServer: {
         contentBase: [contentBase],
         publicPath: 'localhost:8080/dist/',

build-config/fragments/main.js

@@ -4,7 +4,8 @@
  */
 
 const path = require('path');
-const sourceDir = path.resolve(__dirname, '..', '..', 'src');
+const rootDir = path.resolve(__dirname, '..', '..');
+const sourceDir = path.join(rootDir, 'src');
 
 module.exports = {
     entry: {
@@ -16,7 +17,7 @@ module.exports = {
         ]
     },
     output: {
-        path: path.resolve(__dirname, '..', '..', 'dist'),
+        path: path.join(rootDir, 'dist'),
         filename: '[name].js',
         library: 'VideojsWavesurfer'
     }

build-config/fragments/prod.js

@@ -9,11 +9,17 @@ const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 
 module.exports = {
     mode: 'production',
-    devtool: 'source-map',
     optimization: {
         minimizer: [
             new TerserPlugin({
-                sourceMap: true
+                sourceMap: false,
+                parallel: true,
+                cache: './.build_cache/terser',
+                terserOptions: {
+                    output: {
+                        comments: false
+                    }
+                }
             }),
             new OptimizeCSSAssetsPlugin({})
         ]

examples/fluid.html

@@ -82,7 +82,7 @@
     });
 
     // error handling
-    player.on('error', function(error) {
+    player.on('error', function(element, error) {
         console.warn('ERROR:', error);
     });
 }

examples/index.html

@@ -31,7 +31,7 @@
 var player;
 var options = {
     controls: true,
-    autoplay: true,
+    autoplay: false,
     fluid: false,
     loop: false,
     width: 600,
@@ -84,7 +84,7 @@
     });
 
     // error handling
-    player.on('error', function(error) {
+    player.on('error', function(element, error) {
         console.warn('ERROR:', error);
     });
 }

examples/input.html

@@ -152,8 +152,8 @@
     });
 
     // error handling
-    player.on('error', function(error) {
-        console.log('error:', error);
+    player.on('error', function(element, error) {
+        console.warn('ERROR:', error);
     });
 };
 </script>

examples/live.html

@@ -81,7 +81,7 @@
     });
 
     // error handling
-    player.on('error', function(error) {
+    player.on('error', function(element, error) {
         console.warn('ERROR:', error);
     });
 }

examples/output.html

@@ -147,8 +147,8 @@
 });
 
 // error handling
-player.on('error', function(error) {
-    console.log('error:', error);
+player.on('error', function(element, error) {
+    console.warn('ERROR:', error);
 });
 </script>
 

examples/plugin.html

@@ -31,7 +31,7 @@
 var player;
 var options = {
     controls: true,
-    autoplay: true,
+    autoplay: false,
     fluid: false,
     loop: false,
     width: 600,

examples/texttrack.html

@@ -40,7 +40,7 @@
 ];
 var options = {
     controls: true,
-    autoplay: true,
+    autoplay: false,
     fluid: false,
     width: 600,
     height: 300,
@@ -94,7 +94,7 @@
     });
 
     // error handling
-    player.on('error', function(error) {
+    player.on('error', function(element, error) {
         console.warn('ERROR:', error);
     });
 }

examples/video.html

@@ -29,7 +29,7 @@
 var player;
 var options = {
     controls: true,
-    autoplay: true,
+    autoplay: false,
     fluid: false,
     loop: false,
     width: 600,
@@ -83,7 +83,7 @@
     });
 
     // error handling
-    player.on('error', function(error) {
+    player.on('error', function(element, error) {
         console.warn('ERROR:', error);
     });
 }