fix(checkbox): fix pull request comments

* remove redundant css class * add JSDoc to hasLabel and change it from getter to function
angular · Apr 20, 2017 · b5507cd · b5507cd
1 parent ab6e01a
commit b5507cd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/src/lib/checkbox/checkbox.html b/src/lib/checkbox/checkbox.html
@@ -1,6 +1,6 @@
 <label class="mat-checkbox-layout" #label>
   <div class="mat-checkbox-inner-container"
-       [class.mat-checkbox-inner-container-no-side-margin]="!hasLabel">
+       [class.mat-checkbox-inner-container-no-side-margin]="!_hasLabel()">
     <input #input
            class="mat-checkbox-input cdk-visually-hidden" type="checkbox"
            [id]="inputId"

diff --git a/src/lib/checkbox/checkbox.scss b/src/lib/checkbox/checkbox.scss
@@ -226,12 +226,12 @@ $_mat-checkbox-mark-stroke-size: 2 / 15 * $mat-checkbox-size !default;
       right: auto;
     }
   }
+}
 
-  &.mat-checkbox-inner-container-no-side-margin {
-    margin: {
-      left: 0;
-      right: 0;
-    }
+.mat-checkbox-inner-container-no-side-margin {
+  margin: {
+    left: 0;
+    right: 0;
   }
 }
 
@@ -300,13 +300,6 @@ $_mat-checkbox-mark-stroke-size: 2 / 15 * $mat-checkbox-size !default;
         right: $_mat-checkbox-item-spacing;
       }
     }
-
-    &.mat-checkbox-inner-container-no-side-margin {
-      margin: {
-        left: 0;
-        right: 0;
-      }
-    }
   }
 }
 

diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
@@ -166,9 +166,10 @@ export class MdCheckbox implements ControlValueAccessor, AfterViewInit, OnDestro
 
   @ViewChild('labelWrapper') _labelWrapper: ElementRef;
 
-  get hasLabel(): boolean {
-    const labelWrapperTextContent = this._labelWrapper.nativeElement.textContent;
-    return labelWrapperTextContent && labelWrapperTextContent.trim().length > 0;
+  /** Whether the checkbox has label */
+  _hasLabel(): boolean {
+    const labelText = this._labelWrapper.nativeElement.textContent || '';
+    return !!labelText.trim().length;
   }
 
   /**