aboutsummaryrefslogtreecommitdiffstats
path: root/src/ngMobile/directive
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/ngMobile/directive
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/ngMobile/directive')
-rw-r--r--src/ngMobile/directive/ngClick.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ngMobile/directive/ngClick.js b/src/ngMobile/directive/ngClick.js
index a6f6ed19..3fa68cb4 100644
--- a/src/ngMobile/directive/ngClick.js
+++ b/src/ngMobile/directive/ngClick.js
@@ -185,7 +185,7 @@ ngMobile.directive('ngClick', ['$parse', '$timeout', '$rootElement',
element.removeClass(ACTIVE_CLASS_NAME);
}
- element.bind('touchstart', function(event) {
+ element.on('touchstart', function(event) {
tapping = true;
tapElement = event.target ? event.target : event.srcElement; // IE uses srcElement.
// Hack for Safari, which can target text nodes instead of containers.
@@ -203,15 +203,15 @@ ngMobile.directive('ngClick', ['$parse', '$timeout', '$rootElement',
touchStartY = e.clientY;
});
- element.bind('touchmove', function(event) {
+ element.on('touchmove', function(event) {
resetState();
});
- element.bind('touchcancel', function(event) {
+ element.on('touchcancel', function(event) {
resetState();
});
- element.bind('touchend', function(event) {
+ element.on('touchend', function(event) {
var diff = Date.now() - startTime;
var touches = (event.changedTouches && event.changedTouches.length) ? event.changedTouches :
@@ -248,17 +248,17 @@ ngMobile.directive('ngClick', ['$parse', '$timeout', '$rootElement',
// Fallback click handler.
// Busted clicks don't get this far, and adding this handler allows ng-tap to be used on
// desktop as well, to allow more portable sites.
- element.bind('click', function(event) {
+ element.on('click', function(event) {
scope.$apply(function() {
clickHandler(scope, {$event: event});
});
});
- element.bind('mousedown', function(event) {
+ element.on('mousedown', function(event) {
element.addClass(ACTIVE_CLASS_NAME);
});
- element.bind('mousemove mouseup', function(event) {
+ element.on('mousemove mouseup', function(event) {
element.removeClass(ACTIVE_CLASS_NAME);
});