Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit 942d0b9

Browse files
fix(checkbox): ngModel intial value used correctly with events
Fixes #1550.
1 parent ba49edc commit 942d0b9

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

src/components/checkbox/checkbox.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
* @name material.components.checkbox
77
* @description Checkbox module!
88
*/
9-
angular.module('material.components.checkbox', [
10-
'material.core'
11-
])
9+
angular
10+
.module('material.components.checkbox', ['material.core'])
1211
.directive('mdCheckbox', MdCheckboxDirective);
1312

1413
/**
@@ -78,7 +77,6 @@ function MdCheckboxDirective(inputDirective, $mdInkRipple, $mdAria, $mdConstant,
7877

7978
return function postLink(scope, element, attr, ngModelCtrl) {
8079
ngModelCtrl = ngModelCtrl || $mdUtil.fakeNgModel();
81-
var checked = false;
8280
$mdTheming(element);
8381

8482
if (attr.ngChecked) {
@@ -112,15 +110,14 @@ function MdCheckboxDirective(inputDirective, $mdInkRipple, $mdAria, $mdConstant,
112110
if (element[0].hasAttribute('disabled')) return;
113111

114112
scope.$apply(function() {
115-
checked = !checked;
116-
ngModelCtrl.$setViewValue(checked, ev && ev.type);
113+
// Toggle the checkbox value...
114+
ngModelCtrl.$setViewValue( !ngModelCtrl.$viewValue, ev && ev.type);
117115
ngModelCtrl.$render();
118116
});
119117
}
120118

121119
function render() {
122-
checked = ngModelCtrl.$viewValue;
123-
if(checked) {
120+
if(ngModelCtrl.$viewValue) {
124121
element.addClass(CHECKED_CSS);
125122
} else {
126123
element.removeClass(CHECKED_CSS);

0 commit comments

Comments
 (0)