AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Polishing for Release (#1039)

Browse source 
* Rewrote the delete bookmarked page logic to be more precise with the way it deletes.

* Tell user migration email link is in log

* Fixed up the email service tooltip

* Tweaked messaging

* Removed some dead code from series detail page

* Default to SortName sorting when nothing is explicitly asked

* Updated typeahead to work with changes and fix enter on new/old items

* Cleaned up some extra logic in search result rendering code

* On super small screens (300px width or less), move the server settings to user dropdown
This commit is contained in:
Joseph Milazzo 2022-02-06 07:53:32 -08:00 • committed by GitHub
parent c2f3e45a15
commit 4fffe1c404
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 176 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

36
UI/Web/src/app/series-detail/series-detail.component.ts
View file

@ -281,10 +281,10 @@ export class SeriesDetailComponent implements OnInit, OnDestroy {
handleVolumeActionCallback(action: Action, volume: Volume) {
switch(action) {
case(Action.MarkAsRead):
this.markAsRead(volume);
this.markVolumeAsRead(volume);
break;
case(Action.MarkAsUnread):
this.markAsUnread(volume);
this.markVolumeAsUnread(volume);
break;
case(Action.Edit):
this.openViewInfo(volume);
@ -334,22 +334,6 @@ export class SeriesDetailComponent implements OnInit, OnDestroy {
});
}
markSeriesAsUnread(series: Series) {
this.seriesService.markUnread(series.id).subscribe(res => {
this.toastr.success(series.name + ' is now unread');
series.pagesRead = 0;
this.loadSeries(series.id);
});
}
markSeriesAsRead(series: Series) {
this.seriesService.markRead(series.id).subscribe(res => {
series.pagesRead = series.pages;
this.toastr.success(series.name + ' is now read');
this.loadSeries(series.id);
});
}
loadSeries(seriesId: number) {
this.coverImageOffset = 0;
@ -444,25 +428,23 @@ export class SeriesDetailComponent implements OnInit, OnDestroy {
this.readerService.getCurrentChapter(this.series.id).subscribe(chapter => this.currentlyReadingChapter = chapter);
}
markAsRead(vol: Volume) {
markVolumeAsRead(vol: Volume) {
if (this.series === undefined) {
return;
}
const seriesId = this.series.id;
this.actionService.markVolumeAsRead(seriesId, vol, () => {
this.actionService.markVolumeAsRead(this.series.id, vol, () => {
this.setContinuePoint();
this.actionInProgress = false;
});
}
markAsUnread(vol: Volume) {
markVolumeAsUnread(vol: Volume) {
if (this.series === undefined) {
return;
}
const seriesId = this.series.id;
this.actionService.markVolumeAsUnread(seriesId, vol, () => {
this.actionService.markVolumeAsUnread(this.series.id, vol, () => {
this.setContinuePoint();
this.actionInProgress = false;
});
@ -472,9 +454,8 @@ export class SeriesDetailComponent implements OnInit, OnDestroy {
if (this.series === undefined) {
return;
}
const seriesId = this.series.id;
this.actionService.markChapterAsRead(seriesId, chapter, () => {
this.actionService.markChapterAsRead(this.series.id, chapter, () => {
this.setContinuePoint();
this.actionInProgress = false;
});
@ -484,9 +465,8 @@ export class SeriesDetailComponent implements OnInit, OnDestroy {
if (this.series === undefined) {
return;
}
const seriesId = this.series.id;
this.actionService.markChapterAsUnread(seriesId, chapter, () => {
this.actionService.markChapterAsUnread(this.series.id, chapter, () => {
this.setContinuePoint();
this.actionInProgress = false;
});