@@ -27,7 +27,7 @@ * to jQuery.Event objects. */ $.each(['touches', 'targetTouches'], function(){ - if (!($.inArray($.event.props, this))) { + if ($.inArray(this, $.event.props) < 0) { $.event.props.push(this); } }); @@ -275,10 +275,13 @@ }, getTouches: function(event) { - var touches = window.event && window.event.targetTouches; - if (touches === undefined && window.console) { + var touches = event.targetTouches, + console = window.console; + + if (touches === undefined && console) { console.warn('No event.targetTouches'); } + return touches; } }; jqswipe.js @@ -329,17 +329,12 @@ test("test event monkey patch", function(){ var t = [[{pageX: 10, pageY:20}]], - tt = t; + tt = t.slice(0, t.length), + e = $.event.fix({touches: t, targetTouches: tt}); - expect(4); - ok($.inArray($.event.props, 'touches'), 'touches added to event'); - ok($.inArray($.event.props, 'targetTouches'), 'targetTouches added to event'); - - $('#swipeTarget').bind('myEvent', function(e){ - same(e.touches, t, 'event.touches set'); - same(e.targetTouches, tt, 'event.targetTouches set') - }).trigger({type: 'myEvent', touches: t, targetTouches: tt}); + same(e.touches, t, 'event.touches set'); + same(e.targetTouches, tt, 'event.targetTouches set'); }); }); test/test.html 900ef73d3c26f9a448f7c0a578660fe83e717446 Damien Lebrun dinoboff@hotmail.com http://github.com/dinoboff/jQswipe/commit/2a274f28d8c5a48b3679fc71c2c7bdfaa6b49089 2a274f28d8c5a48b3679fc71c2c7bdfaa6b49089 2009-10-25T06:18:31-07:00 2009-10-25T06:18:31-07:00 Fix monkey patch to add touches and targetTouches to event Wrong use of jQuery.inArray in implementation and test. cfe15f0e5a05436cd3201b1cc219f38536c3b2f0 Damien Lebrun dinoboff@hotmail.com