Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Fixes

Browse Source
This commit is contained in:
Adina Țeudan 2020-10-24 00:13:26 +03:00
parent c0edce517a
commit 40067ff6e6
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
View File

@ -126,7 +126,9 @@
</div> </div>
<div class="right-content"> <div class="right-content">
<div class="pages" [class.activePanel]="pagesPanelActive" #quickNavigation> <div class="pages" [class.activePanel]="pagesPanelActive"
(keyup)="$event.preventDefault();"
#quickNavigation>
<div class="page-number pointer" <div class="page-number pointer"
[ngClass]="{ active: pageNumber === activeViewerPage }" [ngClass]="{ active: pageNumber === activeViewerPage }"
*ngFor="let pageNumber of displayedPages" *ngFor="let pageNumber of displayedPages"
@ -135,7 +137,9 @@
</div> </div>
</div> </div>
<div class="annotations" [class.activePanel]="!pagesPanelActive" #annotations> <div class="annotations" [class.activePanel]="!pagesPanelActive" #annotations
(keyup)="$event.preventDefault();"
>
<div *ngFor="let page of displayedPages"> <div *ngFor="let page of displayedPages">
<div class="page-separator" attr.anotation-page-header="{{page}}"> <div class="page-separator" attr.anotation-page-header="{{page}}">
<span class="all-caps-label"><span translate="page"></span> {{page}}</span> <span class="all-caps-label"><span translate="page"></span> {{page}}</span>

6
apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
View File

@ -24,6 +24,7 @@ export class FilePreviewScreenComponent implements OnInit {
private projectId: string; private projectId: string;
private _activeViewer: 'ANNOTATED' | 'REDACTED' = 'ANNOTATED'; private _activeViewer: 'ANNOTATED' | 'REDACTED' = 'ANNOTATED';
private instance: WebViewerInstance;
@ViewChild(PdfViewerComponent) private _viewerComponent: PdfViewerComponent; @ViewChild(PdfViewerComponent) private _viewerComponent: PdfViewerComponent;
@ViewChild('annotations') private _annotationsElement: ElementRef; @ViewChild('annotations') private _annotationsElement: ElementRef;
@ -37,8 +38,7 @@ export class FilePreviewScreenComponent implements OnInit {
public selectedAnnotation: Annotations.Annotation; public selectedAnnotation: Annotations.Annotation;
public filters: AnnotationFilters; public filters: AnnotationFilters;
public expandedFilters: AnnotationFilters = {hint: false}; public expandedFilters: AnnotationFilters = {hint: false};
public pagesPanelActive = false; public pagesPanelActive = true;
private instance: WebViewerInstance;
constructor( constructor(
public readonly appStateService: AppStateService, public readonly appStateService: AppStateService,
@ -272,8 +272,6 @@ export class FilePreviewScreenComponent implements OnInit {
@HostListener('window:keyup', ['$event']) @HostListener('window:keyup', ['$event'])
handleKeyEvent($event: KeyboardEvent) { handleKeyEvent($event: KeyboardEvent) {
$event.preventDefault();
if ($event.key === 'ArrowLeft' || $event.key === 'ArrowRight') { if ($event.key === 'ArrowLeft' || $event.key === 'ArrowRight') {
this.pagesPanelActive = !this.pagesPanelActive; this.pagesPanelActive = !this.pagesPanelActive;
this._changeDetectorRef.detectChanges(); this._changeDetectorRef.detectChanges();

10
apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts
View File

@ -184,14 +184,14 @@ export class PdfViewerComponent implements OnInit, AfterViewInit, OnChanges {
public selectAnnotation(annotation: Annotations.Annotation) { public selectAnnotation(annotation: Annotations.Annotation) {
this.instance.annotManager.deselectAllAnnotations(); this.instance.annotManager.deselectAllAnnotations();
this.instance.annotManager.selectAnnotation(annotation); this.instance.annotManager.selectAnnotation(annotation);
this.instance.docViewer.displayPageLocation( this.navigateToPage(annotation.getPageNumber());
annotation.getPageNumber(),
0,
annotation.getY() - 100);
} }
public navigateToPage(pageNumber: number) { public navigateToPage(pageNumber: number) {
this.instance.docViewer.displayPageLocation(pageNumber, 0, 0); const activePage = this.instance.docViewer.getCurrentPage();
if (activePage !== pageNumber) {
this.instance.docViewer.displayPageLocation(pageNumber, 0, 0);
}
} }