From 0f64bccc4335e4d3d9832666afd263d79f83ad15 Mon Sep 17 00:00:00 2001 From: mhartington Date: Fri, 18 Dec 2015 14:54:12 -0500 Subject: [PATCH] chore(): prefix private methods --- ionic/components/app/id.ts | 12 ++++++------ ionic/components/blur/blur.ts | 4 ++-- ionic/components/checkbox/checkbox.ts | 9 ++++----- ionic/components/icon/icon.ts | 12 ++++++------ ionic/components/item/item-sliding.ts | 6 +++--- ionic/components/label/label.ts | 10 +++++----- ionic/components/menu/menu-close.ts | 4 ++-- ionic/components/radio/radio.ts | 8 ++++---- ionic/components/toggle/toggle.ts | 6 +++--- 9 files changed, 35 insertions(+), 36 deletions(-) diff --git a/ionic/components/app/id.ts b/ionic/components/app/id.ts index f8bda41715..8efbe00f5e 100644 --- a/ionic/components/app/id.ts +++ b/ionic/components/app/id.ts @@ -42,23 +42,23 @@ import {IonicApp} from './app'; }) export class IdRef { - constructor(private app: IonicApp, private elementRef: ElementRef, private appViewManager: AppViewManager) { + constructor(private _app: IonicApp, private _elementRef: ElementRef, private _appViewManager: AppViewManager) { // Grab the component this directive is attached to - this.component = appViewManager.getComponent(elementRef); + this.component = _appViewManager.getComponent(_elementRef); } /** * @private */ ngOnInit() { - this.app.register(this.id, this.component); + this._app.register(this.id, this.component); } /** * @private */ ngOnDestroy() { - this.app.unregister(this.id); + this._app.unregister(this.id); } } @@ -80,12 +80,12 @@ export class IdRef { }) export class Attr { - constructor(private renderer: Renderer, private elementRef: ElementRef) {} + constructor(private _renderer: Renderer, private _elementRef: ElementRef) {} /** * @private */ ngOnInit() { - this.renderer.setElementAttribute(this.elementRef, this.attr, ''); + this._renderer.setElementAttribute(this._elementRef, this.attr, ''); } } diff --git a/ionic/components/blur/blur.ts b/ionic/components/blur/blur.ts index d70e3cccce..b2c62432f8 100644 --- a/ionic/components/blur/blur.ts +++ b/ionic/components/blur/blur.ts @@ -20,7 +20,7 @@ import {Directive, Renderer, ElementRef} from 'angular2/core'; selector: '[blur]' }) export class Blur { - constructor(private elementRef: ElementRef, private renderer: Renderer) { - renderer.setElementStyle(elementRef, '-webkit-backdrop-filter', 'blur(10px)'); + constructor(private _elementRef: ElementRef, private _renderer: Renderer) { + _renderer.setElementStyle(_elementRef, '-webkit-backdrop-filter', 'blur(10px)'); } } diff --git a/ionic/components/checkbox/checkbox.ts b/ionic/components/checkbox/checkbox.ts index 46f03486b6..dd7517d012 100644 --- a/ionic/components/checkbox/checkbox.ts +++ b/ionic/components/checkbox/checkbox.ts @@ -54,12 +54,11 @@ import {Form} from '../../util/form'; export class Checkbox { constructor( - private form: Form, + private _form: Form, @Optional() ngControl: NgControl, elementRef: ElementRef ) { - this.form = form; - form.register(this); + _form.register(this); this.onChange = (_) => {}; this.onTouched = (_) => {}; @@ -75,7 +74,7 @@ export class Checkbox { */ ngOnInit() { if (!this.id) { - this.id = 'chk-' + this.form.nextId(); + this.id = 'chk-' + this._form.nextId(); } this.labelId = 'lbl-' + this.id; @@ -132,6 +131,6 @@ export class Checkbox { * @private */ ngOnDestroy() { - this.form.deregister(this); + this._form.deregister(this); } } diff --git a/ionic/components/icon/icon.ts b/ionic/components/icon/icon.ts index d1f1a4abde..31f4962a96 100644 --- a/ionic/components/icon/icon.ts +++ b/ionic/components/icon/icon.ts @@ -40,9 +40,9 @@ import {Config} from '../../config/config'; export class Icon { constructor( - private elementRef: ElementRef, + private _elementRef: ElementRef, config: Config, - private renderer: Renderer + private _renderer: Renderer ) { this.config = config; this.mode = config.get('iconMode'); @@ -52,7 +52,7 @@ export class Icon { * @private */ ngOnInit() { - let ele = this.elementRef.nativeElement; + let ele = this._elementRef.nativeElement; if (this.mode == 'ios' && this.ios) { this.name = this.ios; @@ -113,12 +113,12 @@ export class Icon { if (this._name !== this.name) { if (this._name) { - this.renderer.setElementClass(this.elementRef, this._name, false); + this._renderer.setElementClass(this._elementRef, this._name, false); } this._name = this.name; - this.renderer.setElementClass(this.elementRef, this.name, true); + this._renderer.setElementClass(this._elementRef, this.name, true); - this.renderer.setElementAttribute(this.elementRef, 'aria-label', + this._renderer.setElementAttribute(this._elementRef, 'aria-label', this.name.replace('ion-', '').replace('ios-', '').replace('md-', '').replace('-', ' ')); } } diff --git a/ionic/components/item/item-sliding.ts b/ionic/components/item/item-sliding.ts index 7db35d546a..f653ee6fcf 100644 --- a/ionic/components/item/item-sliding.ts +++ b/ionic/components/item/item-sliding.ts @@ -34,8 +34,8 @@ import {List} from '../list/list'; }) export class ItemSliding { - constructor(@Optional() private list: List, elementRef: ElementRef) { - list.enableSlidingItems(true); + constructor(@Optional() private _list: List, elementRef: ElementRef) { + _list.enableSlidingItems(true); elementRef.nativeElement.$ionSlide = ++slideIds; } @@ -43,7 +43,7 @@ export class ItemSliding { * @private */ close() { - this.list.closeSlidingItems(); + this._list.closeSlidingItems(); } } diff --git a/ionic/components/label/label.ts b/ionic/components/label/label.ts index 668ed560a1..04f877b8b4 100644 --- a/ionic/components/label/label.ts +++ b/ionic/components/label/label.ts @@ -42,9 +42,9 @@ export class Label { constructor( config: Config, @Optional() container: TextInput, - private form: Form, - private elementRef: ElementRef, - private renderer: Renderer + private _form: Form, + private _elementRef: ElementRef, + private _renderer: Renderer ) { this.scrollAssist = config.get('scrollAssist'); this.container = container; @@ -55,7 +55,7 @@ export class Label { */ ngOnInit() { if (!this.id) { - this.id = 'lbl-' + this.form.nextId(); + this.id = 'lbl-' + this._form.nextId(); } this.container && this.container.registerLabel(this); } @@ -94,7 +94,7 @@ export class Label { * @private */ addClass(className) { - this.renderer.setElementClass(this.elementRef, className, true); + this._renderer.setElementClass(this._elementRef, className, true); } } diff --git a/ionic/components/menu/menu-close.ts b/ionic/components/menu/menu-close.ts index 7b3be9e232..e28ca26402 100644 --- a/ionic/components/menu/menu-close.ts +++ b/ionic/components/menu/menu-close.ts @@ -37,13 +37,13 @@ import {Menu} from './menu'; }) export class MenuClose { - constructor(private app: IonicApp) {} + constructor(private _app: IonicApp) {} /** * @private */ close() { - let menu = Menu.getById(this.app, this.menuClose); + let menu = Menu.getById(this._app, this.menuClose); menu && menu.close(); } diff --git a/ionic/components/radio/radio.ts b/ionic/components/radio/radio.ts index 808caa9ca7..a7fc3f8c0b 100644 --- a/ionic/components/radio/radio.ts +++ b/ionic/components/radio/radio.ts @@ -60,7 +60,7 @@ export class RadioGroup extends Ion { elementRef: ElementRef, config: Config, @Optional() ngControl: NgControl, - @Query(ListHeader) private headerQuery: QueryList + @Query(ListHeader) private _headerQuery: QueryList ) { super(elementRef, config); this.ngControl = ngControl; @@ -76,7 +76,7 @@ export class RadioGroup extends Ion { * @private */ ngOnInit() { - let header = this.headerQuery.first; + let header = this._headerQuery.first; if (header) { if (!header.id) { header.id = 'radio-header-' + this.id; @@ -203,7 +203,7 @@ export class RadioButton extends Ion { @Host() @Optional() group: RadioGroup, elementRef: ElementRef, config: Config, - private form: Form + private _form: Form ) { super(elementRef, config); @@ -217,7 +217,7 @@ export class RadioButton extends Ion { ngOnInit() { super.ngOnInit(); if (!this.id) { - this.id = 'rb-' + this.form.nextId(); + this.id = 'rb-' + this._form.nextId(); } this.labelId = 'lbl-' + this.id; diff --git a/ionic/components/toggle/toggle.ts b/ionic/components/toggle/toggle.ts index 900b4731ad..62f892a394 100644 --- a/ionic/components/toggle/toggle.ts +++ b/ionic/components/toggle/toggle.ts @@ -111,7 +111,7 @@ export class Toggle { form: Form, elementRef: ElementRef, config: Config, - @Optional() private ngControl: NgControl + @Optional() private _ngControl: NgControl ) { // deprecated warning if (elementRef.nativeElement.tagName == 'ION-SWITCH') { @@ -129,8 +129,8 @@ export class Toggle { this.onChange = (_) => {}; this.onTouched = (_) => {}; - if (ngControl) { - ngControl.valueAccessor = this; + if (_ngControl) { + _ngControl.valueAccessor = this; } let self = this;