colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-28 13:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimized _triggersKeyEquivalent for a 6.5% performance gain in the CPKeyEquivalentPerformance test.

Browse Source
This commit is contained in:
Alexander Ljungberg
2010-06-10 10:56:02 -07:00
committed by Ross Boucher
parent 51825db716
commit 17669fd09d
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPEvent.j
+5 -7
View File
@@ -178,7 +178,8 @@ CPDOMEventTouchEnd = "touchend";
CPDOMEventTouchCancel = "touchcancel";
var _CPEventPeriodicEventPeriod = 0,
_CPEventPeriodicEventTimer = nil;
_CPEventPeriodicEventTimer = nil,
_CPEventUpperCaseRegex = new RegExp("[A-Z]");
/*!
@ingroup appkit
@@ -521,10 +522,7 @@ var _CPEventPeriodicEventPeriod = 0,
- (BOOL)_triggersKeyEquivalent:(CPString)aKeyEquivalent withModifierMask:aKeyEquivalentModifierMask
{
var characters = [self charactersIgnoringModifiers],
modifierFlags = [self modifierFlags];
if (new RegExp("[A-Z]").test(aKeyEquivalent))
if (_CPEventUpperCaseRegex.test(aKeyEquivalent))
aKeyEquivalentModifierMask |= CPShiftKeyMask;
if (CPBrowserIsOperatingSystem(CPWindowsOperatingSystem) && (aKeyEquivalentModifierMask & CPCommandKeyMask))
@@ -533,10 +531,10 @@ var _CPEventPeriodicEventPeriod = 0,
aKeyEquivalentModifierMask &= ~CPCommandKeyMask;
}
if ((modifierFlags & (CPShiftKeyMask | CPAlternateKeyMask | CPCommandKeyMask | CPControlKeyMask)) !== aKeyEquivalentModifierMask)
if ((_modifierFlags & (CPShiftKeyMask | CPAlternateKeyMask | CPCommandKeyMask | CPControlKeyMask)) !== aKeyEquivalentModifierMask)
return NO;
return [characters caseInsensitiveCompare:aKeyEquivalent] === CPOrderedSame;
return [_characters caseInsensitiveCompare:aKeyEquivalent] === CPOrderedSame;
}
- (BOOL)_couldBeKeyEquivalent