aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng/directive/select.js
diff options
context:
space:
mode:
authorMichał Gołębiowski2013-06-19 20:52:50 +0100
committerPete Bacon Darwin2013-06-19 20:53:24 +0100
commitf1b94b4b599ab701bc75b55bbbbb73c5ef329a93 (patch)
tree033c39426a25c8ac86dc7dc4efb1b4d05fe05272 /src/ng/directive/select.js
parent0bfa29377d7a77b360ecd3209d56eeb4f68a5043 (diff)
downloadangular.js-f1b94b4b599ab701bc75b55bbbbb73c5ef329a93.tar.bz2
feat(jqLite): switch bind/unbind to more recent jQuery on/off
jQuery switched to a completely new event binding implementation as of 1.7.0, centering around on/off methods instead of previous bind/unbind. This patch makes jqLite match this implementation while still supporting previous bind/unbind methods.
Diffstat (limited to 'src/ng/directive/select.js')
-rw-r--r--src/ng/directive/select.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ng/directive/select.js b/src/ng/directive/select.js
index 0d5221fb..a62f706c 100644
--- a/src/ng/directive/select.js
+++ b/src/ng/directive/select.js
@@ -257,7 +257,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
}
};
- selectElement.bind('change', function() {
+ selectElement.on('change', function() {
scope.$apply(function() {
if (unknownOption.parent()) unknownOption.remove();
ngModelCtrl.$setViewValue(selectElement.val());
@@ -283,7 +283,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
}
});
- selectElement.bind('change', function() {
+ selectElement.on('change', function() {
scope.$apply(function() {
var array = [];
forEach(selectElement.find('option'), function(option) {
@@ -334,7 +334,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
// clear contents, we'll add what's needed based on the model
selectElement.html('');
- selectElement.bind('change', function() {
+ selectElement.on('change', function() {
scope.$apply(function() {
var optionGroup,
collection = valuesFn(scope) || [],
@@ -598,7 +598,7 @@ var optionDirective = ['$interpolate', function($interpolate) {
selectCtrl.addOption(attr.value);
}
- element.bind('$destroy', function() {
+ element.on('$destroy', function() {
selectCtrl.removeOption(attr.value);
});
};