This commit is contained in:
tiago.kayaya
2021-10-18 17:10:33 +01:00
parent dc45e49f58
commit 2f4c8eeddf
6 changed files with 15 additions and 13 deletions
@@ -15,9 +15,6 @@ import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-se
})
export class ViewDocumentPage implements OnInit {
url: string;
a:string = "https://equilibrium.dyndns.info/FileShare/pdfjs/web/viewer.html?file=";
viewerUrl: string;
trustedUrl: any;
file: any;
applicationId: any;
@@ -49,11 +46,11 @@ export class ViewDocumentPage implements OnInit {
ngOnInit() {
this.processes.GetViewer(this.docId, this.applicationId).subscribe(res=> {
const link: string = res
const link: string = res;
this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(link);
}, ()=>{
this.close()
})
this.close();
});
}
+1 -1
View File
@@ -314,7 +314,7 @@ export class FileService {
}
viewDocumentByUrl(url) {
const browser = this.iab.create(url,"_blank");
const browser = this.iab.create(url,"_parent");
browser.show();
}
}
@@ -71,6 +71,9 @@
</div>
</div>
</div>
<div *ngIf="frameUrl">
<iframe id="iframe" [src]="frameUrl" height="100%" width="100%" title="Iframe Example"></iframe>
</div>
{{last ? scrollToBottom() : ''}}
</div>
</div>
@@ -56,6 +56,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
mesageItemDropdownOptions: boolean = false;
scrollToBottomBtn = false;
longPressActive = false;
frameUrl: any;
constructor(
public popoverController: PopoverController,
@@ -248,7 +249,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
}
else{
let fullUrl = "https://www.tabularium.pt" + url;
this.fileService.viewDocumentByUrl(fullUrl);
this.frameUrl = fullUrl;
//this.fileService.viewDocumentByUrl(fullUrl);
}
}