Browse Source

fixes a regression since UIDL refactoring (non-hosted mode only)

svn changeset:8544/svn branch:6.1
tags/6.7.0.beta1
Matti Tahvonen 14 years ago
parent
commit
c635285fd8

+ 1
- 1
src/com/vaadin/terminal/gwt/client/UIDL.java View File

@@ -196,7 +196,7 @@ public final class UIDL extends JavaScriptObject {
}

public boolean hasVariable(String name) {
return var().containsKey(name);
return hasVariables() && var().containsKey(name);
}

public String getStringVariable(String name) {

+ 2
- 1
src/com/vaadin/terminal/gwt/client/ui/VTextField.java View File

@@ -102,7 +102,8 @@ public class VTextField extends TextBoxBase implements Paintable, Field,
setColumns(new Integer(uidl.getStringAttribute("cols")).intValue());
}

String text = uidl.getStringVariable("text");
String text = uidl.hasVariable("text") ? uidl.getStringVariable("text")
: null;
setPrompting(inputPrompt != null && focusedTextField != this
&& (text == null || text.equals("")));
if (prompting) {

Loading…
Cancel
Save