Skip to content

Commit b2637c2

Browse files
committed
New: Context menu in continue reading bar
1 parent bea5b5c commit b2637c2

3 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
88

99
##### 🚀 New Features
1010

11-
- Option to change labels from app bar
11+
- Option to change labels from app bar [`bea5b5c`](https://github.com/ollm/OpenComic/commit/bea5b5cbd7c8785c56624b7d16192aa23050eb4f)
12+
- Context menu in continue reading bar
1213

1314
##### 🐛 Bug Fixes
1415

‎scripts/dom.js‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -486,41 +486,40 @@ async function loadFilesIndexPage(files, file, animation, path, keepScroll, main
486486

487487
handlebarsContext.comics = pathFiles;
488488

489-
// Comic reading progress
490-
if(readingProgress)
491-
{
492-
let sha = readingProgress.sha;
493-
let thumbnail = thumbnails[sha];
489+
const processReadingProgress = function(progress) {
490+
491+
const sha = progress.sha;
492+
const thumbnail = thumbnails[sha];
493+
494+
progress.sha = sha;
495+
progress.thumbnail = (thumbnail.cache) ? thumbnail.path : '';
496+
progress.mainPath = mainPath;
497+
progress.pathText = returnTextPath(progress.path, mainPath, true, !progress.ebook);
498+
progress.exists = fileManager.simpleExists(progress.path);
499+
500+
const path = p.dirname(progress.path);
501+
const folder = (fs.existsSync(path) && fs.statSync(path).isDirectory()) ? true : false;
502+
503+
progress.contextMenu = {
504+
path: path,
505+
folder: folder || fileManager.isCompressed(path),
506+
};
507+
508+
return progress;
494509

495-
readingProgress.sha = sha;
496-
readingProgress.thumbnail = (thumbnail.cache) ? thumbnail.path : '';
497-
readingProgress.mainPath = mainPath;
498-
readingProgress.pathText = returnTextPath(readingProgress.path, mainPath, true, !readingProgress.ebook);
499-
readingProgress.exists = fileManager.simpleExists(readingProgress.path);
500-
handlebarsContext.comicsReadingProgress = readingProgress;
501510
}
511+
512+
// Comic reading progress
513+
if(readingProgress)
514+
handlebarsContext.comicsReadingProgress = processReadingProgress(readingProgress);
502515
else
503-
{
504516
handlebarsContext.comicsReadingProgress = false;
505-
}
506517

507518
// Current folder reading progress
508519
if(readingProgressCurrentPath && (!readingProgress || readingProgress.path !== readingProgressCurrentPath.path))
509-
{
510-
let sha = readingProgressCurrentPath.sha;
511-
let thumbnail = thumbnails[sha];
512-
513-
readingProgressCurrentPath.sha = sha;
514-
readingProgressCurrentPath.thumbnail = (thumbnail.cache) ? thumbnail.path : '';
515-
readingProgressCurrentPath.mainPath = mainPath;
516-
readingProgressCurrentPath.pathText = returnTextPath(readingProgressCurrentPath.path, path, true, !readingProgressCurrentPath.ebook);
517-
readingProgressCurrentPath.exists = fileManager.simpleExists(readingProgressCurrentPath.path);
518-
handlebarsContext.comicsReadingProgressCurrentPath = readingProgressCurrentPath;
519-
}
520+
handlebarsContext.comicsReadingProgressCurrentPath = processReadingProgress(readingProgressCurrentPath);
520521
else
521-
{
522522
handlebarsContext.comicsReadingProgressCurrentPath = false;
523-
}
524523

525524
if(!pathFiles.length && fileManager.isServer(path) && serverClient.serverLastError())
526525
{

‎templates/index.content.right.continue.reading.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="continue-reading-list{{#if comicsReadingProgress}}{{#if comicsReadingProgressCurrentPath}} continue-reading-list-double{{/if}}{{/if}}">
22
{{#if comicsReadingProgress}}
3-
<div class="continue-reading gamepad-item body-medium{{#unless comicsReadingProgress.exists}} continue-reading-not-exists{{/unless}}" onclick="{{#if comicsReadingProgress.exists}}{{#if comicsReadingProgress.ebook}}reading.setNextOpenChapterProgress({{comicsReadingProgress.chapterIndex}}, {{comicsReadingProgress.chapterProgress}});{{/if}}dom.openComic(true, '{{chain 'escapeBackSlash' 'escapeQuotesSimples' comicsReadingProgress.path}}', '{{chain 'escapeBackSlash' 'escapeQuotesSimples' comicsReadingProgress.mainPath}}');{{else}}dom.continueReadingError();{{/if}}">
3+
<div class="continue-reading gamepad-item body-medium{{#unless comicsReadingProgress.exists}} continue-reading-not-exists{{/unless}}" onclick="{{#if comicsReadingProgress.exists}}{{#if comicsReadingProgress.ebook}}reading.setNextOpenChapterProgress({{comicsReadingProgress.chapterIndex}}, {{comicsReadingProgress.chapterProgress}});{{/if}}dom.openComic(true, '{{chain 'escapeBackSlash' 'escapeQuotesSimples' comicsReadingProgress.path}}', '{{chain 'escapeBackSlash' 'escapeQuotesSimples' comicsReadingProgress.mainPath}}');{{else}}dom.continueReadingError();{{/if}}" oncontextmenu="dom.comicContextMenu('{{chain 'escapeBackSlash' 'escapeQuotesSimples' comicsReadingProgress.contextMenu.path}}', '{{chain 'escapeBackSlash' 'escapeQuotesSimples' comicsReadingProgress.mainPath}}', false, false, {{#if comicsReadingProgress.contextMenu.folder}}true{{else}}false{{/if}}, fromGamepad)">
44
<div>
55
<div>
66
<img class="sha-image-{{comicsReadingProgress.sha}}" src="{{chain 'escapeBackSlash' 'escapeQuotesSimples' comicsReadingProgress.thumbnail}}">
@@ -10,7 +10,7 @@
1010
</div>
1111
{{/if}}
1212
{{#if comicsReadingProgressCurrentPath}}
13-
<div class="continue-reading gamepad-item body-medium{{#unless comicsReadingProgressCurrentPath.exists}} continue-reading-not-exists{{/unless}}" onclick="{{#if comicsReadingProgressCurrentPath.exists}}{{#if comicsReadingProgressCurrentPath.ebook}}reading.setNextOpenChapterProgress({{comicsReadingProgressCurrentPath.chapterIndex}}, {{comicsReadingProgressCurrentPath.chapterProgress}});{{/if}}dom.openComic(true, '{{chain 'escapeBackSlash' 'escapeQuotesSimples' comicsReadingProgressCurrentPath.path}}', '{{chain 'escapeBackSlash' 'escapeQuotesSimples' comicsReadingProgressCurrentPath.mainPath}}');{{else}}dom.continueReadingError();{{/if}}">
13+
<div class="continue-reading gamepad-item body-medium{{#unless comicsReadingProgressCurrentPath.exists}} continue-reading-not-exists{{/unless}}" onclick="{{#if comicsReadingProgressCurrentPath.exists}}{{#if comicsReadingProgressCurrentPath.ebook}}reading.setNextOpenChapterProgress({{comicsReadingProgressCurrentPath.chapterIndex}}, {{comicsReadingProgressCurrentPath.chapterProgress}});{{/if}}dom.openComic(true, '{{chain 'escapeBackSlash' 'escapeQuotesSimples' comicsReadingProgressCurrentPath.path}}', '{{chain 'escapeBackSlash' 'escapeQuotesSimples' comicsReadingProgressCurrentPath.mainPath}}');{{else}}dom.continueReadingError();{{/if}}" oncontextmenu="dom.comicContextMenu('{{chain 'escapeBackSlash' 'escapeQuotesSimples' comicsReadingProgressCurrentPath.contextMenu.path}}', '{{chain 'escapeBackSlash' 'escapeQuotesSimples' comicsReadingProgressCurrentPath.mainPath}}', false, false, {{#if comicsReadingProgressCurrentPath.contextMenu.folder}}true{{else}}false{{/if}}, fromGamepad)">
1414
<div>
1515
<div>
1616
<img class="sha-image-{{comicsReadingProgressCurrentPath.sha}}" src="{{chain 'escapeBackSlash' 'escapeQuotesSimples' comicsReadingProgressCurrentPath.thumbnail}}">

0 commit comments

Comments
 (0)