Merge pull request #2151 from Dogild/EscapePanelRefac

Fixed: escape on a panel or popover breaks the key chain event
This commit is contained in:
Antoine Mercadal committed 2014-07-09 14:12:50 -07:00
commit a8b66abe15
3 files changed
+23 -29

No files matched your search

+10 -3
View File
@@ -126,10 +126,17 @@ CPDocModalWindowMask = 1 << 6;
/*!
@ignore
*/
- (BOOL)_shouldCloseOnEscape
- (void)cancelOperation:(id)sender
{
[self performClose:self];
return YES;
if ([[CPApp currentEvent] _couldBeKeyEquivalent] && [self performKeyEquivalent:[CPApp currentEvent]])
return;
[[self firstResponder] tryToPerform:@selector(cancel:) with:self];
}
- (void)cancel:(id)sender
{
[self performClose:sender];
}
@end
+3 -22
View File
@@ -1795,7 +1795,7 @@ CPTexturedBackgroundWindowMask
}
return didTabBack;
}
else if ([anEvent charactersIgnoringModifiers] === CPEscapeFunctionKey && [self _shouldCloseOnEscape])
else if ([anEvent charactersIgnoringModifiers] == CPEscapeFunctionKey && [self _processKeyboardUIKey:anEvent])
{
return;
}
@@ -3021,28 +3021,9 @@ CPTexturedBackgroundWindowMask
if ([selectors count] <= 0)
return NO;
if (character !== CPEscapeFunctionKey)
{
var selector = [selectors objectAtIndex:0];
return [[self firstResponder] tryToPerform:selector with:self];
}
else
{
/*
Cocoa sends complete: for the escape key (instead of the default cancelOperation:). This is also the only action that is not sent directly to the first responder, but through doCommandBySelector. The difference is that doCommandBySelector: will also send the action to the window and application delegates.
*/
[[self firstResponder] doCommandBySelector:@selector(complete:)];
}
var selector = [selectors objectAtIndex:0];
return NO;
}
/*!
@ignore
*/
- (BOOL)_shouldCloseOnEscape
{
return NO;
return [[self firstResponder] tryToPerform:selector with:self];
}
- (void)_dirtyKeyViewLoop
+10 -4
View File
@@ -443,12 +443,18 @@ var _CPPopoverWindow_shouldClose_ = 1 << 4,
/*!
@ignore
*/
- (BOOL)_shouldCloseOnEscape
- (void)cancelOperation:(id)sender
{
if ([[CPApp currentEvent] _couldBeKeyEquivalent] && [self performKeyEquivalent:[CPApp currentEvent]])
return;
[self cancel:self];
}
- (void)cancel:(id)sender
{
if (_closeOnBlur)
[[self delegate] performClose:self];
return YES;
[[self delegate] performClose:sender];
}
/*!