javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '272-checkboxes'

Browse Source
This commit is contained in:
Max Lynch
2013-12-07 18:01:37 -06:00
parent 3cfcfc01a4 1826f455c5
commit e41d39c0f6
10 changed files with 98 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
dist/js/ionic-angular.js vendored
View File

@@ -305,6 +305,9 @@ angular.module('ionic.service.platform', [])
}
}, 10);
return {
setPlatform: function(p) {
platform = p;
@@ -584,32 +587,29 @@ angular.module('ionic.ui.checkbox', [])
require: '?ngModel',
scope: {},
transclude: true,
template: '<label ng-click="tapHandler($event)" class="checkbox"><input type="checkbox"><div ng-transclude></div></label>',
template: '<li class="item item-checkbox">\
<label class="checkbox">\
<input type="checkbox">\
</label>\
<div class="item-content" ng-transclude>\
</div>\
</li>',
link: function($scope, $element, $attr, ngModel) {
var checkbox;
if(!ngModel) { return; }
checkbox = $element.children().eq(0);
checkbox = angular.element($element[0].querySelector('input[type="checkbox"]'));
if(!checkbox.length) { return; }
$scope.tapHandler = function(e) {
if(e.type != 'click') {
checkbox[0].checked = !checkbox[0].checked;
}
checkbox.bind('change', function(e) {
ngModel.$setViewValue(checkbox[0].checked);
e.alreadyHandled = true;
};
var clickHandler = function(e) {
checkbox[0].checked = !checkbox[0].checked;
$scope.$apply(function() {
ngModel.$setViewValue(checkbox[0].checked);
e.alreadyHandled = true;
});
};
});
if(ngModel) {
ngModel.$render = function() {
@@ -1080,7 +1080,7 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
};
}],
link: function($scope, $element, $attr) {
link: function($scope, $element, $attr, ctrl) {
if(!$element.length) return;
$scope.animation = $attr.animation;
@@ -1139,6 +1139,10 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
}
});
$scope.$on('navRouter.goBack', function(e) {
ctrl.goBack();
});
// Keep track of location changes and update a stack pointer that tracks whether we are
// going forwards or back
@@ -1410,7 +1414,6 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
.directive('navBack', ['$window', '$rootScope', 'Gesture', function($window, $rootScope, Gesture) {
return {
restrict: 'AC',
require: '^?navRouter',
link: function($scope, $element, $attr, navCtrl) {
var goBack = function(e) {
// Only trigger back if the stack is greater than zero
@@ -1418,7 +1421,7 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
$window.history.back();
// Fallback for bad history supporting devices
navCtrl.goBack();
$scope.$emit('navRouter.goBack');
}
e.alreadyHandled = true;
return false;
@@ -1446,8 +1449,8 @@ angular.module('ionic.ui.radio', [])
value: '@'
},
transclude: true,
template: '<label ng-click="tapHandler($event)" class="item item-radio">\
<input type="radio" name="group">\
template: '<label class="item item-radio">\
<input type="radio" name="radio-group">\
<div class="item-content" ng-transclude>\
</div>\
<i class="radio-icon icon ion-checkmark"></i>\
@@ -1462,19 +1465,14 @@ angular.module('ionic.ui.radio', [])
if(!radio.length) { return; }
$scope.tapHandler = function(e) {
radio[0].checked = true;
ngModel.$setViewValue($scope.$eval($attr.ngValue));
e.alreadyHandled = true;
};
var clickHandler = function(e) {
ngModel.$setViewValue($scope.$eval($attr.ngValue));
};
if(ngModel) {
//$element.bind('tap', tapHandler);
$element.bind('click', clickHandler);
radio.bind('click', function(e) {
console.log('RADIO CLICK');
$scope.$apply(function() {
ngModel.$setViewValue($scope.$eval($attr.ngValue));
});
e.alreadyHandled = true;
});
ngModel.$render = function() {
var val = $scope.$eval($attr.ngValue);
@@ -1544,18 +1542,15 @@ angular.module('ionic.ui.radio', [])
if(!ngModel || !radioButtons) { return; }
var setIt = function() {
console.log('SET');
$element.addClass('active');
ngModel.$setViewValue($scope.$eval($attr.ngValue));
radioButtons.select($element);
};
$scope.tapHandler = function(e) {
setIt();
e.alreadyHandled = true;
};
var clickHandler = function(e) {
console.log('CLICK');
setIt();
};
@@ -2174,7 +2169,7 @@ angular.module('ionic.ui.toggle', [])
replace: true,
require: '?ngModel',
scope: {},
template: '<div ng-click="toggleIt($event)" class="toggle"><input type="checkbox"><div class="track"><div class="handle"></div></div></div>',
template: '<div ng-click="toggleIt($event)" class="toggle" skip-tap-poly><input type="checkbox"><div class="track"><div class="handle"></div></div></div>',
link: function($scope, $element, $attr, ngModel) {
var checkbox, handle;