Author: sergeyhalipov Date: 2008-04-01 06:55:32 -0400 (Tue, 01 Apr 2008) New Revision: 7517 Modified: branches/3.1.x/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml branches/3.1.x/ui/inputnumber-slider/src/main/java/org/richfaces/component/UIInputNumberSlider.java branches/3.1.x/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java branches/3.1.x/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx branches/3.1.x/ui/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml branches/3.1.x/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx Log: http://jira.jboss.com/jira/browse/RF-2732 http://jira.jboss.com/jira/browse/RF-2733 Modified: branches/3.1.x/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml =================================================================== --- branches/3.1.x/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml 2008-04-01 09:52:45 UTC (rev 7516) +++ branches/3.1.x/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml 2008-04-01 10:55:32 UTC (rev 7517) @@ -67,14 +67,13 @@ <defaultvalue><![CDATA["1"]]></defaultvalue> </property> <property> - <name> width </name> + <name>width</name> <classname>java.lang.String</classname> <description> The width of a slider control</description> </property> - <property hidden="true"> - <name> height </name> + <property hidden="true" existintag="false" exist="false" > + <name>height</name> <classname>java.lang.String</classname> - <description> The height of a slider control</description> </property> <property> <name> enableManualInput </name> @@ -252,5 +251,68 @@ <classname>java.lang.String</classname> <description>A localized user presentable name for this component.</description> </property> + <property> + <name>oninputclick</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a pointer button is clicked</description> + </property> + <property> + <name>oninputdblclick</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a pointer button is double-clicked</description> + </property> + <property> + <name>oninputkeydown</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a key is pressed down</description> + </property> + <property> + <name>oninputkeypress</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a key is pressed and released</description> + </property> + <property> + <name>oninputkeyup</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a key is released</description> + </property> + <property> + <name>oninputmousedown</name> + <classname>java.lang.String</classname> + <description>HTML: script expression; a pointer button is pressed down</description> + </property> + <property> + <name>oninputmousemove</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a pointer is moved within</description> + </property> + <property> + <name>oninputmouseout</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a pointer is moved away</description> + </property> + <property> + <name>oninputmouseover</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a pointer is moved onto</description> + </property> + <property> + <name>oninputmouseup</name> + <classname>java.lang.String</classname> + <description>HTML: script expression; a pointer button is released</description> + </property> + + <property hidden="true" existintag="false" exist="false" > + <name>onkeydown</name> + <classname>java.lang.String</classname> + </property> + <property hidden="true" existintag="false" exist="false" > + <name>onkeypress</name> + <classname>java.lang.String</classname> + </property> + <property hidden="true" existintag="false" exist="false" > + <name>onkeyup</name> + <classname>java.lang.String</classname> + </property> </component> </components> Modified: branches/3.1.x/ui/inputnumber-slider/src/main/java/org/richfaces/component/UIInputNumberSlider.java =================================================================== --- branches/3.1.x/ui/inputnumber-slider/src/main/java/org/richfaces/component/UIInputNumberSlider.java 2008-04-01 09:52:45 UTC (rev 7516) +++ branches/3.1.x/ui/inputnumber-slider/src/main/java/org/richfaces/component/UIInputNumberSlider.java 2008-04-01 10:55:32 UTC (rev 7517) @@ -30,22 +30,9 @@ public static final String COMPONENT_TYPE = "org.richfaces.inputNumberSlider"; - public String getStyleValue() { - StringBuffer buf = new StringBuffer(); - String width = (String)getAttributes().get("width"); - String height = (String)getAttributes().get("height"); - String style = (String)getAttributes().get("style"); - if (width!=null&&width.length()>0) { - buf.append("width:"+width); - buf.append(";"); - } - - if (height!=null&&height.length()>0) { - buf.append("height:"+height); - buf.append(";"); - } - buf.append(style); - return buf.toString(); - } + public abstract String getWidth(); + public abstract void setWidth(String width); + public abstract String getStyle(); + public abstract void setStyle(String style); } Modified: branches/3.1.x/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java =================================================================== --- branches/3.1.x/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java 2008-04-01 09:52:45 UTC (rev 7516) +++ branches/3.1.x/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java 2008-04-01 10:55:32 UTC (rev 7517) @@ -25,6 +25,7 @@ import javax.faces.context.FacesContext; import org.richfaces.component.UIInputNumberSlider; +import org.richfaces.component.util.HtmlUtil; /** * @author Nick - mailto:nbelaevski@exadel.com @@ -40,5 +41,22 @@ protected boolean attributeToBoolean(UIComponent component, String attributeName) { return getUtils().isBooleanAttribute(component, attributeName); } + + public String getStyleValue(FacesContext context, UIInputNumberSlider slider) { + StringBuffer buf = new StringBuffer(); + String width = slider.getWidth(); + String style = slider.getStyle(); + + if (null != width && !"".equals(width)) { + buf.append("width: " + HtmlUtil.qualifySize(width)); + buf.append(";"); + } + + if (null != style && !"".equals(style)) { + buf.append(style); + } + + return buf.toString(); + } } Modified: branches/3.1.x/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx =================================================================== --- branches/3.1.x/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2008-04-01 09:52:45 UTC (rev 7516) +++ branches/3.1.x/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2008-04-01 10:55:32 UTC (rev 7517) @@ -38,7 +38,7 @@ } variables.setVariable("inputSize", component.getAttributes().get("inputSize")); - variables.setVariable("style",component.getStyleValue()); + variables.setVariable("style", this.getStyleValue(context, component)); ]]></jsp:scriptlet> @@ -66,7 +66,18 @@ onblur="#{component.attributes['onblur']}" accesskey="#{component.attributes['accesskey']}" size="#{inputSize}" - maxlength="#{component.attributes['maxlength']}" + maxlength="#{component.attributes['maxlength']}" + + onclick='#{component.attributes["oninputclick"]}' + ondblclick='#{component.attributes["oninputdblclick"]}' + onkeydown='#{component.attributes["oninputkeydown"]}' + onkeypress='#{component.attributes["oninputkeypress"]}' + onkeyup='#{component.attributes["oninputkeyup"]}' + onmousedown='#{component.attributes["oninputmousedown"]}' + onmousemove='#{component.attributes["oninputmousemove"]}' + onmouseout='#{component.attributes["oninputmouseout"]}' + onmouseover='#{component.attributes["oninputmouseover"]}' + onmouseup='#{component.attributes["oninputmouseup"]}' /> <jsp:scriptlet><![CDATA[ } else { @@ -123,7 +134,18 @@ onblur="#{component.attributes['onblur']}" accesskey="#{component.attributes['accesskey']}" size="#{inputSize}" - maxlength="#{component.attributes['maxlength']}" + maxlength="#{component.attributes['maxlength']}" + + onclick='#{component.attributes["oninputclick"]}' + ondblclick='#{component.attributes["oninputdblclick"]}' + onkeydown='#{component.attributes["oninputkeydown"]}' + onkeypress='#{component.attributes["oninputkeypress"]}' + onkeyup='#{component.attributes["oninputkeyup"]}' + onmousedown='#{component.attributes["oninputmousedown"]}' + onmousemove='#{component.attributes["oninputmousemove"]}' + onmouseout='#{component.attributes["oninputmouseout"]}' + onmouseover='#{component.attributes["oninputmouseover"]}' + onmouseup='#{component.attributes["oninputmouseup"]}' /> <jsp:scriptlet><![CDATA[ } else { Modified: branches/3.1.x/ui/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml =================================================================== --- branches/3.1.x/ui/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml 2008-04-01 09:52:45 UTC (rev 7516) +++ branches/3.1.x/ui/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml 2008-04-01 10:55:32 UTC (rev 7517) @@ -212,5 +212,69 @@ <classname>java.lang.String</classname> <description>A localized user presentable name for this component.</description> </property> + <property> + <name>oninputclick</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a pointer button is clicked</description> + </property> + <property> + <name>oninputdblclick</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a pointer button is double-clicked</description> + </property> + <property> + <name>oninputkeydown</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a key is pressed down</description> + </property> + <property> + <name>oninputkeypress</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a key is pressed and released</description> + </property> + <property> + <name>oninputkeyup</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a key is released</description> + </property> + <property> + <name>oninputmousedown</name> + <classname>java.lang.String</classname> + <description>HTML: script expression; a pointer button is pressed down</description> + </property> + <property> + <name>oninputmousemove</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a pointer is moved within</description> + </property> + <property> + <name>oninputmouseout</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a pointer is moved away</description> + </property> + <property> + <name>oninputmouseover</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a pointer is moved onto</description> + </property> + <property> + <name>oninputmouseup</name> + <classname>java.lang.String</classname> + <description>HTML: script expression; a pointer button is released</description> + </property> + + <property hidden="true" existintag="false" exist="false" > + <name>onkeydown</name> + <classname>java.lang.String</classname> + </property> + <property hidden="true" existintag="false" exist="false" > + <name>onkeypress</name> + <classname>java.lang.String</classname> + </property> + <property hidden="true" existintag="false" exist="false" > + <name>onkeyup</name> + <classname>java.lang.String</classname> + </property> + </component> </components> Modified: branches/3.1.x/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx =================================================================== --- branches/3.1.x/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2008-04-01 09:52:45 UTC (rev 7516) +++ branches/3.1.x/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2008-04-01 10:55:32 UTC (rev 7517) @@ -36,16 +36,24 @@ onselect="#{component.attributes['onselect']}" onfocus="#{component.attributes['onfocus']}" onblur="#{component.attributes['onblur']}" - onkeypress="#{component.attributes['onkeypress']}" - onkeyup="#{component.attributes['onkeyup']}" - onkeydown="#{component.attributes['onkeydown']}" type="text" size="#{component.attributes['inputSize']}" name="#{clientId}" value="#{this:getInputValue(context, component)}" style="#{component.inputStyle}" accesskey="#{component.attributes['accesskey']}" - tabindex="#{component.attributes['tabindex']}" + tabindex="#{component.attributes['tabindex']}" + + onclick='#{component.attributes["oninputclick"]}' + ondblclick='#{component.attributes["oninputdblclick"]}' + onkeydown='#{component.attributes["oninputkeydown"]}' + onkeypress='#{component.attributes["oninputkeypress"]}' + onkeyup='#{component.attributes["oninputkeyup"]}' + onmousedown='#{component.attributes["oninputmousedown"]}' + onmousemove='#{component.attributes["oninputmousemove"]}' + onmouseout='#{component.attributes["oninputmouseout"]}' + onmouseover='#{component.attributes["oninputmouseover"]}' + onmouseup='#{component.attributes["oninputmouseup"]}' /> </td> <td id="#{clientId}For" class="dr-spnr-b" width="1%">