inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-3938] support for XMLHttpRequest.withCredentials flag (#4190)

Browse Source 
* support XMLHttpRequest.withCredentials

* proper defaults and json schema updates

* remove outdated docs

* remove empty declaration from app config

* fix blob support
This commit is contained in:
Denys Vuika
2019-01-25 12:12:06 +00:00
committed by Eugenio Romano
parent 08c9b6d117
commit 5887fa1052
6 changed files with 69 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/core/viewer/components/pdfViewer.component.ts
View File

@@ -24,16 +24,24 @@ import {
OnChanges,
OnDestroy,
ViewEncapsulation,
EventEmitter
EventEmitter,
SimpleChanges
} from '@angular/core';
import { MatDialog } from '@angular/material';
import { LogService } from '../../services/log.service';
import { RenderingQueueServices } from '../services/rendering-queue.services';
import { PdfPasswordDialogComponent } from './pdfViewer-password-dialog';
import { MatDialog } from '@angular/material';
import { AppConfigService } from './../../app-config/app-config.service';
declare const pdfjsLib: any;
declare const pdfjsViewer: any;
export interface PdfDocumentOptions {
url?: string;
data?: any;
withCredentials?: boolean;
}
@Component({
selector: 'adf-pdf-viewer',
templateUrl: './pdfViewer.component.html',
@@ -99,7 +107,8 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
constructor(
private dialog: MatDialog,
private renderingQueueServices: RenderingQueueServices,
private logService: LogService) {
private logService: LogService,
private appConfigService: AppConfigService) {
// needed to preserve "this" context
this.onPageChange = this.onPageChange.bind(this);
this.onPagesLoaded = this.onPagesLoaded.bind(this);
@@ -107,20 +116,28 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
this.randomPdfId = this.generateUuid();
}
ngOnChanges(changes) {
let blobFile = changes['blobFile'];
ngOnChanges(changes: SimpleChanges) {
const blobFile = changes['blobFile'];
if (blobFile && blobFile.currentValue) {
let reader = new FileReader();
const reader = new FileReader();
reader.onload = () => {
this.executePdf(reader.result);
const options = {
data: reader.result,
withCredentials: this.appConfigService.get<boolean>('auth.withCredentials', undefined)
};
this.executePdf(options);
};
reader.readAsArrayBuffer(blobFile.currentValue);
}
let urlFile = changes['urlFile'];
const urlFile = changes['urlFile'];
if (urlFile && urlFile.currentValue) {
this.executePdf(urlFile.currentValue);
const options = {
url: urlFile.currentValue,
withCredentials: this.appConfigService.get<boolean>('auth.withCredentials', undefined)
};
this.executePdf(options);
}
if (!this.urlFile && !this.blobFile) {
@@ -128,10 +145,10 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
}
}
executePdf(src) {
executePdf(pdfOptions: PdfDocumentOptions) {
pdfjsLib.GlobalWorkerOptions.workerSrc = 'pdf.worker.min.js';
this.loadingTask = pdfjsLib.getDocument(src);
this.loadingTask = pdfjsLib.getDocument(pdfOptions);
this.loadingTask.onPassword = (callback, reason) => {
this.onPdfPassword(callback, reason);