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

[AAE-10778] Fix e2e: [C260096] Should the Viewer able to accept a customToolbar

Browse Source
This commit is contained in:
Amedeo Lepore
2022-12-20 18:33:23 +01:00
parent b45a75c9ae
commit d9f21356be
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/content-services/src/lib/viewer/components/alfresco-viewer.component.html
View File

@@ -7,7 +7,7 @@
fxLayout="column" fxLayout="column"
[cdkTrapFocus]="overlayMode" [cdkTrapFocus]="overlayMode"
cdkTrapFocusAutoCapture> cdkTrapFocusAutoCapture>
<ng-content select="adf-alfresco-viewer-toolbar"></ng-content> <ng-content select="adf-viewer-toolbar"></ng-content>
<ng-container *ngIf="showToolbar && !toolbar"> <ng-container *ngIf="showToolbar && !toolbar">
<adf-toolbar id="adf-alfresco-viewer-toolbar" class="adf-alfresco-viewer-toolbar"> <adf-toolbar id="adf-alfresco-viewer-toolbar" class="adf-alfresco-viewer-toolbar">
<adf-toolbar-title> <adf-toolbar-title>

2
lib/testing/src/lib/protractor/core/pages/viewer.page.ts
View File

@@ -64,7 +64,7 @@ export class ViewerPage {
imgViewer = $('adf-img-viewer'); imgViewer = $('adf-img-viewer');
activeTab = $('div[class*="mat-tab-label-active"]'); activeTab = $('div[class*="mat-tab-label-active"]');
toolbarSwitch = $('#adf-switch-toolbar'); toolbarSwitch = $('#adf-switch-toolbar');
toolbar = $('#adf-viewer-toolbar'); toolbar = $('#adf-alfresco-viewer-toolbar');
lastButton = $$('#adf-viewer-toolbar mat-toolbar > button[data-automation-id*="adf-toolbar-"]').last(); lastButton = $$('#adf-viewer-toolbar mat-toolbar > button[data-automation-id*="adf-toolbar-"]').last();
goBackSwitch = $('#adf-switch-goback'); goBackSwitch = $('#adf-switch-goback');
canvasLayer = $$('.canvasWrapper > canvas').first(); canvasLayer = $$('.canvasWrapper > canvas').first();