Skip to content

Commit d490bc2

Browse files
committed
resolved conflicts
1 parent 4cc4428 commit d490bc2

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/lib/checkbox/checkbox.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,17 @@ export class MdCheckbox implements ControlValueAccessor {
9191
@Input() id: string = `md-checkbox-${++nextId}`;
9292

9393
/** Whether the ripple effect on click should be disabled. */
94-
@Input() @BooleanFieldValue() disableRipple: boolean = false;
94+
private _disableRipple: boolean;
95+
96+
@Input()
97+
get disableRipple(): boolean { return this._disableRipple; }
98+
set disableRipple(value) { this._disableRipple = coerceBooleanProperty(value); }
9599

96100
/** ID to be applied to the `input` element */
97101
get inputId(): string {
98102
return `input-${this.id}`;
99103
}
100-
104+
101105
private _required: boolean;
102106

103107
/** Whether the checkbox is required or not. */

0 commit comments

Comments
 (0)