Merge branch 'master' into jake

This commit is contained in:
Ross Boucher committed 2009-11-04 14:24:10 -08:00
commit b13eee1fc9
1 file changed
+3 -3
+3 -3
View File
@@ -715,7 +715,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
newEvent.preventDefault = function(){if(aDOMEvent.preventDefault) aDOMEvent.preventDefault()};
newEvent.stopPropagation = function(){if(aDOMEvent.stopPropagation) aDOMEvent.stopPropagation()};
[self _bridgeMouseEvent:newEvent];
[self mouseEvent:newEvent];
return;
}
@@ -738,10 +738,10 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
if (type === @"dblclick")
{
_overriddenEventType = CPDOMEventMouseDown;
[self _bridgeMouseEvent:aDOMEvent];
[self mouseEvent:aDOMEvent];
_overriddenEventType = CPDOMEventMouseUp;
[self _bridgeMouseEvent:aDOMEvent];
[self mouseEvent:aDOMEvent];
_overriddenEventType = nil;