Fix for issue text-mask#480: Only set input element if we don't have …

…it (text-mask#555)

* Fix for issue text-mask#480: Only set input element if we don't have it

* Remove unnecesary inputElement checks

angular2/src/angular2TextMask.ts

@@ -45,9 +45,7 @@ export class MaskedInputDirective implements ControlValueAccessor, OnChanges {
  }
 
  writeValue(value: any) {
- if (!this.inputElement) {
- this.setupMask()
- }
+ this.setupMask()
 
  // set the initial value for cases where the mask is disabled
  const normalizedValue = value == null ? '' : value
@@ -67,9 +65,7 @@ export class MaskedInputDirective implements ControlValueAccessor, OnChanges {
  }
 
  onInput(value) {
- if (!this.inputElement) {
- this.setupMask()
- }
+ this.setupMask()
 
  if (this.textMaskInputElement !== undefined) {
  this.textMaskInputElement.update(value)
@@ -86,18 +82,20 @@ export class MaskedInputDirective implements ControlValueAccessor, OnChanges {
  }
 
  private setupMask() {
- if (this.element.nativeElement.tagName === 'INPUT') {
- // `textMask` directive is used directly on an input element
- this.inputElement = this.element.nativeElement
- } else {
- // `textMask` directive is used on an abstracted input element, `ion-input`, `md-input`, etc
- this.inputElement = this.element.nativeElement.getElementsByTagName('INPUT')[0]
- }
+ if (!this.inputElement) {
+ if (this.element.nativeElement.tagName === 'INPUT') {
+ // `textMask` directive is used directly on an input element
+ this.inputElement = this.element.nativeElement
+ } else {
+ // `textMask` directive is used on an abstracted input element, `ion-input`, `md-input`, etc
+ this.inputElement = this.element.nativeElement.getElementsByTagName('INPUT')[0]
+ }
 
- if (this.inputElement) {
- this.textMaskInputElement = createTextMaskInputElement(
- Object.assign({inputElement: this.inputElement}, this.textMaskConfig)
- )
+ if (this.inputElement) {
+ this.textMaskInputElement = createTextMaskInputElement(
+ Object.assign({inputElement: this.inputElement}, this.textMaskConfig)
+ )
+ }
  }
  }
 }