Merge pull request #2382 from raszpl/patch-8

playerControls() multiple problems

js&css/web-accessible/core.js

@@ -197,9 +197,6 @@ document.addEventListener('it-message-from-extension', function () {
 					localStorage.removeItem('it-player30fps');
 				}
 			}
-			if (ImprovedTube.storage[message.key]==="when_paused") {
-				ImprovedTube.whenPaused();
-			};
 
 			switch(camelized_key) {
 				case 'blocklistActivate':
@@ -370,6 +367,10 @@ document.addEventListener('it-message-from-extension', function () {
 				case 'subtitlesBackgroundOpacity':
 					ImprovedTube.subtitlesUserSettings();
 					break
+
+				case 'playerHideControls':
+					ImprovedTube.playerControls();
+					break
 			}
 
 			if (ImprovedTube[camelized_key]) {

js&css/web-accessible/www.youtube.com/player.js

@@ -982,36 +982,43 @@ ImprovedTube.playerSDR = function () {
 /*------------------------------------------------------------------------------
 Hide controls
 ------------------------------------------------------------------------------*/
-ImprovedTube.playerControls = function (pause=false) {
-	var player = this.elements.player;   if (player) {
-		let hide = this.storage.player_hide_controls;
-		if (hide === 'always') {
+ImprovedTube.playerControls = function () {
+	const player = this.elements.player,
+		hide = this.storage.player_hide_controls;
+
+	if (player && player.hideControls && player.showControls) {
+
+		if (hide === 'when_paused' && this.elements.video.paused) {
+			player.hideControls();
+
+			player.onmouseenter = player.showControls;
+			player.onmouseleave = player.hideControls;
+			player.onmousemove =  (function() {
+				let thread,
+					onmousestop = function() {
+					if (document.querySelector(".ytp-progress-bar:hover")) {
+						thread = setTimeout(onmousestop, 1000);
+					} else {
+						player.hideControls();
+					}
+				};
+
+				return function() {
+					player.showControls();
+					clearTimeout(thread);
+					thread = setTimeout(onmousestop, 1000);
+				};
+			})();
+			return;
+		} else if (hide === 'always') {
 			player.hideControls();
-		} else if(hide === 'off') {
+		} else {
 			player.showControls();
-		} else if(hide === 'when_paused') {
-		   if(this.elements.video.paused){
-		   player.hideControls( );
-
-	  ImprovedTube.elements.player.parentNode.addEventListener('mouseenter', function () {
-	  player.showControls();});
-	  ImprovedTube.elements.player.parentNode.addEventListener('mouseleave', function () {
-	  player.hideControls( );});
-
-
-		ImprovedTube.elements.player.parentNode.onmousemove = (function() {
-			let onmousestop = function() {
-				player.hideControls( );
-			}, thread;
-
-			return function() {
-			  player.showControls();
-			  clearTimeout(thread);
-			  thread = setTimeout(onmousestop, 1000);
-			};
-		  })();
-	   }} else { player.showControls();  }
-}
+		}
+		player.onmouseenter = null;
+		player.onmouseleave = null;
+		player.onmousemove = null;
+	}
 };
 /*#  HIDE VIDEO TITLE IN FULLSCREEN	*/			  // Easier with CSS only (see player.css)
 //ImprovedTube.hideVideoTitleFullScreen = function (){ if (ImprovedTube.storage.hide_video_title_fullScreen === true) {