From cad41ea480113f40c88fae77333530c8b78e50be Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Tue, 10 Mar 2020 11:18:45 +0100
Subject: [PATCH] FEAT #12091 TIME 0:20 fix fullscreen onlyoffice
---
.../attachments-page/attachment-page.component.scss | 2 +-
src/frontend/app/viewer/document-viewer.component.html | 2 +-
.../onlyoffice-api-js/onlyoffice-viewer.component.scss | 2 +-
.../plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts | 4 +++-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/frontend/app/attachments/attachments-page/attachment-page.component.scss b/src/frontend/app/attachments/attachments-page/attachment-page.component.scss
index 5f67ed061e2..f48e6dc4709 100644
--- a/src/frontend/app/attachments/attachments-page/attachment-page.component.scss
+++ b/src/frontend/app/attachments/attachments-page/attachment-page.component.scss
@@ -71,7 +71,7 @@
::ng-deep.mat-tab-header {
position: sticky;
- z-index: 2;
+ z-index: 1;
height: 50px;
background: white;
top: 0px;
diff --git a/src/frontend/app/viewer/document-viewer.component.html b/src/frontend/app/viewer/document-viewer.component.html
index 564d0e338bc..3e51000d33b 100644
--- a/src/frontend/app/viewer/document-viewer.component.html
+++ b/src/frontend/app/viewer/document-viewer.component.html
@@ -110,7 +110,7 @@
(triggerCloseEditor)="closeEditor()" (triggerModifiedDocument)="isDocModified = true"></onlyoffice-viewer>
</ng-container>
<button mat-fab *ngIf="isDocModified && mode === 'mainDocument' && resId !== null" color="accent"
- [title]="lang.saveModifications" style="position: absolute;z-index: 1;bottom: 40px;right: 60px;"
+ [title]="lang.saveModifications" style="position: absolute;z-index: 3;bottom: 40px;right: 60px;"
(click)="saveMainDocument()">
<mat-icon style="height:auto;font-size:20px;" class="fas fa-check"></mat-icon>
</button>
diff --git a/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.scss b/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.scss
index f7936e51c2a..7e0ff7e03f3 100644
--- a/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.scss
+++ b/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.scss
@@ -2,7 +2,7 @@
.onlyofficeButton_fullscreen, .onlyofficeButton_close {
position: absolute;
top: 12px;
- z-index: 1;
+ z-index: 3;
}
.onlyofficeButton {
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 68812944551..24f6d303650 100644
--- a/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts
+++ b/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts
@@ -15,7 +15,7 @@ import { LANG } from '../../app/translate.component';
import { ConfirmComponent } from '../modal/confirm.component';
import { MatDialogRef, MatDialog } from '@angular/material';
import { NotificationService } from '../../app/notification.service';
-import { HeaderService } from '../../service/header.service.js';
+import { HeaderService } from '../../service/header.service';
declare var DocsAPI: any;
declare function $j(selector: any): any;
@@ -314,11 +314,13 @@ export class EcplOnlyofficeViewerComponent implements OnInit, AfterViewInit {
this.headerService.sideNavLeft.close();
}
$j("iframe[name='frameEditor']").css("position", "fixed");
+ $j("iframe[name='frameEditor']").css("z-index", "2");
} else {
if (this.headerService.sideNavLeft !== null) {
this.headerService.sideNavLeft.open();
}
$j("iframe[name='frameEditor']").css("position", "initial");
+ $j("iframe[name='frameEditor']").css("z-index", "1");
}
this.fullscreenMode = !this.fullscreenMode;
}
--
GitLab