Merge videojs-contrib-hls master into http-streaming master

README.md

@@ -60,6 +60,7 @@ Maintenance Status: Stable
   - [Segment Metadata](#segment-metadata)
 - [Hosting Considerations](#hosting-considerations)
 - [Known Issues](#known-issues)
+  - [IE10 and Below](#ie10-and-below)
   - [Fragmented MP4 Support](#fragmented-mp4-support)
 - [Testing](#testing)
 - [Debugging](#debugging)
@@ -80,7 +81,7 @@ npm install --save @videojs/http-streaming
 ```
 
 ### CDN
-Select a version of HLS from the [CDN](https://unpkg.com/@videojs/http-streaming/dist/)
+Select a version of VHS from the [CDN](https://unpkg.com/@videojs/http-streaming/dist/)
 
 ### Releases
 Download a release of [videojs-http-streaming](https://github.com/videojs/http-streaming/releases)
@@ -632,6 +633,9 @@ and most CDNs should have no trouble turning CORS on for your account.
 Issues that are currenty known with workarounds. If you want to
 help find a solution that would be appreciated!
 
+### IE10 and Below
+As of version 5.0.0, IE10 and below are no longer supported.
+
 ### Fragmented MP4 Support
 Edge has native support for HLS but only in the MPEG2-TS container. If
 you attempt to play an HLS stream with fragmented MP4 segments, Edge

package.json

@@ -128,10 +128,10 @@
     "qunitjs": "^2.0.1",
     "serve-static": "^1.10.0",
     "shelljs": "^0.5.3",
-    "sinon": "1.10.2",
+    "sinon": "1.10.3",
     "uglify-js": "^2.5.0",
     "videojs-contrib-eme": "^3.0.0",
-    "videojs-contrib-quality-levels": "^2.0.2",
+    "videojs-contrib-quality-levels": "^2.0.4",
     "videojs-standard": "^4.0.3",
     "videojs-swf": "^5.2.0",
     "watchify": "^3.6.0",

test/videojs-http-streaming.test.js

@@ -1891,15 +1891,21 @@ QUnit.test('remove event handlers on dispose', function(assert) {
   let unscoped = 0;
 
   player = createPlayer();
-  player.on = function(owner) {
-    if (typeof owner !== 'object') {
+
+  const origPlayerOn = player.on.bind(player);
+  const origPlayerOff = player.off.bind(player);
+
+  player.on = function(...args) {
+    if (typeof args[0] !== 'object') {
       unscoped++;
     }
+    origPlayerOn(...args);
   };
-  player.off = function(owner) {
-    if (typeof owner !== 'object') {
+  player.off = function(...args) {
+    if (typeof args[0] !== 'object') {
       unscoped--;
     }
+    origPlayerOff(...args);
   };
   player.src({
     src: 'manifest/master.m3u8',
@@ -1913,6 +1919,8 @@ QUnit.test('remove event handlers on dispose', function(assert) {
   this.standardXHRResponse(this.requests[0]);
   this.standardXHRResponse(this.requests[1]);
 
+  assert.ok(unscoped > 0, 'has unscoped handlers');
+
   player.dispose();
 
   assert.ok(unscoped <= 0, 'no unscoped handlers');

utils/switcher/throttle-server.js

@@ -5,7 +5,7 @@ const http = require('http');
 const url = require('url');
 const fs = require('fs');
 const path = require('path');
-const networkTrace = 'network-trace.txt';
+let networkTrace = 'network-trace.txt';
 const port = 9000;
 let firstRequestTime;
 
@@ -95,7 +95,7 @@ const writeSlowly = (req, res, data) => {
 // maps file extention to MIME type
 // we only care about these two types
 const map = {
-  '.ts': 'application/octet-stream',
+  '.ts': 'video/MP2T',
   '.m3u8': 'application/x-mpegurl'
 };