Fixed private methods and injections

This commit is contained in:
Sercan Yemen 2018-06-15 17:45:27 +03:00
parent 22b3a3c799
commit 65523c3c95
15 changed files with 36 additions and 30 deletions

View File

@ -130,7 +130,7 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy
'type' : 'item',
'icon' : 'settings',
'function': () => {
this._toggleSidebarOpen('themeOptionsPanel');
this.toggleSidebarOpen('themeOptionsPanel');
}
}
]
@ -281,13 +281,16 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy
}
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
/**
* Toggle sidebar open
*
* @param key
* @private
*/
private _toggleSidebarOpen(key): void
toggleSidebarOpen(key): void
{
this._fuseSidebarService.getSidebar(key).toggleOpen();
}

View File

@ -20,7 +20,7 @@
<!-- THEME OPTIONS PANEL -->
<button mat-icon-button class="mat-primary-bg mat-elevation-z2 theme-options-button"
(click)="_toggleSidebarOpen('themeOptionsPanel')">
(click)="toggleSidebarOpen('themeOptionsPanel')">
<mat-icon>settings</mat-icon>
</button>

View File

@ -98,16 +98,15 @@ export class AppComponent implements OnInit, OnDestroy
}
// -----------------------------------------------------------------------------------------------------
// @ Private methods
// @ Public methods
// -----------------------------------------------------------------------------------------------------
/**
* Toggle sidebar open
*
* @param key
* @private
*/
private _toggleSidebarOpen(key): void
private toggleSidebarOpen(key): void
{
this._fuseSidebarService.getSidebar(key).toggleOpen();
}

View File

@ -13,7 +13,7 @@
<div class="toolbar-separator" *ngIf="!hiddenNavbar && !rightNavbar" fxHide.gt-md></div>
<div fxLayout="row" fxLayoutAlign="start center" *ngIf="horizontalNav">
<div fxLayout="row" fxLayoutAlign="start center" *ngIf="horizontalNavbar">
<div class="logo ml-16">
<img class="logo-icon" src="assets/images/logos/fuse.svg">
</div>

View File

@ -2,7 +2,7 @@
<mat-toolbar class="mat-accent m-0">
<mat-toolbar-row fxFlex fxLayout="row" fxLayoutAlign="space-between center">
<span class="title dialog-title">{{dialogTitle}}</span>
<button mat-icon-button (click)="_matDialogRef.close()" aria-label="Close dialog">
<button mat-icon-button (click)="matDialogRef.close()" aria-label="Close dialog">
<mat-icon>close</mat-icon>
</button>
</mat-toolbar-row>

View File

@ -25,12 +25,12 @@ export class CalendarEventFormDialogComponent
/**
* Constructor
*
* @param {MatDialogRef<CalendarEventFormDialogComponent>} _matDialogRef
* @param {MatDialogRef<CalendarEventFormDialogComponent>} matDialogRef
* @param _data
* @param {FormBuilder} _formBuilder
*/
constructor(
private _matDialogRef: MatDialogRef<CalendarEventFormDialogComponent>,
public matDialogRef: MatDialogRef<CalendarEventFormDialogComponent>,
@Inject(MAT_DIALOG_DATA) private _data: any,
private _formBuilder: FormBuilder
)

View File

@ -91,8 +91,8 @@
<!-- REPLY FORM -->
<form #replyForm="ngForm"
(ngSubmit)="reply($event)"
(keyup.enter)="reply($event)"
(ngSubmit)="reply()"
(keyup.enter)="reply()"
fxFlex class="reply-form"
fxLayout="row"
fxLayoutAlign="start center">

View File

@ -2,7 +2,7 @@
<mat-toolbar matDialogTitle class="mat-accent m-0">
<mat-toolbar-row fxLayout="row" fxLayoutAlign="space-between center">
<span class="title dialog-title">{{dialogTitle}}</span>
<button mat-icon-button (click)="_matDialogRef.close()" aria-label="Close dialog">
<button mat-icon-button (click)="matDialogRef.close()" aria-label="Close dialog">
<mat-icon>close</mat-icon>
</button>
</mat-toolbar-row>

View File

@ -21,12 +21,12 @@ export class ContactsContactFormDialogComponent
/**
* Constructor
*
* @param {MatDialogRef<ContactsContactFormDialogComponent>} _matDialogRef
* @param {MatDialogRef<ContactsContactFormDialogComponent>} matDialogRef
* @param _data
* @param {FormBuilder} _formBuilder
*/
constructor(
private _matDialogRef: MatDialogRef<ContactsContactFormDialogComponent>,
public matDialogRef: MatDialogRef<ContactsContactFormDialogComponent>,
@Inject(MAT_DIALOG_DATA) private _data: any,
private _formBuilder: FormBuilder
)

