diff --git a/deploy/csp/index.js b/deploy/csp/index.js index 7eebf7be2f84b32c2a7c454a5f608d9963f9f49d..b30032c30af95b14b9cfccbae16d94eb8cd8d849 100644 --- a/deploy/csp/index.js +++ b/deploy/csp/index.js @@ -70,6 +70,7 @@ module.exports = (app) => { ...WHITE_LIST_SRC ], fontSrc: [ + "'self'", '*.fontawesome.com', ...WHITE_LIST_SRC ], diff --git a/src/atlasViewer/atlasViewer.template.html b/src/atlasViewer/atlasViewer.template.html index a9a76fed238df732fa1a1976c22683ff7f5b32cf..d9e76c0a2f551b455974e73ef675dfee90d1f5cb 100644 --- a/src/atlasViewer/atlasViewer.template.html +++ b/src/atlasViewer/atlasViewer.template.html @@ -181,31 +181,33 @@ <!-- dismiss icon --> <mat-icon *ngIf="dismissable" - (click)="clearAdditionalLayer(parcel)" + (click)="clearAdditionalLayer(parcel); $event.stopPropagation()" fontSet="fas" - iav-stop="click" fontIcon="fa-times"> </mat-icon> </mat-chip> </ng-template> <!-- layer version selector --> - <mat-menu #layerVersionMenu class="bg-none"> + <mat-menu #layerVersionMenu + class="bg-none box-shadow-none" + [hasBackdrop]="false"> <ng-template matMenuContent let-layerVersionMenuTrigger="layerVersionMenuTrigger"> - - <ng-container *ngFor="let parcVer of selectedLayerVersions$ | async"> - <ng-container *ngTemplateOutlet="chipTmpl; context: { - parcel: parcVer, - selected: selectedParcellation && selectedParcellation['@id'] === parcVer['@id'], - dismissable: false, - onclick: bindFns([ - [ selectParcellation.bind(this), parcVer ], - [ layerVersionMenuTrigger.closeMenu.bind(layerVersionMenuTrigger) ] - ]) - }"> + <div (iav-outsideClick)="layerVersionMenuTrigger.closeMenu()"> + <ng-container *ngFor="let parcVer of selectedLayerVersions$ | async"> + <ng-container *ngTemplateOutlet="chipTmpl; context: { + parcel: parcVer, + selected: selectedParcellation && selectedParcellation['@id'] === parcVer['@id'], + dismissable: false, + onclick: bindFns([ + [ selectParcellation.bind(this), parcVer ], + [ layerVersionMenuTrigger.closeMenu.bind(layerVersionMenuTrigger) ] + ]) + }"> + </ng-container> + <div class="mt-1"></div> </ng-container> - <div class="mt-1"></div> - </ng-container> + </div> </ng-template> </mat-menu> diff --git a/src/res/css/extra_styles.css b/src/res/css/extra_styles.css index 29150dca0832a5d75c61db7d41c2e5056b3da75f..f815f53133b508c68a30eb7d19fa16ced9bb5a83 100644 --- a/src/res/css/extra_styles.css +++ b/src/res/css/extra_styles.css @@ -369,7 +369,7 @@ markdown-dom pre code .pe-none { - pointer-events: none; + pointer-events: none!important; } .h-2rem diff --git a/src/util/directives/stopPropagation.directive.ts b/src/util/directives/stopPropagation.directive.ts index 441d07a806ead5094a78983d8ca00d041d652201..504d74c3d834698b65994694e5db204f20c96012 100644 --- a/src/util/directives/stopPropagation.directive.ts +++ b/src/util/directives/stopPropagation.directive.ts @@ -11,7 +11,7 @@ const VALID_EVENTNAMES = new Set([ 'touchend', ]) -const stopPropagation = ev => ev.stopPropagation() +const stopPropagation = (ev: Event) => ev.stopPropagation() @Directive({ selector: '[iav-stop]',