javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 23:16:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Poly stuff working better

Browse Source
This commit is contained in:
Max Lynch
2013-11-14 21:29:02 -06:00
parent df1d9c4d75
commit 37be253f60
7 changed files with 48 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
js/ext/angular/src/directive/ionicCheckbox.js vendored
View File

@ -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;
};
}

8
js/ext/angular/src/directive/ionicRadio.js vendored
View File

@ -14,7 +14,7 @@ angular.module('ionic.ui.radio', [])
value: '@'
},
transclude: true,
template: '<label class="item item-radio">\
template: '<label ng-click="tapHandler($event)" class="item item-radio">\
<input type="radio" name="group">\
<div class="item-content" ng-transclude>\
</div>\
@ -30,10 +30,10 @@ angular.module('ionic.ui.radio', [])
if(!radio.length) { return; }
var tapHandler = function(e) {
$scope.tapHandler = function(e) {
radio[0].checked = true;
ngModel.$setViewValue($scope.$eval($attr.ngValue));
e.preventDefault();
e.alreadyHandled = true;
};
var clickHandler = function(e) {
@ -46,7 +46,7 @@ angular.module('ionic.ui.radio', [])
});
if(ngModel) {
$element.bind('tap', tapHandler);
//$element.bind('tap', tapHandler);
$element.bind('click', clickHandler);
ngModel.$render = function() {