diff --git a/config.xml b/config.xml
index 2e850bb20..ea0586ed8 100644
--- a/config.xml
+++ b/config.xml
@@ -3,7 +3,7 @@
gabinete digital
An awesome Ionic/Cordova app.
Ionic Framework Team
-
+
@@ -81,7 +81,7 @@
0
- 8.0.0.00-20210905-154328
+ 8.0.0.00-20210308-063916
diff --git a/package-lock.json b/package-lock.json
index d1536dc0e..b24c34acf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23602,9 +23602,9 @@
}
},
"typescript": {
- "version": "4.4.3",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz",
- "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==",
+ "version": "4.3.5",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
+ "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
"dev": true
},
"ua-parser-js": {
diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts
index 3b122f16a..cb5b52480 100644
--- a/src/app/modals/view-document/view-document.page.ts
+++ b/src/app/modals/view-document/view-document.page.ts
@@ -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();
+ });
}
diff --git a/src/app/services/functions/file.service.ts b/src/app/services/functions/file.service.ts
index d5f3af27b..55483dc5c 100644
--- a/src/app/services/functions/file.service.ts
+++ b/src/app/services/functions/file.service.ts
@@ -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();
}
}
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 1fc04fa76..fb8f6d46f 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -71,6 +71,9 @@
+
+
+
{{last ? scrollToBottom() : ''}}
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index ed9dac9be..c66eded15 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -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);
}
}