fix(ngTouch): ngClick does not pass touchend event when jQuery is loaded

Steven Sojka · jeffbcross · commit 9fd92cc3c93a · 2013-10-08T09:14:33.000-07:00
The trigger handler event in jqLite takes an event object as a second
parameter, but jQuery requires an array of parameters. This is causing
the touchend event to not come thtough in the click handler when jQuery
is loaded.
diff --git a/src/jqLite.js b/src/jqLite.js
@@ -803,13 +803,16 @@ forEach({
 
   triggerHandler: function(element, eventName, eventData) {
     var eventFns = (JQLiteExpandoStore(element, 'events') || {})[eventName];
-    eventData = eventData || {
+    
+    eventData = eventData || [];
+
+    var event = [{
       preventDefault: noop,
       stopPropagation: noop
-    };
+    }];
 
     forEach(eventFns, function(fn) {
-      fn.call(element, eventData);
+      fn.apply(element, event.concat(eventData));
     });
   }
 }, function(fn, name){
diff --git a/src/ngTouch/directive/ngClick.js b/src/ngTouch/directive/ngClick.js
@@ -238,7 +238,7 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
         }
 
         if (!angular.isDefined(attr.disabled) || attr.disabled === false) {
-          element.triggerHandler('click', event);
+          element.triggerHandler('click', [event]);
         }
       }
 
@@ -255,9 +255,9 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
     // - On mobile browsers, the simulated "fast" click will call this.
     // - But the browser's follow-up slow click will be "busted" before it reaches this handler.
     // Therefore it's safe to use this directive on both mobile and desktop.
-    element.on('click', function(event) {
+    element.on('click', function(event, touchend) {
       scope.$apply(function() {
-        clickHandler(scope, {$event: event});
+        clickHandler(scope, {$event: (touchend || event)});
       });
     });
 
diff --git a/test/jqLiteSpec.js b/test/jqLiteSpec.js
@@ -1343,6 +1343,18 @@ describe('jqLite', function() {
       event = pokeSpy.mostRecentCall.args[0];
       expect(event.preventDefault).toBeDefined();
     });
+
+    it('should pass data as an additional argument', function() {
+      var element = jqLite('<a>poke</a>'),
+          pokeSpy = jasmine.createSpy('poke'),
+          data;
+
+      element.on('click', pokeSpy);
+
+      element.triggerHandler('click', [{hello: "world"}]);
+      data = pokeSpy.mostRecentCall.args[1];
+      expect(data.hello).toBe("world");
+    });
   });
 
 

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`if (!angular.isDefined(attr.disabled) \|\| attr.disabled === false) {`
`241`		`- element.triggerHandler('click', event);`
	`241`	`+ element.triggerHandler('click', [event]);`
`242`	`242`	`}`
`243`	`243`	`}`
`244`	`244`
`@@ -255,9 +255,9 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',`
`255`	`255`	`// - On mobile browsers, the simulated "fast" click will call this.`
`256`	`256`	`// - But the browser's follow-up slow click will be "busted" before it reaches this handler.`
`257`	`257`	`// Therefore it's safe to use this directive on both mobile and desktop.`
`258`		`- element.on('click', function(event) {`
	`258`	`+ element.on('click', function(event, touchend) {`
`259`	`259`	`scope.$apply(function() {`
`260`		`- clickHandler(scope, {$event: event});`
	`260`	`+ clickHandler(scope, {$event: (touchend \|\| event)});`
`261`	`261`	`});`
`262`	`262`	`});`
`263`	`263`