diff options
| author | Marko Grönroos <magi@iki.fi> | 2010-11-19 13:24:15 +0000 |
|---|---|---|
| committer | Marko Grönroos <magi@iki.fi> | 2010-11-19 13:24:15 +0000 |
| commit | 4f70bb519b2c3b4248e4eee1050bfe7013e56943 (patch) | |
| tree | c34ab329af4925bd0cbf1cbeac41bffafbe0b0f2 /src/com/vaadin | |
| parent | 75c1cef09b2cd4a8f4ed230b1c057baf60744c85 (diff) | |
| download | vaadin-framework-4f70bb519b2c3b4248e4eee1050bfe7013e56943.tar.gz vaadin-framework-4f70bb519b2c3b4248e4eee1050bfe7013e56943.zip | |
Optimization for word wrap. For #6003.
svn changeset:16053/svn branch:6.5
Diffstat (limited to 'src/com/vaadin')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VTextField.java | 13 | ||||
| -rw-r--r-- | src/com/vaadin/ui/TextField.java | 6 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java index c0eb4a90ee..42264fc1b6 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java @@ -282,9 +282,14 @@ public class VTextField extends TextBoxBase implements Paintable, Field, }); } - // For backward compatibility; to be moved to TextArea - if (uidl.hasAttribute("wordwrap")) { - setWordwrap(uidl.getBooleanAttribute("wordwrap")); + // Here for backward compatibility; to be moved to TextArea. + // Optimization: server does not send attribute for the default 'true' + // state. + if (uidl.hasAttribute("wordwrap") + && uidl.getBooleanAttribute("wordwrap") == false) { + setWordwrap(false); + } else { + setWordwrap(true); } } @@ -544,7 +549,7 @@ public class VTextField extends TextBoxBase implements Paintable, Field, valueChange(false); } - // For backward compatibility; to be moved to TextArea + // Here for backward compatibility; to be moved to TextArea public void setWordwrap(boolean enabled) { if (enabled == wordwrap) return; // No change diff --git a/src/com/vaadin/ui/TextField.java b/src/com/vaadin/ui/TextField.java index f9dd93b6f9..64dbf933b2 100644 --- a/src/com/vaadin/ui/TextField.java +++ b/src/com/vaadin/ui/TextField.java @@ -199,8 +199,10 @@ public class TextField extends AbstractTextField implements target.addAttribute("rows", String.valueOf(rows)); target.addAttribute("multiline", true); - // For backward compatibility; to be moved to TextArea - target.addAttribute("wordwrap", isWordwrap()); + // Optimization: the default true is assumed if not painted + if (!isWordwrap()) { + target.addAttribute("wordwrap", false); + } } if (getInputPrompt() != null) { |