diff options
| author | Matti Hosio <mhosio@vaadin.com> | 2014-12-16 14:56:23 +0200 |
|---|---|---|
| committer | Matti Hosio <mhosio@vaadin.com> | 2014-12-16 14:56:23 +0200 |
| commit | 9bc83cdce75d39ae8c3c7e07f20b006111c193b6 (patch) | |
| tree | 33c98ebf42012df0fee340a319c9672777dd0009 | |
| parent | ea1d229c70fa2e9edc63b234c483c36ee6114a29 (diff) | |
| download | vaadin-framework-9bc83cdce75d39ae8c3c7e07f20b006111c193b6.tar.gz vaadin-framework-9bc83cdce75d39ae8c3c7e07f20b006111c193b6.zip | |
Declarative support for Label (#7749)
Change-Id: Ia727763f979ad94a029c7861f13bec0c6f00b876
| -rw-r--r-- | server/src/com/vaadin/ui/AbstractComponent.java | 1 | ||||
| -rw-r--r-- | server/src/com/vaadin/ui/Label.java | 1 | ||||
| -rw-r--r-- | server/tests/src/com/vaadin/tests/design/all-components.html | 4 |
3 files changed, 6 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; } diff --git a/server/tests/src/com/vaadin/tests/design/all-components.html b/server/tests/src/com/vaadin/tests/design/all-components.html index 71aeeeaa41..683fafcf05 100644 --- a/server/tests/src/com/vaadin/tests/design/all-components.html +++ b/server/tests/src/com/vaadin/tests/design/all-components.html @@ -98,6 +98,10 @@ <v-button>Second slot</v-button> </v-horizontal-split-panel> + <!-- label --> + <v-label>Hello world!</v-label> + <v-label>This is <b><u>Rich</u></b> content!</v-label> + <v-label plain-text>This is only <b>text</b> and will contain visible tags</v-label> </v-vertical-layout> </body> </html> |