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 #3192 from daboe01/fixed-CPControlTextDidBeginEditingNotification-is-not-correctly-triggered

Browse Source 
Fixed: timing of CPControlTextDidBeginEditingNotification (#1941)
This commit is contained in:
daboe01
2026-05-30 15:09:34 +02:00
committed by GitHub
parent b296f17d2b 4fd99d2c52
commit c3d9dead19
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTextField.j
+6
View File
@@ -1154,6 +1154,12 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
if (![self isEnabled] || !([self isEditable] || [self isSelectable]))
return;
if ([self isEditable] && !_isEditing)
{
_isEditing = YES;
[self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
}
// CPTextField uses an HTML input element to take the input so we need to
// propagate the dom event so the element is updated. This has to be done
// before interpretKeyEvents: though so individual commands have a chance
AppKit/CPTokenField.j
+20 -2
View File
@@ -349,6 +349,12 @@ CPTokenFieldDeleteButtonType = 1;
if (theBinding)
[theBinding reverseSetValueFor:@"objectValue"];
if (!_isEditing)
{
_isEditing = YES;
[self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
}
[self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
_shouldNotifyTarget = YES;
@@ -453,8 +459,8 @@ CPTokenFieldDeleteButtonType = 1;
{
[_tokenScrollView documentView]._DOMElement.appendChild(element);
//post CPControlTextDidBeginEditingNotification
[self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
// Removed so CPTokenField doesn't fire the notification the moment it becomes the first responder, but instead defers to the first keystroke, just like Cocoa (see keyDown: in CPTextField).
// [self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
[[CPRunLoop mainRunLoop] performBlock:function()
{
@@ -498,6 +504,8 @@ CPTokenFieldDeleteButtonType = 1;
[self _resignFirstKeyResponder];
_isEditing = NO;
if (_shouldNotifyTarget)
{
_shouldNotifyTarget = NO;
@@ -1032,6 +1040,16 @@ CPTokenFieldDeleteButtonType = 1;
CPTokenFieldTextDidChangeValue = [self stringValue];
#endif
// Has to be enabled, and it also has to be editable or selectable.
if (![self isEnabled] || !([self isEditable] || [self isSelectable]))
return;
if ([self isEditable] && !_isEditing)
{
_isEditing = YES;
[self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
}
// Leave the default _propagateCurrentDOMEvent setting in place. This might be YES or NO depending
// on if something that could be a browser shortcut was pressed or not, such as Cmd-R to reload.
// If it was NO we want to leave it at NO however and only enable it in insertText:. This is what