Fix: Cannot open filtered files with the keyboard

ollm · Oct 12, 2023 · f831749 · f831749
1 parent d2f3065
commit f831749
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,14 +11,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Option to open directly in continue reading instead of the file list [`78646fe`](https://github.com/ollm/OpenComic/commit/78646fe6f4a17be6fc9fd0c940fd97d438c812c1)
 - Option to start reading in full screen [`cf3de6e`](https://github.com/ollm/OpenComic/commit/cf3de6ed737189b53474a30e277245b988ee5d99)
 - Option to start OpenComic directly in last reading [`00cb8c7`](https://github.com/ollm/OpenComic/commit/00cb8c7da9eb8345aaec8faa3b5c91953c2350dd)
-- Recently opened page
+- Recently opened page [`d2f3065`](https://github.com/ollm/OpenComic/commit/d2f30653f506993a45e49ad5e7e5e8434c33a9be)
 
 ##### 🐛 Bug Fixes
 
 - Error opening some images [`8b97435`](https://github.com/ollm/OpenComic/commit/8b974356dfcbb7222bdef5ace604caeda93e4663)
 - Wrong cache folder in windows causing some bugs [`8b97435`](https://github.com/ollm/OpenComic/commit/dd6facaf67343185fa06b2377fdc64e66ad9090d)
 - Extract large RAR and ZIP files blocks the app for a while [`adbdced`](https://github.com/ollm/OpenComic/commit/adbdceda278e6184bc477581be9a25b8fc0f166b)
 - RAR error on extract with files some special chars (Changed unrar to node-unrar-js) [`694fe27`](https://github.com/ollm/OpenComic/commit/694fe274982c0a9ad2421c6b226abceae1602c3a)
+- Cannot open filtered files with the keyboard
 
 ## [v1.0.0-beta.3](https://github.com/ollm/OpenComic/releases/tag/v1.0.0-beta.3) (09-10-2023)
 

diff --git a/scripts/dom/search.js b/scripts/dom/search.js
@@ -294,8 +294,17 @@ function keyup(event)
 {
 	let text = this.value;
 
-	if(event.keyCode != 37 && event.keyCode != 38 && event.keyCode != 39 && event.keyCode != 40)
+	if(event.keyCode != 37 && event.keyCode != 38 && event.keyCode != 39 && event.keyCode != 40 && event.keyCode != 13)
+	{
 		search(text);
+	}
+	else if(text && filterCurrentPage && (event.keyCode == 13 || event.keyCode == 40))
+	{
+		hide(true);
+		saveRecentlySearched();
+
+		gamepad.updateBrowsableItems('search', true);
+	}
 }
 
 function showRecentlySearched()
@@ -326,7 +335,7 @@ function saveRecentlySearched()
 	let recentlySearched = storage.get('recentlySearched');
 	recentlySearched.unshift(text);
 
-	recentlySearched = recentlySearched.slice(0, 10);
+	recentlySearched = recentlySearched.slice(0, 30);
 
 	storage.set('recentlySearched', recentlySearched);
 }

diff --git a/scripts/gamepad.js b/scripts/gamepad.js
@@ -283,7 +283,7 @@ var lastUpdateBrowsableItemsSkiped = false;
 var hasKeyboardNavigation = false;
 var fromGoBack = false;
 
-function updateBrowsableItems(key = false, force = false, _highlightItem = true)
+function updateBrowsableItems(key = false, force = false, _highlightItem = true, ignore = {})
 {
 	if(key != currentKey) prevKey = currentKey;
 	currentKey = key;
@@ -303,9 +303,9 @@ function updateBrowsableItems(key = false, force = false, _highlightItem = true)
 
 	let toHighlight = false, index = 0;
 
-	// Menu
+	// Search
 	let search = template._globalElement().querySelector('.search-bar.active');
-	let hasSearch = search ? true : false;
+	let hasSearch = search && !ignore.search ? true : false;
 
 	if(hasSearch)
 	{
@@ -346,7 +346,7 @@ function updateBrowsableItems(key = false, force = false, _highlightItem = true)
 
 	// Menu
 	let menu = template._globalElement().querySelector('.menu-simple.a');
-	let hasMenu = menu ? true : false;
+	let hasMenu = menu && !ignore.menu ? true : false;
 
 	if(hasMenu && !hasSearch)
 	{
@@ -386,7 +386,7 @@ function updateBrowsableItems(key = false, force = false, _highlightItem = true)
 	}
 
 	// Content right
-	if(!hasMenu && !hasSearch)
+	if(!hasMenu && !hasSearch && !ignore.right)
 	{
 		let items = template._contentRight().querySelectorAll('.gamepad-item');
 		let scrollElement = currentScrollElement = template.contentRight().children().get(0);
@@ -424,7 +424,7 @@ function updateBrowsableItems(key = false, force = false, _highlightItem = true)
 	}
 
 	// Content left
-	if(!hasMenu && !hasSearch)
+	if(!hasMenu && !hasSearch && !ignore.left)
 	{
 		let items = template._contentLeft().querySelectorAll('.gamepad-item');