Merge remote-tracking branch 'origin/master' into grid

Conflicts:
	WebContent/release-notes.html

Change-Id: Ie05bea7142134a7a9d655fcdf6ca232fd13c742b

1 files changed, 12 insertions, 0 deletions

diff --git a/server/src/com/vaadin/ui/AbstractTextField.java b/server/src/com/vaadin/ui/AbstractTextField.java
index e0318ddf2b..9293d38119 100644
--- a/server/src/com/vaadin/ui/AbstractTextField.java
+++ b/server/src/com/vaadin/ui/AbstractTextField.java
@@ -147,6 +147,18 @@ public abstract class AbstractTextField extends AbstractField<String> implements
 
         try {
 
+            // Sets the height set by the user when resize the <textarea>.
+            String newHeight = (String) variables.get("height");
+            if (newHeight != null) {
+                setHeight(newHeight);
+            }
+
+            // Sets the width set by the user when resize the <textarea>.
+            String newWidth = (String) variables.get("width");
+            if (newWidth != null) {
+                setWidth(newWidth);
+            }
+
             if (variables.containsKey(TextFieldConstants.VAR_CURSOR)) {
                 Integer object = (Integer) variables
                         .get(TextFieldConstants.VAR_CURSOR);