From 7aefd394cd6a1276e2251ed578440c9ef616f1d5 Mon Sep 17 00:00:00 2001
From: Alex Orluc <alex.orluc@maarch.org>
Date: Tue, 14 Jan 2020 22:15:33 +0100
Subject: [PATCH] fix close editor
---
.../onlyoffice-viewer.component.ts | 23 +++++++++++++------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts b/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts
index 0807d0812aa..3a1918b2da8 100644
--- a/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts
+++ b/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts
@@ -77,11 +77,20 @@ export class EcplOnlyofficeViewerComponent implements OnInit, AfterViewInit {
filter((data: string) => data === 'ok'),
tap(() => {
this.docEditor.destroyEditor();
- this.triggerCloseEditor.emit();
+ this.closeEditor()
})
).subscribe();
}
+ closeEditor() {
+ if (this.sidenavLeft !== null) {
+ this.sidenavLeft.open();
+ }
+ $j("iframe[name='frameEditor']").css("position", "initial");
+ this.fullscreenMode = false;
+ this.triggerAfterUpdatedDoc.emit();
+ }
+
getDocument() {
this.isSaving = true;
this.docEditor.downloadAs(this.file.format);
@@ -135,12 +144,12 @@ export class EcplOnlyofficeViewerComponent implements OnInit, AfterViewInit {
this.appUrl = data.coreUrl;
resolve(true);
} else {
- this.triggerCloseEditor.emit();
+ this.closeEditor()
}
}),
catchError((err) => {
this.notify.handleErrors(err);
- this.triggerCloseEditor.emit();
+ this.closeEditor()
return of(false);
}),
).subscribe();
@@ -154,7 +163,7 @@ export class EcplOnlyofficeViewerComponent implements OnInit, AfterViewInit {
const regex2 = /localhost/g;
if (this.appUrl.match(regex) !== null || this.appUrl.match(regex2) !== null) {
this.notify.error(`${this.lang.errorOnlyoffice1}`);
- this.triggerCloseEditor.emit();
+ this.closeEditor()
} else {
this.http.get(`../../rest/onlyOffice/available`).pipe(
tap((data: any) => {
@@ -162,12 +171,12 @@ export class EcplOnlyofficeViewerComponent implements OnInit, AfterViewInit {
resolve(true);
} else {
this.notify.error(`${this.lang.errorOnlyoffice2} ${this.onlyfficeUrl}`);
- this.triggerCloseEditor.emit();
+ this.closeEditor()
}
}),
catchError((err) => {
this.notify.error(`${this.lang[err.error.lang]}`);
- this.triggerCloseEditor.emit();
+ this.closeEditor()
return of(false);
}),
).subscribe();
@@ -193,7 +202,7 @@ export class EcplOnlyofficeViewerComponent implements OnInit, AfterViewInit {
}),
catchError((err) => {
this.notify.handleErrors(err);
- this.triggerCloseEditor.emit();
+ this.closeEditor()
return of(false);
}),
).subscribe();
--
GitLab