summaryrefslogtreecommitdiffstats
path: root/server/src/com
diff options
context:
space:
mode:
authorMatti Hosio <mhosio@vaadin.com>2014-12-16 14:56:23 +0200
committerMatti Hosio <mhosio@vaadin.com>2014-12-16 14:56:23 +0200
commit9bc83cdce75d39ae8c3c7e07f20b006111c193b6 (patch)
tree33c98ebf42012df0fee340a319c9672777dd0009 /server/src/com
parentea1d229c70fa2e9edc63b234c483c36ee6114a29 (diff)
downloadvaadin-framework-9bc83cdce75d39ae8c3c7e07f20b006111c193b6.tar.gz
vaadin-framework-9bc83cdce75d39ae8c3c7e07f20b006111c193b6.zip
Declarative support for Label (#7749)
Change-Id: Ia727763f979ad94a029c7861f13bec0c6f00b876
Diffstat (limited to 'server/src/com')
-rw-r--r--server/src/com/vaadin/ui/AbstractComponent.java1
-rw-r--r--server/src/com/vaadin/ui/Label.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index 4d4556d4d9..358fea1bad 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -1199,6 +1199,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
Arrays.asList(customAttributes));
if (this instanceof Focusable) {
l.add("tab-index");
+ l.add("tabindex");
}
return l;
}
diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java
index fc18c374b4..a6ee11bdd5 100644
--- a/server/src/com/vaadin/ui/Label.java
+++ b/server/src/com/vaadin/ui/Label.java
@@ -605,6 +605,7 @@ public class Label extends AbstractComponent implements Property<String>,
Collection<String> result = super.getCustomAttributes();
result.add("value");
result.add("content-mode");
+ result.add("plain-text");
return result;
}