colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 04:57:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2319 from Dogild/TokenFieldkeyEquivalent

Browse Source 
Fixed: CPApplication dispatch the event when having the auto complete menu of a CPTokenField opened
This commit is contained in:
Antoine Mercadal
2015-02-25 11:34:44 -08:00
parent 1c9e9da10f 3430349dd1
commit 9cb3eefdc4
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTokenField.j
+15
View File
@@ -1033,6 +1033,21 @@ CPTokenFieldDeleteButtonType = 1;
[[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
}
- (BOOL)performKeyEquivalent:(CPEvent)anEvent
{
var characters = [anEvent characters];
// Here we handle the event when getting a CPNewlineCharacter or CPCarriageReturnCharacter when the menu is open
// We don't want that the application dispatches the event to the other controls
if ([self hasThemeState:CPThemeStateAutocompleting] && (characters === CPNewlineCharacter || characters === CPCarriageReturnCharacter))
{
[self keyDown:anEvent];
return YES;
}
return [super performKeyEquivalent:anEvent];
}
- (void)textDidChange:(CPNotification)aNotification
{
if ([aNotification object] !== self)