From ada2666ea4485b49b1d8218617f58132697177d7 Mon Sep 17 00:00:00 2001 From: KostyaDanovsky Date: Wed, 20 Sep 2017 13:04:14 +0300 Subject: [PATCH] fix(dashboard): fix temperature chart for IE --- .../temperature-dragger.component.html | 2 ++ .../temperature-dragger.component.scss | 11 +++++++++-- .../temperature-dragger.component.ts | 11 ++++++----- .../dashboard/temperature/temperature.component.scss | 1 + 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html index cada090a..88ee6659 100644 --- a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html +++ b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html @@ -1,3 +1,5 @@ + +
diff --git a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.scss b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.scss index 44ff3bba..3c4ec14c 100644 --- a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.scss +++ b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.scss @@ -2,11 +2,18 @@ @import '~@nebular/theme/styles/global/bootstrap/hero-buttons'; @include nb-install-component() { - display: flex; position: relative; + img { + width: 100%; + height: auto; + visibility: hidden; + } + .svg-container { - position: relative; + position: absolute; + left: 0; + top: 0; width: 100%; height: 100%; z-index: 2; diff --git a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.ts b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.ts index a42a7bbd..c9cf48f9 100644 --- a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.ts +++ b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.ts @@ -1,6 +1,5 @@ import { Component, HostListener, ViewChild, ElementRef, Input, Output, EventEmitter, AfterViewInit, OnChanges, - ChangeDetectorRef, } from '@angular/core'; const VIEW_BOX_SIZE = 300; @@ -76,14 +75,16 @@ export class TemperatureDraggerComponent implements AfterViewInit, OnChanges { private isMouseDown = false; private init = false; - constructor(private changeDetectorRef: ChangeDetectorRef) { + constructor() { this.oldValue = this.value; } ngAfterViewInit(): void { - this.invalidate(); - this.init = true; - this.changeDetectorRef.detectChanges(); + // IE fix + setTimeout(() => { + this.invalidate(); + this.init = true; + }); } ngOnChanges(): void { diff --git a/src/app/pages/dashboard/temperature/temperature.component.scss b/src/app/pages/dashboard/temperature/temperature.component.scss index fae3ef6f..7bb28b30 100644 --- a/src/app/pages/dashboard/temperature/temperature.component.scss +++ b/src/app/pages/dashboard/temperature/temperature.component.scss @@ -25,6 +25,7 @@ .slider-container { display: flex; flex: 1; + -ms-flex: 1 1 auto; justify-content: center; align-items: center; }