Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updates to TextField.
  • Loading branch information
Ross Boucher committed Oct 9, 2009
1 parent 8a2cd8c commit 6e7e3ef
Showing 1 changed file with 20 additions and 4 deletions.
24 changes: 20 additions & 4 deletions AppKit/CPTextField.j
Expand Up @@ -243,7 +243,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
{
CPTextFieldTextDidChangeValue = [CPTextFieldInputOwner stringValue];

CPTextFieldKeyPressFunction(anEvent);
//CPTextFieldKeyPressFunction(anEvent);

return true;
}
Expand All @@ -252,6 +252,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
{
aDOMEvent = aDOMEvent || window.event;

CPTextFieldKeyUpFunction();

if (aDOMEvent.keyCode == CPReturnKeyCode || aDOMEvent.keyCode == CPTabKeyCode)
{
if (aDOMEvent.preventDefault)
Expand Down Expand Up @@ -281,12 +283,12 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");

CPTextFieldKeyUpFunction = function()
{
[CPTextFieldInputOwner setStringValue:CPTextFieldDOMInputElement.value];
[CPTextFieldInputOwner _setStringValue:CPTextFieldDOMInputElement.value];

if ([CPTextFieldInputOwner stringValue] !== CPTextFieldTextDidChangeValue)
{
CPTextFieldTextDidChangeValue = [CPTextFieldInputOwner stringValue];
[CPTextFieldInputOwner textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:CPTextFieldInputOwner userInfo:nil]];
CPTextFieldTextDidChangeValue = [CPTextFieldInputOwner stringValue];
}

[[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
Expand Down Expand Up @@ -551,8 +553,10 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
/* @ignore */
- (BOOL)becomeFirstResponder
{
#if PLATFORM(DOM)
if (CPTextFieldInputOwner && [CPTextFieldInputOwner window] !== [self window])
[[CPTextFieldInputOwner window] makeFirstResponder:nil];
#endif

[self setThemeState:CPThemeStateEditing];

Expand Down Expand Up @@ -590,7 +594,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");

window.setTimeout(function()
{
element.focus();
element.value = [self stringValue];
element.focus();
CPTextFieldInputOwner = self;
}, 0.0);

Expand Down Expand Up @@ -681,10 +686,21 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
/*
@ignore
*/
- (void)_setStringValue:(id)aValue
{
[super setObjectValue:String(aValue)];
[self _updatePlaceholderState];
}

- (void)setObjectValue:(id)aValue
{
[super setObjectValue:aValue];

#if PLATFORM(DOM)
if (CPTextFieldInputOwner === self)
[self _inputElement].value = aValue;
#endif

[self _updatePlaceholderState];
}

Expand Down

0 comments on commit 6e7e3ef

Please sign in to comment.