diff options
| author | Artur Signell <artur@vaadin.com> | 2014-12-18 09:27:53 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-12-18 10:37:08 +0000 |
| commit | 399b62d0ecd593efbb5563db957017ef43a3945c (patch) | |
| tree | 5b46c9965e91d0a5bca774911e0bd92bf26ba93c /client/src | |
| parent | 9f98c3e1ba3a3e4249ac388a2d38c05a5349404d (diff) | |
| download | vaadin-framework-399b62d0ecd593efbb5563db957017ef43a3945c.tar.gz vaadin-framework-399b62d0ecd593efbb5563db957017ef43a3945c.zip | |
Revert "TextField's input prompt is now disabled properly (#15144)"
This reverts commit 52236519d9d3ed0cd7de5ed52c6aa19c514e15d6.
Causes regression when updating style names in a text change listener (TextChangeListenerChangingNonTextProperties)
Change-Id: I50bdb674872b98f3b1495a1115e352bfa7f13e8c
Diffstat (limited to 'client/src')
| -rw-r--r-- | client/src/com/vaadin/client/ui/textfield/TextFieldConnector.java | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/client/src/com/vaadin/client/ui/textfield/TextFieldConnector.java b/client/src/com/vaadin/client/ui/textfield/TextFieldConnector.java index cba827bcef..1a4b64b0a6 100644 --- a/client/src/com/vaadin/client/ui/textfield/TextFieldConnector.java +++ b/client/src/com/vaadin/client/ui/textfield/TextFieldConnector.java @@ -87,17 +87,10 @@ public class TextFieldConnector extends AbstractFieldConnector implements * change in the queue (in which case we count more on the server side * value). */ - - boolean valueChanged = !uidl - .getBooleanAttribute(TextFieldConstants.ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS); - // null check is not enough since the value is sometimes null but - // sometimes empty. Fix for #15144 - boolean valueBeforeEditEmpty = getWidget().valueBeforeEdit == null - || getWidget().valueBeforeEdit.isEmpty(); - boolean textDoesNotEqualOldValue = !text - .equals(getWidget().valueBeforeEdit); - - if (valueChanged || valueBeforeEditEmpty || textDoesNotEqualOldValue) { + if (!(uidl + .getBooleanAttribute(TextFieldConstants.ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS) + && getWidget().valueBeforeEdit != null && text + .equals(getWidget().valueBeforeEdit))) { getWidget().updateFieldContent(text); } |