From e93576bfabccec8bb04301e65a62e94d01a6069d Mon Sep 17 00:00:00 2001
From: Yuan Gao <tinagao@google.com>
Date: Tue, 16 May 2017 15:55:45 -0700
Subject: [PATCH] Fix checkbox label not read in JAWS

---
 src/lib/checkbox/checkbox.html | 72 +++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/lib/checkbox/checkbox.html b/src/lib/checkbox/checkbox.html
index 7676f48c69f8..98914d003fa5 100644
--- a/src/lib/checkbox/checkbox.html
+++ b/src/lib/checkbox/checkbox.html
@@ -1,40 +1,40 @@
-<label class="mat-checkbox-layout" #label>
-  <div class="mat-checkbox-inner-container"
-       [class.mat-checkbox-inner-container-no-side-margin]="!_hasLabel()">
-    <input #input
-           class="mat-checkbox-input cdk-visually-hidden" type="checkbox"
-           [id]="inputId"
-           [required]="required"
-           [checked]="checked"
-           [value]="value"
-           [disabled]="disabled"
-           [name]="name"
-           [tabIndex]="tabIndex"
-           [indeterminate]="indeterminate"
-           [attr.aria-label]="ariaLabel"
-           [attr.aria-labelledby]="ariaLabelledby"
-           (change)="_onInteractionEvent($event)"
-           (click)="_onInputClick($event)">
-    <div md-ripple class="mat-checkbox-ripple"
-         [mdRippleTrigger]="label"
-         [mdRippleDisabled]="_isRippleDisabled()"
-         [mdRippleCentered]="true"></div>
-    <div class="mat-checkbox-frame"></div>
-    <div class="mat-checkbox-background">
-      <svg version="1.1"
-           class="mat-checkbox-checkmark"
-           xmlns="http://www.w3.org/2000/svg"
-           viewBox="0 0 24 24"
-           xml:space="preserve">
-        <path class="mat-checkbox-checkmark-path"
-              fill="none"
-              stroke="white"
-              d="M4.1,12.7 9,17.6 20.3,6.3"/>
-      </svg>
-      <!-- Element for rendering the indeterminate state checkbox. -->
-      <div class="mat-checkbox-mixedmark"></div>
-    </div>
+<div class="mat-checkbox-inner-container"
+     [class.mat-checkbox-inner-container-no-side-margin]="!_hasLabel()">
+  <input #input
+         class="mat-checkbox-input cdk-visually-hidden" type="checkbox"
+         [id]="inputId"
+         [required]="required"
+         [checked]="checked"
+         [value]="value"
+         [disabled]="disabled"
+         [name]="name"
+         [tabIndex]="tabIndex"
+         [indeterminate]="indeterminate"
+         [attr.aria-label]="ariaLabel"
+         [attr.aria-labelledby]="ariaLabelledby"
+         (change)="_onInteractionEvent($event)"
+         (click)="_onInputClick($event)">
+  <div md-ripple class="mat-checkbox-ripple"
+       [mdRippleTrigger]="label"
+       [mdRippleDisabled]="_isRippleDisabled()"
+       [mdRippleCentered]="true"></div>
+  <div class="mat-checkbox-frame"></div>
+  <div class="mat-checkbox-background">
+    <svg version="1.1"
+         class="mat-checkbox-checkmark"
+         xmlns="http://www.w3.org/2000/svg"
+         viewBox="0 0 24 24"
+         xml:space="preserve">
+      <path class="mat-checkbox-checkmark-path"
+            fill="none"
+            stroke="white"
+            d="M4.1,12.7 9,17.6 20.3,6.3"/>
+    </svg>
+    <!-- Element for rendering the indeterminate state checkbox. -->
+    <div class="mat-checkbox-mixedmark"></div>
   </div>
+</div>
+<label class="mat-checkbox-layout" [attr.for]="inputId" #label>
   <span class="mat-checkbox-label" #labelWrapper>
     <ng-content></ng-content>
   </span>