aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2010-12-08 09:43:59 +0000
committerArtur Signell <artur.signell@itmill.com>2010-12-08 09:43:59 +0000
commit76ebc789da1f3379dfcce77a520998169f144da2 (patch)
treea03aa70e06b7ce8a5b5f56fda1bb45e46239cba9 /src
parente1aaa9ee7d9c4a01895ce79a6bd0ef3c16199ec1 (diff)
downloadvaadin-framework-76ebc789da1f3379dfcce77a520998169f144da2.tar.gz
vaadin-framework-76ebc789da1f3379dfcce77a520998169f144da2.zip
Added missing communication of rows and wordwrap attributes (#3752)
svn changeset:16392/svn branch:6.5
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VTextArea.java4
-rw-r--r--src/com/vaadin/ui/TextField.java2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextArea.java b/src/com/vaadin/terminal/gwt/client/ui/VTextArea.java
index 75231c2715..3e4724102d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTextArea.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTextArea.java
@@ -34,7 +34,9 @@ public class VTextArea extends VTextField {
// Call parent renderer explicitly
super.updateFromUIDL(uidl, client);
- setRows(uidl.getIntAttribute("rows"));
+ if (uidl.hasAttribute("rows")) {
+ setRows(uidl.getIntAttribute("rows"));
+ }
if (getMaxLength() >= 0) {
sinkEvents(Event.ONKEYPRESS);
diff --git a/src/com/vaadin/ui/TextField.java b/src/com/vaadin/ui/TextField.java
index 67d9e005c8..442971911e 100644
--- a/src/com/vaadin/ui/TextField.java
+++ b/src/com/vaadin/ui/TextField.java
@@ -153,7 +153,7 @@ public class TextField extends AbstractTextField {
final int rows = getRows();
if (rows != 0) {
- target.addAttribute("rows", String.valueOf(rows));
+ target.addAttribute("rows", rows);
target.addAttribute("multiline", true);
// Optimization: the default true is assumed if not painted