Merge branch 'master' into code-quality-experiment

code-charity · Dec 21, 2024 · 27f3e44 · 27f3e44
2 parents 632d4fc + 7b01d82
commit 27f3e44
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/js&css/web-accessible/functions.js b/js&css/web-accessible/functions.js
@@ -439,9 +439,9 @@ ImprovedTube.playerOnPause = function (event) {
 };
 
 if (document.documentElement.dataset.pageType === 'video'
-	&& (ImprovedTube.storage.description === "expanded" || ImprovedTube.storage.transcript || ImprovedTube.storage.chapters)) {
-	ImprovedTube.forbidFocus = function (ms) {
-		const originalFocus = HTMLElement.prototype.focus; // Backing up default method  - other methods: Element.prototype.scrollIntoView  window.scrollTo  window.scrollBy
+	 && (ImprovedTube.storage.description === "expanded" || ImprovedTube.storage.transcript === true || ImprovedTube.storage.chapters === true )) { 
+	ImprovedTube.forbidFocus =  function (ms) { 
+		originalFocus = HTMLElement.prototype.focus; // Backing up default method  - other methods: Element.prototype.scrollIntoView  window.scrollTo  window.scrollBy
 		// Override YouTube's scroll method:
 		HTMLElement.prototype.focus = function () { console.log("Preventing YouTube's scripted scrolling, when expanding the video description for you"); }
 		if (document.hidden) ms = 3 * ms;

diff --git a/js&css/web-accessible/www.youtube.com/shortcuts.js b/js&css/web-accessible/www.youtube.com/shortcuts.js
@@ -374,7 +374,8 @@ ImprovedTube.shortcutResetPlaybackSpeed = function () {
 4.7.19 GO TO SEARCH BOX
 ------------------------------------------------------------------------------*/
 ImprovedTube.shortcutGoToSearchBox = function () {
-	document.querySelector('input#search')?.focus();
+	if (originalFocus) { HTMLElement.prototype.focus = originalFocus }
+	document.querySelector('input#search')?.focus(); //alternatively .click()
 };
 /*------------------------------------------------------------------------------
 4.7.20 ACTIVATE FULLSCREEN