colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-22 10:20:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug where placeholder state was not updated correctly.

Browse Source 
Reviewed by me.
This commit is contained in:
Francisco Tolmasky
2009-04-14 15:29:37 -07:00
parent a60ce80141
commit c55e1ac99c
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTextField.j
+19 -8
View File
@@ -361,6 +361,9 @@ CPTextFieldStatePlaceholder = 1 << 13;
- (BOOL)becomeFirstResponder
{
_controlState |= CPControlStateEditing;
[self _updatePlaceholderState];
[self setNeedsLayout];
#if PLATFORM(DOM)
@@ -470,6 +473,9 @@ CPTextFieldStatePlaceholder = 1 << 13;
- (BOOL)resignFirstResponder
{
_controlState &= ~CPControlStateEditing;
[self _updatePlaceholderState];
[self setNeedsLayout];
#if PLATFORM(DOM)
@@ -522,19 +528,24 @@ CPTextFieldStatePlaceholder = 1 << 13;
{
[super setObjectValue:aValue];
/*
#if PLATFORM(DOM)
if ([[self window] firstResponder] == self)
[[self class] _inputElement].value = displayString;
#endif
*/
[self _updatePlaceholderState];
}
var string = [self stringValue];
- (void)_updatePlaceholderState
{
var string = [self stringValue],
controlState = _controlState;
if (!string || [string length] === 0)
if ((!string || [string length] === 0) && !(_controlState & CPControlStateEditing))
_controlState |= CPTextFieldStatePlaceholder;
else
_controlState &= ~CPTextFieldStatePlaceholder;
if (_controlState !== controlState)
{
[self setNeedsLayout];
[self setNeedsDisplay:YES];
}
}
/*!