Author: konstantin.mishin Date: 2010-08-04 12:03:49 -0400 (Wed, 04 Aug 2010) New Revision: 18481 Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js root/sandbox/ui/inputs/inputnumberslider/src/main/templates/input.template.inc root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml Log: RF-8983 Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml 2010-08-04 15:11:22 UTC (rev 18480) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml 2010-08-04 16:03:49 UTC (rev 18481) @@ -191,6 +191,28 @@ </property-extension> </property> <property> + <property-name>style</property-name> + <property-class>java.lang.String</property-class> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> + <property-name>styleClass</property-name> + <property-class>java.lang.String</property-class> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> + <property-name>tabindex</property-name> + <property-class>int</property-class> + <default-value>Integer.MIN_VALUE</default-value> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> <property-name>toolTipClass</property-name> <property-class>java.lang.String</property-class> <property-extension> Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js 2010-08-04 15:11:22 UTC (rev 18480) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js 2010-08-04 16:03:49 UTC (rev 18481) @@ -30,6 +30,7 @@ maxValue: 100, minValue: 0, step: 1, + tabIndex: 0, decreaseSelectedClass: "rf-ins-db-s", handleSelectedClass: "rf-ins-h-s", @@ -51,7 +52,7 @@ this.decreaseButton = this.element.children(".rf-ins-db"); this.increaseButton = this.element.children(".rf-ins-ib"); - this.track[0].tabIndex = 0; + this.track[0].tabIndex = this.tabIndex; for (var i in selectedClasses) { this[i] += " " + selectedClasses[i]; Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/templates/input.template.inc =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/templates/input.template.inc 2010-08-04 15:11:22 UTC (rev 18480) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/templates/input.template.inc 2010-08-04 16:03:49 UTC (rev 18481) @@ -24,5 +24,5 @@ --> <input xmlns:cdk="http://richfaces.org/cdk/core" name="#{clientId}" type="text" class="rf-ins-i #{component.attributes['inputClass']}" value="#{getInputValue(facesContext, component)}" - cdk:passThrough="accesskey disabled maxlength size:inputSize" readonly="#{!component.attributes['enableManualInput']}" + cdk:passThrough="accesskey disabled maxlength size:inputSize tabindex" readonly="#{!component.attributes['enableManualInput']}" style="#{component.attributes['showInput'] ? null : 'display: none;'}" /> Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml =================================================================== --- root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml 2010-08-04 15:11:22 UTC (rev 18480) +++ root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml 2010-08-04 16:03:49 UTC (rev 18481) @@ -40,7 +40,7 @@ <cdk:resource-dependency name="inputNumberSlider.js" /> </cc:interface> <cc:implementation> - <span id="#{clientId}" class="rf-ins"> + <span id="#{clientId}" class="rf-ins #{component.attributes['styleClass']}" cdk:passThroughWithExclusions="id class"> <c:if test="#{PositionType.valueOf('left') == component.attributes['inputPosition'] || PositionType.valueOf('top') == component.attributes['inputPosition']}"> <xi:include xpointer="xpointer(//input)" href="input.template.inc" /> @@ -78,7 +78,8 @@ disabled: #{component.attributes['disabled']}, maxValue: #{component.attributes['maxValue']}, minValue: #{component.attributes['minValue']}, - step: #{component.attributes['step']} + step: #{component.attributes['step']}, + tabIndex: #{RenderKitUtils.shouldRenderAttribute(component.attributes['tabindex']) ? component.attributes['tabindex'] : 'null'} }, { decreaseSelectedClass: '#{component.attributes['decreaseSelectedClass']}', handleSelectedClass: '#{component.attributes['handleSelectedClass']}',