merging changes

This commit is contained in:
rlx 2011-06-03 23:10:03 +00:00
commit 0bc884070c

View file

@ -53,7 +53,8 @@
Ox.forEach(Ox.MODIFIER_KEYS, function(v, k) {
// avoid pushing modifier twice
if (event[k] && keyBasename != v) {
// using event.originalEvent since jquery always sets event.metaKey to event.ctrlKey
if (event.originalEvent[k] && keyBasename != v) {
keyNames.splice(-1, 0, v);
}
});