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
@@ -97,6 +97,11 @@
 	<td>0</td>
 </tr>
 <tr>
+	<td>assertAttribute</td>
+	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-17@tabIndex</td>
+	<td>0</td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VHorizontalLayout[0]/VOrderedLayout$Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
@@ -182,6 +187,11 @@
 	<td>1</td>
 </tr>
 <tr>
+	<td>assertAttribute</td>
+	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-17@tabIndex</td>
+	<td>1</td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VHorizontalLayout[0]/VOrderedLayout$Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
@@ -267,6 +277,11 @@
 	<td>16</td>
 </tr>
 <tr>
+	<td>assertAttribute</td>
+	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-17@tabIndex</td>
+	<td>17</td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VHorizontalLayout[0]/VOrderedLayout$Slot[3]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
@@ -274,81 +289,86 @@
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-1/domChild[1]/domChild[1]@tabIndex</td>
-	<td>16</td>
+	<td>17</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-2/domChild[0]@tabIndex</td>
-	<td>15</td>
+	<td>16</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-3/domChild[0]@tabIndex</td>
-	<td>14</td>
+	<td>15</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-4/domChild[0]@tabIndex</td>
-	<td>13</td>
+	<td>14</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-5@tabIndex</td>
-	<td>12</td>
+	<td>13</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-6/domChild[0]@tabIndex</td>
-	<td>11</td>
+	<td>12</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-7/domChild[0]@tabIndex</td>
-	<td>10</td>
+	<td>11</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-8/domChild[0]/domChild[0]@tabIndex</td>
-	<td>9</td>
+	<td>10</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-9/domChild[1]/domChild[1]@tabIndex</td>
-	<td>8</td>
+	<td>9</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-10/domChild[1]@tabIndex</td>
-	<td>7</td>
+	<td>8</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-11/domChild[1]@tabIndex</td>
-	<td>6</td>
+	<td>7</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-12@tabIndex</td>
-	<td>5</td>
+	<td>6</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-13@tabIndex</td>
-	<td>4</td>
+	<td>5</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-14@tabIndex</td>
-	<td>3</td>
+	<td>4</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-15/domChild[1]@tabIndex</td>
-	<td>2</td>
+	<td>3</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-16/domChild[0]@tabIndex</td>
+	<td>2</td>
+</tr>
+<tr>
+	<td>assertAttribute</td>
+	<td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-17@tabIndex</td>
 	<td>1</td>
 </tr>
 </tbody></table>
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();