remove 'uk-blend-multiply' from charts and add it conditionally for fullscreen view to work
This commit is contained in:
parent
dc32e4c99d
commit
e510da08de
|
@ -1 +1 @@
|
||||||
Subproject commit 7bb2346ec270e1b8e4f3ed982adf340e57631bbc
|
Subproject commit 2261f4ae6f8ea4a2d52aaf75c857e583bf913721
|
|
@ -175,7 +175,8 @@
|
||||||
safeUrls.get(indicatorUtils.getFullUrl(stakeholder, indicator.indicatorPaths[0]))"
|
safeUrls.get(indicatorUtils.getFullUrl(stakeholder, indicator.indicatorPaths[0]))"
|
||||||
allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"
|
allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"
|
||||||
[src]="safeUrls.get(indicatorUtils.getFullUrl(stakeholder, indicator.indicatorPaths[0]))"
|
[src]="safeUrls.get(indicatorUtils.getFullUrl(stakeholder, indicator.indicatorPaths[0]))"
|
||||||
class="uk-width-1-1 uk-blend-multiply" [ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"></iframe>
|
class="uk-width-1-1" [ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"
|
||||||
|
[class.uk-blend-multiply]="!isFullscreen"></iframe>
|
||||||
<div *ngIf="properties.disableFrameLoad && indicator.indicatorPaths[0].source !=='image'">
|
<div *ngIf="properties.disableFrameLoad && indicator.indicatorPaths[0].source !=='image'">
|
||||||
<img class="uk-width-1-1 uk-blend-multiply" [ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"
|
<img class="uk-width-1-1 uk-blend-multiply" [ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"
|
||||||
src="assets/chart-placeholder.png">
|
src="assets/chart-placeholder.png">
|
||||||
|
@ -407,9 +408,9 @@
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<iframe *ngIf="indicator.indicatorPaths[i].source !== 'image'"
|
<iframe *ngIf="indicator.indicatorPaths[i].source !== 'image'" [class.uk-blend-multiply]="!isFullscreen"
|
||||||
[src]="indicator.indicatorPaths[i].safeResourceUrl" allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"
|
[src]="indicator.indicatorPaths[i].safeResourceUrl" allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"
|
||||||
class="uk-width-1-1 uk-height-large uk-blend-multiply"></iframe>
|
class="uk-width-1-1 uk-height-large"></iframe>
|
||||||
<!-- <div *ngIf="properties.disableFrameLoad && indicator.indicatorPaths[i].source !== 'image'" class="uk-alert uk-alert-danger uk-text-center">I frames-->
|
<!-- <div *ngIf="properties.disableFrameLoad && indicator.indicatorPaths[i].source !== 'image'" class="uk-alert uk-alert-danger uk-text-center">I frames-->
|
||||||
<!-- preview is disabled</div>-->
|
<!-- preview is disabled</div>-->
|
||||||
<div *ngIf="indicator.indicatorPaths[i].source === 'image'">
|
<div *ngIf="indicator.indicatorPaths[i].source === 'image'">
|
||||||
|
|
|
@ -2,6 +2,7 @@ import {
|
||||||
AfterViewInit,
|
AfterViewInit,
|
||||||
ChangeDetectorRef,
|
ChangeDetectorRef,
|
||||||
Component,
|
Component,
|
||||||
|
HostListener,
|
||||||
Input,
|
Input,
|
||||||
OnChanges,
|
OnChanges,
|
||||||
OnDestroy,
|
OnDestroy,
|
||||||
|
@ -95,6 +96,15 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
|
||||||
@ViewChild('editNumberNotify', {static: true}) editNumberNotify: NotifyFormComponent;
|
@ViewChild('editNumberNotify', {static: true}) editNumberNotify: NotifyFormComponent;
|
||||||
@ViewChild('editChartNotify', {static: true}) editChartNotify: NotifyFormComponent;
|
@ViewChild('editChartNotify', {static: true}) editChartNotify: NotifyFormComponent;
|
||||||
@ViewChild('deleteNotify', {static: true}) deleteNotify: NotifyFormComponent;
|
@ViewChild('deleteNotify', {static: true}) deleteNotify: NotifyFormComponent;
|
||||||
|
|
||||||
|
public isFullscreen: boolean = false;
|
||||||
|
@HostListener('fullscreenchange', ['$event'])
|
||||||
|
@HostListener('webkitfullscreenchange', ['$event'])
|
||||||
|
@HostListener('mozfullscreenchange', ['$event'])
|
||||||
|
@HostListener('MSFullscreenChange', ['$event'])
|
||||||
|
screenChange(event) {
|
||||||
|
this.isFullscreen = !this.isFullscreen;
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* Subscriptions
|
* Subscriptions
|
||||||
**/
|
**/
|
||||||
|
|
Loading…
Reference in New Issue