colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-06 09:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Francisco Ryan Tolmasky I committed 2009-12-07 18:59:57 -08:00
2 parents 4fbc140551 ee8e65c80d
commit 211c14e316
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/Platform/DOM/CPPlatformWindow+DOM.j
+2 -2
View File
@@ -583,7 +583,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
if (_keyCode === CPKeyCodes.CAPS_LOCK)
_capsLockActive = YES;
if (modifierFlags & (CPControlKeyMask | CPCommandKeyMask | CPAlternateKeyMask))
if (modifierFlags & (CPControlKeyMask | CPCommandKeyMask))
{
//we are simply going to skip all keypress events that use cmd/ctrl key
//this lets us be consistent in all browsers and send on the keydown
@@ -630,7 +630,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
case "keypress":
// we unconditionally break on keypress events with modifiers,
// because we forced the event to be sent on the keydown
if (aDOMEvent.type === "keypress" && (modifierFlags & (CPControlKeyMask | CPCommandKeyMask | CPAlternateKeyMask)))
if (aDOMEvent.type === "keypress" && (modifierFlags & (CPControlKeyMask | CPCommandKeyMask)))
break;
var keyCode = _keyCode,