diff --git a/modules/components/src/components/dropdown/dropdown.component.scss b/modules/components/src/components/dropdown/dropdown.component.scss index 18e1b9d..b0d7d25 100644 --- a/modules/components/src/components/dropdown/dropdown.component.scss +++ b/modules/components/src/components/dropdown/dropdown.component.scss @@ -3,8 +3,6 @@ :host { display: block; width: 100%; - transition: filter; - transition-duration: 0.5s; filter: grayscale(80%); } diff --git a/modules/components/src/components/flat-slider/flat-slider.component.ts b/modules/components/src/components/flat-slider/flat-slider.component.ts index 06459b7..e3a2506 100644 --- a/modules/components/src/components/flat-slider/flat-slider.component.ts +++ b/modules/components/src/components/flat-slider/flat-slider.component.ts @@ -227,7 +227,17 @@ export class FlatSliderComponent implements OnInit, OnDestroy { this.dettachWindowEvents() } + @HostListener('mouseenter', [ '$event' ]) + mouseenter () { + if (this.windowEventsAttached) { + this.dettachWindowEvents() + } + } + + private windowEventsAttached = false private attachWindowEvents () { + if (this.windowEventsAttached) return + this.windowEventsAttached = true window.addEventListener('mousemove', this.mousemove, true) window.addEventListener('mouseup', this.mouseup, true) } @@ -235,6 +245,7 @@ export class FlatSliderComponent implements OnInit, OnDestroy { private dettachWindowEvents () { window.removeEventListener('mousemove', this.mousemove, true) window.removeEventListener('mouseup', this.mouseup, true) + this.windowEventsAttached = false } public doubleclickTimeout?: number diff --git a/modules/components/src/components/icon/icons.ts b/modules/components/src/components/icon/icons.ts index c51cf60..9b752a3 100644 --- a/modules/components/src/components/icon/icons.ts +++ b/modules/components/src/components/icon/icons.ts @@ -41,6 +41,11 @@ export const svgs = { open: '', pause: '', pci: '', + pencil: /* html */` + + `, quit: '', reset: '', send: '', diff --git a/modules/components/src/components/knob/knob.component.ts b/modules/components/src/components/knob/knob.component.ts index 36d3077..6b7c39a 100644 --- a/modules/components/src/components/knob/knob.component.ts +++ b/modules/components/src/components/knob/knob.component.ts @@ -160,7 +160,17 @@ export class KnobComponent implements OnInit, OnDestroy { this.dettachWindowEvents() } + @HostListener('mouseenter', [ '$event' ]) + mouseenter () { + if (this.windowEventsAttached) { + this.dettachWindowEvents() + } + } + + private windowEventsAttached = false private attachWindowEvents () { + if (this.windowEventsAttached) return + this.windowEventsAttached = true window.addEventListener('mousemove', this.mousemove, true) window.addEventListener('mouseup', this.mouseup, true) } @@ -168,6 +178,7 @@ export class KnobComponent implements OnInit, OnDestroy { private dettachWindowEvents () { window.removeEventListener('mousemove', this.mousemove, true) window.removeEventListener('mouseup', this.mouseup, true) + this.windowEventsAttached = false } doubleclick () { diff --git a/modules/components/src/components/skeuomorph-slider/skeuomorph-slider.component.ts b/modules/components/src/components/skeuomorph-slider/skeuomorph-slider.component.ts index 3ff91fe..5ab70c1 100644 --- a/modules/components/src/components/skeuomorph-slider/skeuomorph-slider.component.ts +++ b/modules/components/src/components/skeuomorph-slider/skeuomorph-slider.component.ts @@ -8,7 +8,8 @@ import { ViewChild, EventEmitter, HostBinding, - OnDestroy + OnDestroy, + ChangeDetectionStrategy } from '@angular/core' import { UtilitiesService @@ -22,7 +23,8 @@ export interface SkeuomorphSliderValueChangedEvent { @Component({ selector: 'eqm-skeuomorph-slider', templateUrl: './skeuomorph-slider.component.html', - styleUrls: [ './skeuomorph-slider.component.scss' ] + styleUrls: [ './skeuomorph-slider.component.scss' ], + changeDetection: ChangeDetectionStrategy.OnPush }) export class SkeuomorphSliderComponent implements OnInit, OnDestroy { constructor ( @@ -148,7 +150,17 @@ export class SkeuomorphSliderComponent implements OnInit, OnDestroy { this.dettachWindowEvents() } + @HostListener('mouseenter', [ '$event' ]) + mouseenter () { + if (this.windowEventsAttached) { + this.dettachWindowEvents() + } + } + + private windowEventsAttached = false private attachWindowEvents () { + if (this.windowEventsAttached) return + this.windowEventsAttached = true window.addEventListener('mousemove', this.mousemove, true) window.addEventListener('mouseup', this.mouseup, true) } @@ -156,6 +168,7 @@ export class SkeuomorphSliderComponent implements OnInit, OnDestroy { private dettachWindowEvents () { window.removeEventListener('mousemove', this.mousemove, true) window.removeEventListener('mouseup', this.mouseup, true) + this.windowEventsAttached = false } doubleclick () { diff --git a/modules/components/src/components/tooltip/tooltip-container.component.ts b/modules/components/src/components/tooltip/tooltip-container.component.ts index 1ccc8cd..27a4b76 100644 --- a/modules/components/src/components/tooltip/tooltip-container.component.ts +++ b/modules/components/src/components/tooltip/tooltip-container.component.ts @@ -8,7 +8,6 @@ import { FadeInOutAnimation } from '../../animations/fade-in-out'