From 595a3254a983c989c6fce1eb10a620202ec4d969 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 22 Nov 2012 13:11:41 +0200 Subject: [PATCH] Fixed tab index handling in slider (#10315) Change-Id: I84611b5cc0a4f8520d1013562ba650f1f92663c4 --- .../client/ui/slider/SliderConnector.java | 1 + .../com/vaadin/tests/fields/TabIndexes.html | 50 +++++++++++++------ .../com/vaadin/tests/fields/TabIndexes.java | 3 +- 3 files changed, 38 insertions(+), 16 deletions(-) diff --git a/client/src/com/vaadin/client/ui/slider/SliderConnector.java b/client/src/com/vaadin/client/ui/slider/SliderConnector.java index e155336d75..2b78921f93 100644 --- a/client/src/com/vaadin/client/ui/slider/SliderConnector.java +++ b/client/src/com/vaadin/client/ui/slider/SliderConnector.java @@ -71,6 +71,7 @@ public class SliderConnector extends AbstractFieldConnector implements getWidget().setFeedbackValue(getState().value); getWidget().buildBase(); + getWidget().setTabIndex(getState().tabIndex); } } diff --git a/uitest/src/com/vaadin/tests/fields/TabIndexes.html b/uitest/src/com/vaadin/tests/fields/TabIndexes.html index 8f6bd06d66..a78be3045c 100644 --- a/uitest/src/com/vaadin/tests/fields/TabIndexes.html +++ b/uitest/src/com/vaadin/tests/fields/TabIndexes.html @@ -96,6 +96,11 @@ vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-16/domChild[0]@tabIndex 0 + + assertAttribute + vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-17@tabIndex + 0 + click vaadin=runcomvaadintestsfieldsTabIndexes::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VHorizontalLayout[0]/VOrderedLayout$Slot[1]/VButton[0]/domChild[0]/domChild[0] @@ -181,6 +186,11 @@ vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-16/domChild[0]@tabIndex 1 + + assertAttribute + vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-17@tabIndex + 1 + click vaadin=runcomvaadintestsfieldsTabIndexes::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VHorizontalLayout[0]/VOrderedLayout$Slot[2]/VButton[0]/domChild[0]/domChild[0] @@ -266,6 +276,11 @@ vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-16/domChild[0]@tabIndex 16 + + assertAttribute + vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-17@tabIndex + 17 + click vaadin=runcomvaadintestsfieldsTabIndexes::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VHorizontalLayout[0]/VOrderedLayout$Slot[3]/VButton[0]/domChild[0]/domChild[0] @@ -274,81 +289,86 @@ assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-1/domChild[1]/domChild[1]@tabIndex - 16 + 17 assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-2/domChild[0]@tabIndex - 15 + 16 assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-3/domChild[0]@tabIndex - 14 + 15 assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-4/domChild[0]@tabIndex - 13 + 14 assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-5@tabIndex - 12 + 13 assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-6/domChild[0]@tabIndex - 11 + 12 assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-7/domChild[0]@tabIndex - 10 + 11 assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-8/domChild[0]/domChild[0]@tabIndex - 9 + 10 assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-9/domChild[1]/domChild[1]@tabIndex - 8 + 9 assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-10/domChild[1]@tabIndex - 7 + 8 assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-11/domChild[1]@tabIndex - 6 + 7 assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-12@tabIndex - 5 + 6 assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-13@tabIndex - 4 + 5 assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-14@tabIndex - 3 + 4 assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-15/domChild[1]@tabIndex - 2 + 3 assertAttribute vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-16/domChild[0]@tabIndex + 2 + + + assertAttribute + vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-17@tabIndex 1 diff --git a/uitest/src/com/vaadin/tests/fields/TabIndexes.java b/uitest/src/com/vaadin/tests/fields/TabIndexes.java index c88bb97c73..cf2e253d08 100644 --- a/uitest/src/com/vaadin/tests/fields/TabIndexes.java +++ b/uitest/src/com/vaadin/tests/fields/TabIndexes.java @@ -22,6 +22,7 @@ import com.vaadin.ui.OptionGroup; import com.vaadin.ui.PasswordField; import com.vaadin.ui.PopupDateField; import com.vaadin.ui.RichTextArea; +import com.vaadin.ui.Slider; import com.vaadin.ui.Table; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; @@ -121,7 +122,7 @@ public class TabIndexes extends AbstractTestUI { fields.add(new TextArea()); fields.add(new RichTextArea()); fields.add(new CheckBox()); - // fields.add(new Slider()); + fields.add(new Slider()); clearTabIndexes.click(); -- 2.39.5