Skip to content

Commit f831749

Browse files
committed
Fix: Cannot open filtered files with the keyboard
1 parent d2f3065 commit f831749

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1111
- Option to open directly in continue reading instead of the file list [`78646fe`](https://github.com/ollm/OpenComic/commit/78646fe6f4a17be6fc9fd0c940fd97d438c812c1)
1212
- Option to start reading in full screen [`cf3de6e`](https://github.com/ollm/OpenComic/commit/cf3de6ed737189b53474a30e277245b988ee5d99)
1313
- Option to start OpenComic directly in last reading [`00cb8c7`](https://github.com/ollm/OpenComic/commit/00cb8c7da9eb8345aaec8faa3b5c91953c2350dd)
14-
- Recently opened page
14+
- Recently opened page [`d2f3065`](https://github.com/ollm/OpenComic/commit/d2f30653f506993a45e49ad5e7e5e8434c33a9be)
1515

1616
##### 🐛 Bug Fixes
1717

1818
- Error opening some images [`8b97435`](https://github.com/ollm/OpenComic/commit/8b974356dfcbb7222bdef5ace604caeda93e4663)
1919
- Wrong cache folder in windows causing some bugs [`8b97435`](https://github.com/ollm/OpenComic/commit/dd6facaf67343185fa06b2377fdc64e66ad9090d)
2020
- Extract large RAR and ZIP files blocks the app for a while [`adbdced`](https://github.com/ollm/OpenComic/commit/adbdceda278e6184bc477581be9a25b8fc0f166b)
2121
- RAR error on extract with files some special chars (Changed unrar to node-unrar-js) [`694fe27`](https://github.com/ollm/OpenComic/commit/694fe274982c0a9ad2421c6b226abceae1602c3a)
22+
- Cannot open filtered files with the keyboard
2223

2324
## [v1.0.0-beta.3](https://github.com/ollm/OpenComic/releases/tag/v1.0.0-beta.3) (09-10-2023)
2425

scripts/dom/search.js

+11-2
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,17 @@ function keyup(event)
294294
{
295295
let text = this.value;
296296

297-
if(event.keyCode != 37 && event.keyCode != 38 && event.keyCode != 39 && event.keyCode != 40)
297+
if(event.keyCode != 37 && event.keyCode != 38 && event.keyCode != 39 && event.keyCode != 40 && event.keyCode != 13)
298+
{
298299
search(text);
300+
}
301+
else if(text && filterCurrentPage && (event.keyCode == 13 || event.keyCode == 40))
302+
{
303+
hide(true);
304+
saveRecentlySearched();
305+
306+
gamepad.updateBrowsableItems('search', true);
307+
}
299308
}
300309

301310
function showRecentlySearched()
@@ -326,7 +335,7 @@ function saveRecentlySearched()
326335
let recentlySearched = storage.get('recentlySearched');
327336
recentlySearched.unshift(text);
328337

329-
recentlySearched = recentlySearched.slice(0, 10);
338+
recentlySearched = recentlySearched.slice(0, 30);
330339

331340
storage.set('recentlySearched', recentlySearched);
332341
}

scripts/gamepad.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ var lastUpdateBrowsableItemsSkiped = false;
283283
var hasKeyboardNavigation = false;
284284
var fromGoBack = false;
285285

286-
function updateBrowsableItems(key = false, force = false, _highlightItem = true)
286+
function updateBrowsableItems(key = false, force = false, _highlightItem = true, ignore = {})
287287
{
288288
if(key != currentKey) prevKey = currentKey;
289289
currentKey = key;
@@ -303,9 +303,9 @@ function updateBrowsableItems(key = false, force = false, _highlightItem = true)
303303

304304
let toHighlight = false, index = 0;
305305

306-
// Menu
306+
// Search
307307
let search = template._globalElement().querySelector('.search-bar.active');
308-
let hasSearch = search ? true : false;
308+
let hasSearch = search && !ignore.search ? true : false;
309309

310310
if(hasSearch)
311311
{
@@ -346,7 +346,7 @@ function updateBrowsableItems(key = false, force = false, _highlightItem = true)
346346

347347
// Menu
348348
let menu = template._globalElement().querySelector('.menu-simple.a');
349-
let hasMenu = menu ? true : false;
349+
let hasMenu = menu && !ignore.menu ? true : false;
350350

351351
if(hasMenu && !hasSearch)
352352
{
@@ -386,7 +386,7 @@ function updateBrowsableItems(key = false, force = false, _highlightItem = true)
386386
}
387387

388388
// Content right
389-
if(!hasMenu && !hasSearch)
389+
if(!hasMenu && !hasSearch && !ignore.right)
390390
{
391391
let items = template._contentRight().querySelectorAll('.gamepad-item');
392392
let scrollElement = currentScrollElement = template.contentRight().children().get(0);
@@ -424,7 +424,7 @@ function updateBrowsableItems(key = false, force = false, _highlightItem = true)
424424
}
425425

426426
// Content left
427-
if(!hasMenu && !hasSearch)
427+
if(!hasMenu && !hasSearch && !ignore.left)
428428
{
429429
let items = template._contentLeft().querySelectorAll('.gamepad-item');
430430

0 commit comments

Comments
 (0)