Merge branch 'right-command-key-fix' of https://github.com/aparajita/cappuccino into aparajita-right-command-key-fix

This commit is contained in:
Klaas Pieter Annema
2011-05-23 11:14:12 +02:00
2 changed files with 7 additions and 5 deletions
+6 -5
View File
@@ -183,11 +183,12 @@ KeyCodesToUnicodeMap[CPKeyCodes.BACKSLASH] = "\\";
KeyCodesToUnicodeMap[CPKeyCodes.CLOSE_SQUARE_BRACKET] = "]";
var ModifierKeyCodes = [
CPKeyCodes.META,
CPKeyCodes.MAC_FF_META,
CPKeyCodes.CTRL,
CPKeyCodes.ALT,
CPKeyCodes.SHIFT
CPKeyCodes.META,
CPKeyCodes.WEBKIT_RIGHT_META,
CPKeyCodes.MAC_FF_META,
CPKeyCodes.CTRL,
CPKeyCodes.ALT,
CPKeyCodes.SHIFT
],
supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
@@ -83,6 +83,7 @@ CPKeyCodes = {
Y: 89,
Z: 90,
META: 91,
WEBKIT_RIGHT_META: 93, // WebKit (on Mac at least) fires this for the right Command key
CONTEXT_MENU: 93,
NUM_ZERO: 96,
NUM_ONE: 97,