mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-10 00:27:41 +08:00
Poly stuff working better
This commit is contained in:
24
js/ext/angular/src/directive/ionicCheckbox.js
vendored
24
js/ext/angular/src/directive/ionicCheckbox.js
vendored
@ -10,7 +10,8 @@ angular.module('ionic.ui.checkbox', [])
|
||||
replace: true,
|
||||
require: '?ngModel',
|
||||
scope: {},
|
||||
template: '<label class="checkbox"><input type="checkbox"></label>',
|
||||
transclude: true,
|
||||
template: '<label ng-click="tapHandler($event)" class="checkbox"><input type="checkbox"><div ng-transclude></div></label>',
|
||||
|
||||
|
||||
link: function($scope, $element, $attr, ngModel) {
|
||||
@ -22,12 +23,12 @@ angular.module('ionic.ui.checkbox', [])
|
||||
|
||||
if(!checkbox.length) { return; }
|
||||
|
||||
var tapHandler = function(e) {
|
||||
checkbox[0].checked = !checkbox[0].checked;
|
||||
$scope.$apply(function() {
|
||||
ngModel.$setViewValue(checkbox[0].checked);
|
||||
});
|
||||
e.preventDefault();
|
||||
$scope.tapHandler = function(e) {
|
||||
if(e.type != 'click') {
|
||||
checkbox[0].checked = !checkbox[0].checked;
|
||||
}
|
||||
ngModel.$setViewValue(checkbox[0].checked);
|
||||
e.alreadyHandled = true;
|
||||
};
|
||||
|
||||
var clickHandler = function(e) {
|
||||
@ -37,17 +38,8 @@ angular.module('ionic.ui.checkbox', [])
|
||||
});
|
||||
};
|
||||
|
||||
$scope.$on('$destroy', function() {
|
||||
$element.unbind('tap', tapHandler);
|
||||
$element.unbind('click', clickHandler);
|
||||
});
|
||||
|
||||
if(ngModel) {
|
||||
$element.bind('tap', tapHandler);
|
||||
$element.bind('click', clickHandler);
|
||||
|
||||
ngModel.$render = function() {
|
||||
console.log('checkbox redern', ngModel.$viewValue);
|
||||
checkbox[0].checked = ngModel.$viewValue;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user