Rename errorStateFn to errorStateMatcher

Author: willshowell

src/demo-app/input/input-demo.html

@@ -96,7 +96,7 @@ <h4>Inside a form</h4>
     </form>
 
     <h4>With a custom error function</h4>
-    <md-input-container [errorStateFn]="customErrorStateFn">
+    <md-input-container [errorStateMatcher]="customErrorStateMatcher">
       <input mdInput placeholder="example" [(ngModel)]="errorMessageExample4" required>
       <md-error>This field is required</md-error>
     </md-input-container>

src/demo-app/input/input-demo.ts

@@ -42,7 +42,7 @@ export class InputDemo {
     }
   }
 
-  customErrorStateFn(c: NgControl): boolean {
+  customErrorStateMatcher(c: NgControl): boolean {
     const isDirty = c.dirty;
     const isInvalid = c.invalid;
 

src/lib/input/input-container.spec.ts

@@ -57,7 +57,7 @@ describe('MdInputContainer', function () {
         MdInputContainerWithDynamicPlaceholder,
         MdInputContainerWithFormControl,
         MdInputContainerWithFormErrorMessages,
-        MdInputContainerWithCustomErrorStateFunction,
+        MdInputContainerWithCustomErrorStateMatcher,
         MdInputContainerWithFormGroupErrorMessages,
         MdInputContainerWithId,
         MdInputContainerWithPrefixAndSuffix,
@@ -671,11 +671,11 @@ describe('MdInputContainer', function () {
       });
     }));
 
-    it('should display an error message when a custom error function returns true', async(() => {
+    it('should display an error message when a custom error matcher returns true', async(() => {
       fixture.destroy();
 
-      let customFixture = TestBed.createComponent(MdInputContainerWithCustomErrorStateFunction);
-      let component: MdInputContainerWithCustomErrorStateFunction;
+      let customFixture = TestBed.createComponent(MdInputContainerWithCustomErrorStateMatcher);
+      let component: MdInputContainerWithCustomErrorStateMatcher;
 
       customFixture.detectChanges();
       component = customFixture.componentInstance;
@@ -1017,20 +1017,20 @@ class MdInputContainerWithFormErrorMessages {
 @Component({
   template: `
     <form #form="ngForm" novalidate>
-      <md-input-container [errorStateFn]="customErrorStateFn.bind(this)">
+      <md-input-container [errorStateMatcher]="customErrorStateMatcher.bind(this)">
         <input mdInput [formControl]="formControl">
         <md-hint>Please type something</md-hint>
         <md-error>This field is required</md-error>
       </md-input-container>
     </form>
   `
 })
-class MdInputContainerWithCustomErrorStateFunction {
+class MdInputContainerWithCustomErrorStateMatcher {
   @ViewChild('form') form: NgForm;
   formControl = new FormControl('', Validators.required);
   errorState = false;
 
-  customErrorStateFn(c: NgControl): boolean {
+  customErrorStateMatcher(c: NgControl): boolean {
     return this.errorState;
   }
 }

src/lib/input/input-container.ts

@@ -337,7 +337,7 @@ export class MdInputContainer implements AfterViewInit, AfterContentInit, AfterC
   private _floatPlaceholder: FloatPlaceholderType = 'auto';
 
   /** A function used to control when error messages are shown. */
-  @Input() errorStateFn: (control: NgControl) => boolean;
+  @Input() errorStateMatcher: (control: NgControl) => boolean;
 
   @ViewChild('underline') underlineRef: ElementRef;
 
@@ -394,7 +394,7 @@ export class MdInputContainer implements AfterViewInit, AfterContentInit, AfterC
   /** Whether the input container is in an error state. */
   _isErrorState(): boolean {
     const control = this._mdInputChild._ngControl;
-    return this.errorStateFn ? this.errorStateFn(control) : this._defaultErrorStateFn(control);
+    return this.errorStateMatcher ? this.errorStateMatcher(control) : this._defaultErrorStateMatcher(control);
   }
 
   /** Determines whether to display hints or errors. */
@@ -403,7 +403,7 @@ export class MdInputContainer implements AfterViewInit, AfterContentInit, AfterC
   }
 
   /** Default error state calculation */
-  private _defaultErrorStateFn(control: NgControl): boolean {
+  private _defaultErrorStateMatcher(control: NgControl): boolean {
     const isInvalid = control && control.invalid;
     const isTouched = control && control.touched;
     const isSubmitted = (this._parentFormGroup && this._parentFormGroup.submitted) ||