diff options
| author | Michał Gołębiowski | 2013-06-19 20:52:50 +0100 |
|---|---|---|
| committer | Pete Bacon Darwin | 2013-06-19 20:53:24 +0100 |
| commit | f1b94b4b599ab701bc75b55bbbbb73c5ef329a93 (patch) | |
| tree | 033c39426a25c8ac86dc7dc4efb1b4d05fe05272 /src/ngMobile | |
| parent | 0bfa29377d7a77b360ecd3209d56eeb4f68a5043 (diff) | |
| download | angular.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')
| -rw-r--r-- | src/ngMobile/directive/ngClick.js | 14 | ||||
| -rw-r--r-- | src/ngMobile/swipe.js | 8 |
2 files changed, 11 insertions, 11 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); }); diff --git a/src/ngMobile/swipe.js b/src/ngMobile/swipe.js index 612d65fd..99e58eee 100644 --- a/src/ngMobile/swipe.js +++ b/src/ngMobile/swipe.js @@ -75,7 +75,7 @@ ngMobile.factory('$swipe', [function() { // Whether a swipe is active. var active = false; - element.bind('touchstart mousedown', function(event) { + element.on('touchstart mousedown', function(event) { startCoords = getCoordinates(event); active = true; totalX = 0; @@ -84,12 +84,12 @@ ngMobile.factory('$swipe', [function() { eventHandlers['start'] && eventHandlers['start'](startCoords); }); - element.bind('touchcancel', function(event) { + element.on('touchcancel', function(event) { active = false; eventHandlers['cancel'] && eventHandlers['cancel'](); }); - element.bind('touchmove mousemove', function(event) { + element.on('touchmove mousemove', function(event) { if (!active) return; // Android will send a touchcancel if it thinks we're starting to scroll. @@ -124,7 +124,7 @@ ngMobile.factory('$swipe', [function() { } }); - element.bind('touchend mouseup', function(event) { + element.on('touchend mouseup', function(event) { if (!active) return; active = false; eventHandlers['end'] && eventHandlers['end'](getCoordinates(event)); |