View File

@ -2,7 +2,7 @@
<mat-toolbar class="mat-accent m-0">
<mat-toolbar-row fxFlex fxLayout="row" fxLayoutAlign="space-between center">
<span class="title dialog-title">New Message</span>
<button mat-icon-button (click)="_matDialogRef.close()" aria-label="Close dialog">
<button mat-icon-button (click)="matDialogRef.close()" aria-label="Close dialog">
<mat-icon>close</mat-icon>
</button>
</mat-toolbar-row>
@ -86,7 +86,7 @@
<div mat-dialog-actions class="m-0 p-16" fxLayout="row" fxLayoutAlign="space-between center">
<div>
<button mat-raised-button
(click)="_matDialogRef.close(['send',composeForm])"
(click)="matDialogRef.close(['send',composeForm])"
class="save-button mat-accent"
[disabled]="composeForm.invalid"
aria-label="SAVE">
@ -98,7 +98,7 @@
</button>
</div>
<button mat-icon-button (click)="_matDialogRef.close(['delete',composeForm])" aria-label="Delete"
<button mat-icon-button (click)="matDialogRef.close(['delete',composeForm])" aria-label="Delete"
matTooltip="Delete">
<mat-icon>delete</mat-icon>
</button>

View File

@ -15,12 +15,12 @@ export class MailNgrxComposeDialogComponent
/**
* Constructor
*
* @param {MatDialogRef<MailNgrxComposeDialogComponent>} _matDialogRef
* @param {MatDialogRef<MailNgrxComposeDialogComponent>} matDialogRef
* @param _data
* @param {FormBuilder} _formBuilder
*/
constructor(
private _matDialogRef: MatDialogRef<MailNgrxComposeDialogComponent>,
public matDialogRef: MatDialogRef<MailNgrxComposeDialogComponent>,
@Inject(MAT_DIALOG_DATA) private _data: any,
private _formBuilder: FormBuilder
)

View File

@ -2,7 +2,7 @@
<mat-toolbar class="mat-accent m-0">
<mat-toolbar-row fxFlex fxLayout="row" fxLayoutAlign="space-between center">
<span class="title dialog-title">New Message</span>
<button mat-icon-button (click)="_matDialogRef.close()" aria-label="Close dialog">
<button mat-icon-button (click)="matDialogRef.close()" aria-label="Close dialog">
<mat-icon>close</mat-icon>
</button>
</mat-toolbar-row>
@ -91,7 +91,7 @@
<div mat-dialog-actions class="m-0 p-16" fxLayout="row" fxLayoutAlign="space-between center">
<div>
<button mat-raised-button
(click)="_matDialogRef.close(['send',composeForm])"
(click)="matDialogRef.close(['send',composeForm])"
class="save-button mat-accent"
[disabled]="composeForm.invalid"
aria-label="SAVE">
@ -103,7 +103,7 @@
</button>
</div>
<button mat-icon-button (click)="_matDialogRef.close(['delete',composeForm])"
<button mat-icon-button (click)="matDialogRef.close(['delete',composeForm])"
aria-label="Delete"
matTooltip="Delete">
<mat-icon>delete</mat-icon>

View File

@ -16,11 +16,11 @@ export class MailComposeDialogComponent
/**
* Constructor
*
* @param {MatDialogRef<MailComposeDialogComponent>} _matDialogRef
* @param {MatDialogRef<MailComposeDialogComponent>} matDialogRef
* @param _data
*/
constructor(
private _matDialogRef: MatDialogRef<MailComposeDialogComponent>,
public matDialogRef: MatDialogRef<MailComposeDialogComponent>,
@Inject(MAT_DIALOG_DATA) private _data: any
)
{

View File

@ -11,7 +11,7 @@
</div>
<div mat-dialog-actions class="m-0 p-16" fxLayout="row" fxLayoutAlign="end center">
<button mat-button (click)="_matDialogRef.close()" class="mat-accent" aria-label="Close">
<button mat-button (click)="matDialogRef.close()" class="mat-accent" aria-label="Close">
CLOSE
</button>
</div>

View File

@ -9,10 +9,14 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
})
export class KnowledgeBaseArticleComponent
{
article: any;
/**
* Constructor
*
* @param {MatDialogRef<KnowledgeBaseArticleComponent>} matDialogRef
* @param _data
*/
constructor(
private _matDialogRef: MatDialogRef<KnowledgeBaseArticleComponent>,
public matDialogRef: MatDialogRef<KnowledgeBaseArticleComponent>,
@Inject(MAT_DIALOG_DATA) public _data: any
)
{