From b1fc23af08cf3e03dbc2f7f4585d40d39b7e9fb0 Mon Sep 17 00:00:00 2001 From: Ross Boucher Date: Fri, 7 Nov 2008 15:47:43 -0800 Subject: [PATCH] Make mouseUp work with the "touch" bridge. --- AppKit/Platform/DOM/CPDOMWindowBridge.j | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/AppKit/Platform/DOM/CPDOMWindowBridge.j b/AppKit/Platform/DOM/CPDOMWindowBridge.j index 9bed50be2..c5e8da85f 100644 --- a/AppKit/Platform/DOM/CPDOMWindowBridge.j +++ b/AppKit/Platform/DOM/CPDOMWindowBridge.j @@ -881,7 +881,7 @@ var CTRL_KEY_CODE = 17; { try { - if (aDOMEvent.touches && aDOMEvent.touches.length == 1) + if (aDOMEvent.touches && (aDOMEvent.touches.length == 1 || (aDOMEvent.touches.length == 0 && aDOMEvent.changedTouches.length == 1))) { var newEvent = {}; @@ -897,19 +897,18 @@ var CTRL_KEY_CODE = 17; break; } - newEvent.clientX = aDOMEvent.touches[0].clientX; - newEvent.clientY = aDOMEvent.touches[0].clientY; + var touch = aDOMEvent.touches.length ? aDOMEvent.touches[0] : aDOMEvent.changedTouches[0]; + + newEvent.clientX = touch.clientX; + newEvent.clientY = touch.clientY; newEvent.timestamp = aDOMEvent.timestamp; newEvent.target = aDOMEvent.target; newEvent.shiftKey = newEvent.ctrlKey = newEvent.altKey = newEvent.metaKey = false; - if (aDOMEvent.type == CPDOMEventTouchMove) - { newEvent.preventDefault = function(){if(aDOMEvent.preventDefault) aDOMEvent.preventDefault()}; newEvent.stopPropagation = function(){if(aDOMEvent.stopPropagation) aDOMEvent.stopPropagation()}; - } [self _bridgeMouseEvent:newEvent];