mirror of
https://github.com/xuthus83/pigallery2.git
synced 2025-01-14 14:43:17 +08:00
This commit is contained in:
parent
1b7fbc09a3
commit
4a712d55d8
@ -15,6 +15,8 @@ import {Utils} from '../../../../../../common/Utils';
|
||||
import {FileSizePipe} from '../../../../pipes/FileSizePipe';
|
||||
import {DatePipe} from '@angular/common';
|
||||
import {LightBoxTitleTexts} from '../../../../../../common/config/public/ClientConfig';
|
||||
import { Router } from '@angular/router';
|
||||
|
||||
|
||||
|
||||
@Component({
|
||||
@ -66,7 +68,9 @@ export class ControlsLightboxComponent implements OnDestroy, OnInit, OnChanges {
|
||||
private authService: AuthenticationService,
|
||||
private cacheService: GalleryCacheService,
|
||||
private fileSizePipe: FileSizePipe,
|
||||
private datePipe: DatePipe
|
||||
private datePipe: DatePipe,
|
||||
private router: Router
|
||||
|
||||
) {
|
||||
this.searchEnabled = this.authService.canSearch();
|
||||
}
|
||||
@ -381,7 +385,8 @@ export class ControlsLightboxComponent implements OnDestroy, OnInit, OnChanges {
|
||||
|
||||
public closeLightbox(): void {
|
||||
this.hideControls();
|
||||
this.closed.emit();
|
||||
// this.closed.emit();
|
||||
this.router.navigate([], { replaceUrl: true });
|
||||
}
|
||||
|
||||
getPersonSearchQuery(name: string): string {
|
||||
|
@ -288,7 +288,7 @@ export class GalleryLightboxComponent implements OnDestroy, OnInit {
|
||||
|
||||
public hide(): void {
|
||||
this.router
|
||||
.navigate([], {queryParams: this.queryService.getParams()})
|
||||
.navigate([], {queryParams: this.queryService.getParams(),replaceUrl: true})
|
||||
.then(() => {
|
||||
this.piTitleService.setLastNonMedia();
|
||||
})
|
||||
@ -441,7 +441,7 @@ export class GalleryLightboxComponent implements OnDestroy, OnInit {
|
||||
.navigate([], {
|
||||
queryParams: this.queryService.getParams(
|
||||
{media: this.gridPhotoQL.get(photoIndex).gridMedia.media, playing: this.slideShowRunning}
|
||||
),
|
||||
), replaceUrl: true
|
||||
})
|
||||
.then(() => {
|
||||
this.piTitleService.setMediaTitle(this.gridPhotoQL.get(photoIndex).gridMedia);
|
||||
|
Loading…
x
Reference in New Issue
Block a user