Skip to content

Commit ef8b589

Browse files
committed
made clickedOutside binding a directive instead of class
1 parent e03ba95 commit ef8b589

5 files changed

Lines changed: 10 additions & 16 deletions

File tree

ui/src/app/modules/eqmac-components/components/dropdown/dropdown.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@ import { SelectBoxComponent } from '../select-box/select-box.component'
33
import { UtilitiesService } from '../../services/utilities.service'
44
import { InputFieldComponent } from '../input-field/input-field.component'
55
import { FadeInOutAnimation } from 'src/app/modules/animations'
6-
import { ClickedOutsideComponent } from '../clicked-outside.component'
76

87
@Component({
98
selector: 'eqm-dropdown',
109
templateUrl: './dropdown.component.html',
1110
styleUrls: ['./dropdown.component.scss'],
1211
animations: [ FadeInOutAnimation ]
1312
})
14-
export class DropdownComponent extends ClickedOutsideComponent implements OnInit {
13+
export class DropdownComponent implements OnInit {
1514
constructor (public utils: UtilitiesService, public zone: NgZone) {
16-
super()
1715
}
16+
1817
public _items: any[] = []
1918
hasSelection = false
2019
@Input() editable = false

ui/src/app/modules/eqmac-components/components/select-box/select-box.component.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { Component, OnInit, Input, Output, EventEmitter, ViewChild, ElementRef } from '@angular/core'
2-
import { ClickedOutsideComponent } from '../clicked-outside.component'
32

43
@Component({
54
selector: 'eqm-select-box',
65
templateUrl: './select-box.component.html',
76
styleUrls: ['./select-box.component.scss']
87
})
9-
export class SelectBoxComponent extends ClickedOutsideComponent implements OnInit {
8+
export class SelectBoxComponent implements OnInit {
109

1110
_items: any[] = []
1211
@Input()
@@ -41,7 +40,6 @@ export class SelectBoxComponent extends ClickedOutsideComponent implements OnIni
4140
itemHeight = 25
4241

4342
constructor (public host: ElementRef) {
44-
super()
4543
}
4644

4745
ngOnInit () {

ui/src/app/modules/eqmac-components/components/clicked-outside.component.ts renamed to ui/src/app/modules/eqmac-components/directives/clicked-outside.directive.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
import { Component, EventEmitter, HostListener, Output } from "@angular/core";
1+
import { Component, Directive, EventEmitter, HostListener, Output } from "@angular/core";
22

3-
4-
// @Component({
5-
// template: ``
6-
// })
7-
export class ClickedOutsideComponent {
3+
@Directive({ selector: `[clickedOutside]` })
4+
export class ClickedOutsideDirective {
85
@Output() clickedOutside = new EventEmitter()
96

107
private inside = false

ui/src/app/modules/eqmac-components/eqmac-components.module.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import { PromptComponent } from './components/prompt/prompt.component'
4545
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
4646
import { CarouselComponent, CarouselItemDirective, CarouselItemElement } from './components/carousel/carousel.component'
4747
import { QuestionComponent } from './components/question/question.component'
48-
import { ClickedOutsideComponent } from './components/clicked-outside.component'
48+
import { ClickedOutsideDirective } from './directives/clicked-outside.directive'
4949

5050
@NgModule({
5151
imports: [
@@ -56,6 +56,7 @@ import { ClickedOutsideComponent } from './components/clicked-outside.component'
5656
BrowserAnimationsModule
5757
],
5858
declarations: [
59+
ClickedOutsideDirective,
5960
KnobComponent,
6061
MouseWheelDirective,
6162
ValueScreenComponent,
@@ -85,6 +86,7 @@ import { ClickedOutsideComponent } from './components/clicked-outside.component'
8586
QuestionComponent
8687
],
8788
exports: [
89+
ClickedOutsideDirective,
8890
KnobComponent,
8991
ValueScreenComponent,
9092
ButtonComponent,

ui/src/app/sections/settings/settings.component.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ import { ApplicationService } from '../../services/app.service'
55
import { MatDialog } from '@angular/material/dialog'
66
import { ConfirmDialogComponent } from '../../components/confirm-dialog/confirm-dialog.component'
77
import { UIService } from '../../services/ui.service'
8-
import { ClickedOutsideComponent } from '../../modules/eqmac-components/components/clicked-outside.component'
98

109
@Component({
1110
selector: 'eqm-settings',
1211
templateUrl: './settings.component.html',
1312
styleUrls: ['./settings.component.scss']
1413
})
15-
export class SettingsComponent extends ClickedOutsideComponent implements OnInit {
14+
export class SettingsComponent implements OnInit {
1615
launchOnStartupOption: CheckboxOption = {
1716
key: 'launchOnStartup',
1817
type: 'checkbox',
@@ -96,7 +95,6 @@ export class SettingsComponent extends ClickedOutsideComponent implements OnInit
9695
public dialog: MatDialog,
9796
public ui: UIService
9897
) {
99-
super()
10098
this.getDriverReinstallAvailable()
10199
}
102100

0 commit comments

Comments
 (0)