+ recieve updated settings messages from pop-up window and handle them

verbiiyo · Apr 25, 2018 · 6f1a6db · 6f1a6db
1 parent a633c77
commit 6f1a6db
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 12 deletions.
diff --git a/js/YouTube/youtube.js b/js/YouTube/youtube.js
@@ -1,8 +1,28 @@
 var selectedClickable;
 var sideBarIndex = -1;
 var deselectTimeout;
+var deselectTiming;
 const topBarHeight = 55;
 
+updateSettings();
+
+function updateSettings() {
+	chrome.storage.sync.get( ["select-time"], function( results ) {
+		if ( results["select-time"] === "never" ) {
+			deselectTiming = "never";
+			return;
+		}
+
+		deselectTiming = results["select-time"] ? results["select-time"] * 1000 : deselectTiming;
+	} );
+}
+
+chrome.runtime.onMessage.addListener( function( req ) {
+	if ( req.type === "settings-updated" ) {
+		updateSettings();
+	}
+} );
+
 // A Button "clicks" on the video
 window.addEventListener( "abuttonpressed", function() {
 	if ( !selectedClickable ) {
@@ -157,17 +177,19 @@ function scheduleDeselectTimeout() {
 		window.clearTimeout( deselectTimeout );
 	}
 
-	deselectTimeout = setTimeout( function() {
-		if ( selectedClickable ) {
-			deselectVideo( selectedClickable );
-		}
+	if ( deselectTiming !== "never" ) {
+		deselectTimeout = setTimeout( function() {
+			if ( selectedClickable ) {
+				deselectVideo( selectedClickable );
+			}
 
-		if ( isSidebarOpen() ) {
-			toggleSidebarView();
-		}
+			if ( isSidebarOpen() ) {
+				toggleSidebarView();
+			}
 
-		deselectTimeout = undefined;
-	}, 20000 );
+			deselectTimeout = undefined;
+		}, deselectTiming );
+	}
 }
 
 function isValidElement( elem ) {

diff --git a/js/global.js b/js/global.js
@@ -2,9 +2,27 @@
  *	Contains all features that are not site-specific.
  */
 
-// TODO make these options changeable in the extension button drop-down
-let scrollMultiplier = 13;
-let scrollSprintMultiplier = 2;
+var scrollMultiplier;
+var scrollSprintMultiplier;
+
+updateSettings();
+
+function updateSettings() {
+	chrome.storage.sync.get( ["scroll-sensitivity", "scroll-sprint"], function( results ) {
+		scrollMultiplier = results["scroll-sensitivity"] ? results["scroll-sensitivity"] : scrollMultiplier;
+		scrollSprintMultiplier = results["scroll-sprint"] ? results["scroll-sprint"] : scrollSprintMultiplier;
+	} );
+};
+
+chrome.runtime.onMessage.addListener( function( req ) {
+	// Repeat code because updateSettings can't be used.
+	if ( req.type === "settings-updated" ) {
+		chrome.storage.sync.get( ["scroll-sensitivity", "scroll-sprint"], function( results ) {
+			scrollMultiplier = results["scroll-sensitivity"] ? results["scroll-sensitivity"] : scrollMultiplier;
+			scrollSprintMultiplier = results["scroll-sprint"] ? results["scroll-sprint"] : scrollSprintMultiplier;
+		} );
+	}
+} );
 
 // Scrolling
 window.addEventListener( "rightanalogverticalpoll", function( e ) {