Merge branch 'jake' of git@github.com:280north/cappuccino into jake

This commit is contained in:
Francisco Ryan Tolmasky I committed 2009-11-05 00:05:02 -08:00
commit 2aa061a6af
2 files changed
+4 -4

No files matched your search

+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;
+1 -1
View File
@@ -52,7 +52,7 @@ if ! which -s "narwhal"; then
exit 1
fi
echo "Installing Objective-J and Cappuccino tools..."
echo "Installing necessary dependencies..."
tusk install browserjs
tusk install jake