From 671079861ad3094a139772ad9737c706bb2d0712 Mon Sep 17 00:00:00 2001
From: Mike Lang <mikelang3000@gmail.com>
Date: Sun, 27 Oct 2019 03:34:42 -0700
Subject: [PATCH] thrimbletrimmer: Fix lack of usage of var throughout code

Chalk this one up to not knowing the language.
You need to declare variables as var otherwise they're implicitly globals.

This leads to many bugs where if a function runs twice at once it'll do weird things.
---
 thrimbletrimmer/scripts/IO.js          | 28 +++++++++++++-------------
 thrimbletrimmer/scripts/playerSetup.js |  3 +--
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/thrimbletrimmer/scripts/IO.js b/thrimbletrimmer/scripts/IO.js
index 626e90d..95184f0 100644
--- a/thrimbletrimmer/scripts/IO.js
+++ b/thrimbletrimmer/scripts/IO.js
@@ -53,8 +53,8 @@ pageSetup = function() {
             setOptions('uploadLocation', data.upload_locations);
 
             // Default time range to the last 10min. This is useful for immediate replay, etc.
-            end = new Date();
-            start = new Date(end.getTime() - 1000*60*10);
+            var end = new Date();
+            var start = new Date(end.getTime() - 1000*60*10);
             setTimeRange(start, end);
 
 	        loadPlaylist();
@@ -70,13 +70,13 @@ toBustime = function(date) {
 };
 
 fromBustime = function(bustime) {
-    direction = 1;
+    var direction = 1;
     if(bustime.startsWith("-")) {
         bustime = bustime.slice(1);
         direction = -1;
     }
-    parts = bustime.split(':')
-    bustime_ms = (parseInt(parts[0]) + parts[1]/60 + parts[2]/3600) * 1000 * 60 * 60;
+    var parts = bustime.split(':')
+    var bustime_ms = (parseInt(parts[0]) + parts[1]/60 + parts[2]/3600) * 1000 * 60 * 60;
     return new Date(desertBusStart.getTime() + direction * bustime_ms);
 };
 
@@ -91,7 +91,7 @@ fromTimestamp = function(ts) {
 // Set the stream start/end range from a pair of Dates using the current format
 // If given null, sets to blank.
 setTimeRange = function(start, end) {
-	toFunc = {
+	var toFunc = {
 		UTC: toTimestamp,
 		BUSTIME: toBustime,
 	}[timeFormat];
@@ -103,13 +103,13 @@ setTimeRange = function(start, end) {
 // Returns an object containing 'start' and 'end' fields.
 // If either is empty / invalid, returns null.
 getTimeRange = function() {
-	fromFunc = {
+	var fromFunc = {
 		UTC: fromTimestamp,
 		BUSTIME: fromBustime,
 	}[timeFormat];
 	convert = function(value) {
 		if (!value) { return null; }
-		date = fromFunc(value);
+		var date = fromFunc(value);
 		return (isNaN(date)) ? null : date;
 	};
 	return {
@@ -130,7 +130,7 @@ toggleUltrawide = function() {
 
 toggleTimeInput = function(toggleInput) {
 	// Get times using current format, then change format, then write them back
-	range = getTimeRange();
+	var range = getTimeRange();
 	timeFormat = toggleInput;
 	setTimeRange(range.start, range.end);
 }
@@ -214,7 +214,7 @@ thrimbletrimmerSubmit = function(state) {
     })
     .then(response => response.text().then(text => {
         if (!response.ok) {
-            error = response.statusText + ": " + text;
+            var error = response.statusText + ": " + text;
             console.log(error);
             alert(error);
         } else if (state == 'EDITED') {
@@ -250,7 +250,7 @@ thrimbletrimmerDownload = function() {
 thrimbletrimmerManualLink = function() {
     document.getElementById("ManualButton").disabled = true;
     var rowId = /id=(.*)(?:&|$)/.exec(document.location.search)[1];
-    body = {link: document.getElementById("ManualLink").value};
+    var body = {link: document.getElementById("ManualLink").value};
     if (!!user) {
         body.token = user.getAuthResponse().id_token;
     }
@@ -264,7 +264,7 @@ thrimbletrimmerManualLink = function() {
     })
     .then(response => response.text().then(text => {
         if (!response.ok) {
-            error = response.statusText + ": " + text;
+            var error = response.statusText + ": " + text;
             console.log(error);
             alert(error);
             document.getElementById("ManualButton").disabled = false;
@@ -287,7 +287,7 @@ thrimbletrimmerResetLink = function() {
         return;
     }
     document.getElementById("ResetButton").disabled = true;
-    body = {}
+    var body = {}
     if (!!user) {
         body.token = user.getAuthResponse().id_token;
     }
@@ -301,7 +301,7 @@ thrimbletrimmerResetLink = function() {
     })
     .then(response => response.text().then(text => {
         if (!response.ok) {
-            error = response.statusText + ": " + text;
+            var error = response.statusText + ": " + text;
             console.log(error);
             alert(error);
             document.getElementById("ResetButton").disabled = false;
diff --git a/thrimbletrimmer/scripts/playerSetup.js b/thrimbletrimmer/scripts/playerSetup.js
index 77f2c86..64662f6 100644
--- a/thrimbletrimmer/scripts/playerSetup.js
+++ b/thrimbletrimmer/scripts/playerSetup.js
@@ -39,7 +39,7 @@ function setupPlayer(source, startTrim, endTrim) {
         this.vhs.playlists.on('loadedmetadata', function() {
             // setTimeout(function() { player.play(); }, 1000);
             player.hasStarted(true); //So it displays all the controls.
-            stream_start = player.vhs.playlists.master.playlists.filter(playlist => typeof playlist.discontinuityStarts !== "undefined")[0].dateTimeObject;
+            var stream_start = player.vhs.playlists.master.playlists.filter(playlist => typeof playlist.discontinuityStarts !== "undefined")[0].dateTimeObject;
             startTrim = startTrim ? (new Date(startTrim+"Z")-stream_start)/1000:0;
             endTrim = endTrim ? (new Date(endTrim+"Z")-stream_start)/1000:player.duration();
             var trimmingControls = player.trimmingControls({ startTrim:startTrim, endTrim:endTrim });
@@ -56,7 +56,6 @@ function setupPlayer(source, startTrim, endTrim) {
         })
     });
     var hlsQS = player.hlsQualitySelector();
-    //var trimmingControls = player.trimmingControls({ startTrim:(startTrim ? startTrim:0), endTrim:(endTrim ? endTrim:player.duration()) });
 }
 
 mapDiscontinuities = function() {