From 69ad452ef9ba44ad4a12a30d67f0fc0f713337cd Mon Sep 17 00:00:00 2001
From: Gary Katsevman <git@gkatsev.com>
Date: Fri, 3 Aug 2018 15:16:23 -0400
Subject: [PATCH 1/2] remove uglify typeofs option

---
 scripts/rollup.config.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/rollup.config.js b/scripts/rollup.config.js
index c92acdb6e..7398b2d82 100644
--- a/scripts/rollup.config.js
+++ b/scripts/rollup.config.js
@@ -75,9 +75,6 @@ export default [
     external: ['video.js'],
     plugins: umdPlugins
       .concat([uglify({
-        compress: {
-          typeofs: false
-        },
         output: {
           comments: 'some'
         }

From 7f2d76c60fe772451e4474dbd1bdc75e018cfa29 Mon Sep 17 00:00:00 2001
From: Gary Katsevman <git@gkatsev.com>
Date: Mon, 6 Aug 2018 11:42:16 -0400
Subject: [PATCH 2/2] remove window usage in worker code

---
 index.html                   |  2 +-
 src/decrypter-worker.js      |  3 +--
 src/mse/transmuxer-worker.js | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/index.html b/index.html
index 8404fcca2..83cfe45dd 100644
--- a/index.html
+++ b/index.html
@@ -55,7 +55,7 @@
   <script src="node_modules/video.js/dist/alt/video.core.js"></script>
   <script src="node_modules/videojs-contrib-eme/dist/videojs-contrib-eme.js"></script>
 
-  <script src="dist/videojs-http-streaming.js"></script>
+  <script src="dist/videojs-http-streaming.min.js"></script>
   <script>
     (function(window, videojs) {
       var player = window.player = videojs('videojs-http-streaming-player', {
diff --git a/src/decrypter-worker.js b/src/decrypter-worker.js
index a22d202eb..998385faf 100644
--- a/src/decrypter-worker.js
+++ b/src/decrypter-worker.js
@@ -1,4 +1,3 @@
-import window from 'global/window';
 import { Decrypter } from 'aes-decrypter';
 import { createTransferableMessage } from './bin-utils';
 
@@ -28,7 +27,7 @@ const DecrypterWorker = function(self) {
                   key,
                   iv,
                   function(err, bytes) {
-                    window.postMessage(createTransferableMessage({
+                    self.postMessage(createTransferableMessage({
                       source: data.source,
                       decrypted: bytes
                     }), [bytes.buffer]);
diff --git a/src/mse/transmuxer-worker.js b/src/mse/transmuxer-worker.js
index 3cda51819..15f16712a 100644
--- a/src/mse/transmuxer-worker.js
+++ b/src/mse/transmuxer-worker.js
@@ -12,7 +12,6 @@
  * transmuxer running inside of a WebWorker by exposing a simple
  * message-based interface to a Transmuxer object.
  */
-import window from 'global/window';
 import mp4 from 'mux.js/lib/mp4';
 
 /**
@@ -22,7 +21,7 @@ import mp4 from 'mux.js/lib/mp4';
  * @param {Object} transmuxer the transmuxer to wire events on
  * @private
  */
-const wireTransmuxerEvents = function(transmuxer) {
+const wireTransmuxerEvents = function(self, transmuxer) {
   transmuxer.on('data', function(segment) {
     // transfer ownership of the underlying ArrayBuffer
     // instead of doing a copy to save memory
@@ -39,7 +38,7 @@ const wireTransmuxerEvents = function(transmuxer) {
     let typedArray = segment.data;
 
     segment.data = typedArray.buffer;
-    window.postMessage({
+    self.postMessage({
       action: 'data',
       segment,
       byteOffset: typedArray.byteOffset,
@@ -49,7 +48,7 @@ const wireTransmuxerEvents = function(transmuxer) {
 
   if (transmuxer.captionStream) {
     transmuxer.captionStream.on('data', function(caption) {
-      window.postMessage({
+      self.postMessage({
         action: 'caption',
         data: caption
       });
@@ -57,11 +56,11 @@ const wireTransmuxerEvents = function(transmuxer) {
   }
 
   transmuxer.on('done', function(data) {
-    window.postMessage({ action: 'done' });
+    self.postMessage({ action: 'done' });
   });
 
   transmuxer.on('gopInfo', function(gopInfo) {
-    window.postMessage({
+    self.postMessage({
       action: 'gopInfo',
       gopInfo
     });
@@ -76,8 +75,9 @@ const wireTransmuxerEvents = function(transmuxer) {
  * @param {Object} options the options to initialize with
  */
 class MessageHandlers {
-  constructor(options) {
+  constructor(self, options) {
     this.options = options || {};
+    this.self = self;
     this.init();
   }
 
@@ -89,7 +89,7 @@ class MessageHandlers {
       this.transmuxer.dispose();
     }
     this.transmuxer = new mp4.Transmuxer(this.options);
-    wireTransmuxerEvents(this.transmuxer);
+    wireTransmuxerEvents(this.self, this.transmuxer);
   }
 
   /**
@@ -159,12 +159,12 @@ class MessageHandlers {
 const TransmuxerWorker = function(self) {
   self.onmessage = function(event) {
     if (event.data.action === 'init' && event.data.options) {
-      this.messageHandlers = new MessageHandlers(event.data.options);
+      this.messageHandlers = new MessageHandlers(self, event.data.options);
       return;
     }
 
     if (!this.messageHandlers) {
-      this.messageHandlers = new MessageHandlers();
+      this.messageHandlers = new MessageHandlers(self);
     }
 
     if (event.data && event.data.action && event.data.action !== 'init') {