Author: konstantin.mishin Date: 2009-05-26 07:50:39 -0400 (Tue, 26 May 2009) New Revision: 14324 Modified: branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss branches/community/3.3.X/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx branches/community/3.3.X/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java Log: RF-7221 Modified: branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss =================================================================== --- branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss 2009-05-26 11:37:16 UTC (rev 14323) +++ branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss 2009-05-26 11:50:39 UTC (rev 14324) @@ -5,7 +5,7 @@ <f:verbatim> <![CDATA[ -.dr-spnr-e { +.rich-spinner-input-container { padding: 0px; margin: 0px; @@ -15,14 +15,14 @@ border-width: 1px 0px 1px 1px; } -input.dr-spnr-i { +input.rich-spinner-input { border: 0px; padding: 0px 0px 0px 3px; background: none transparent scroll repeat 0% 0%; margin: 0px; } -.dr-spnr-b { +.rich-spinner-buttons { border-width: 1px; border-style: solid; padding: 0px; @@ -32,13 +32,13 @@ font-size: 0px; } -.dr-spnr-bn{ +.rich-spinner-bn{ margin: 0px 1px 1px 0px; display: block; border-style: none; } -.dr-spnr-bp{ +.rich-spinner-bp{ margin: 1px 0px 0px 1px; display: block; border-style: none; @@ -47,7 +47,7 @@ </f:verbatim> - <u:selector name=".dr-spnr-b"> + <u:selector name=".rich-spinner-buttons"> <u:style name="background-color" skin="headerBackgroundColor" /> <u:style name="border-color" skin="panelBorderColor" /> <u:style name="background-image"> @@ -55,12 +55,12 @@ </u:style> </u:selector> - <u:selector name=".dr-spnr-i"> + <u:selector name=".rich-spinner-input"> <u:style name="font-size" skin="buttonSizeFont"/> <u:style name="font-family" skin="buttonFamilyFont"/> </u:selector> - <u:selector name=".dr-spnr-e"> + <u:selector name=".rich-spinner-input-container"> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.images.SpinnerFieldGradient" /> </u:style> Modified: branches/community/3.3.X/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx =================================================================== --- branches/community/3.3.X/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2009-05-26 11:37:16 UTC (rev 14323) +++ branches/community/3.3.X/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2009-05-26 11:50:39 UTC (rev 14324) @@ -20,7 +20,7 @@ <h:scripts>new org.ajax4jsf.javascript.PrototypeScript(),script/SpinnerScript.js,/org/richfaces/renderkit/html/scripts/browser_info.js</h:scripts> <h:styles>css/spinner.xcss</h:styles> -<table width="2%" class="dr-spnr-c rich-spinner-c #{component.attributes['styleClass']}" id="#{clientId}" cellspacing="0" cellpadding="0" border="0" style="#{component.attributes['style']}" onclick="#{component.attributes['onclick']}" +<table width="2%" class="rich-spinner-c #{component.attributes['styleClass']}" id="#{clientId}" cellspacing="0" cellpadding="0" border="0" style="#{component.attributes['style']}" onclick="#{component.attributes['onclick']}" ondblclick="#{component.attributes['ondblclick']}" onmousedown="#{component.attributes['onmousedown']}" onmousemove="#{component.attributes['onmousemove']}" @@ -29,7 +29,7 @@ onmouseup="#{component.attributes['onmouseup']}"> <tbody> <tr> - <td style="width:1%" class="dr-spnr-e rich-spinner-input-container" id="#{clientId}Edit"> + <td style="width:1%" class="rich-spinner-input-container" id="#{clientId}Edit"> <jsp:scriptlet><![CDATA[ String autocomplete = ""; boolean disableBrowserAutoComplete = getUtils().isBooleanAttribute(component, "disableBrowserAutoComplete"); @@ -41,7 +41,7 @@ ]]></jsp:scriptlet> <input - class="dr-spnr-i rich-spinner-input #{component.attributes['inputClass']}" + class="rich-spinner-input #{component.attributes['inputClass']}" onchange="#{component.attributes['onchange']}" onselect="#{component.attributes['onselect']}" onfocus="#{component.attributes['onfocus']}" @@ -67,7 +67,7 @@ autocomplete='#{autocomplete}' /> </td> - <td id="#{clientId}For" class="dr-spnr-b rich-spinner-buttons" style="width:1%"> + <td id="#{clientId}For" class="rich-spinner-buttons" style="width:1%"> <table id="#{clientId}Buttons" border="0" cellspacing="0" cellpadding="0"> <tbody> <tr> @@ -79,12 +79,12 @@ <input type="image" src="#{up_arrow}" - class="dr-spnr-bn rich-spinner-button" + class="rich-spinner-bn rich-spinner-button" style="border:0" onclick="return false" - onmousedown="this.className='dr-spnr-bp rich-spinner-button'" - onmouseup="this.className='dr-spnr-bn rich-spinner-button'" - onmouseout="this.className='dr-spnr-bn rich-spinner-button'" + onmousedown="this.className='rich-spinner-bp rich-spinner-button'" + onmouseup="this.className='rich-spinner-bn rich-spinner-button'" + onmouseout="this.className='rich-spinner-bn rich-spinner-button'" tabindex="#{component.attributes['tabindex']}" /> <jsp:scriptlet><![CDATA[ } else { @@ -92,7 +92,7 @@ <input type="image" src="#{up_arrow}" - class="dr-spnr-bn rich-spinner-button" + class="rich-spinner-bn rich-spinner-button" style="border:0" onclick="return false" tabindex="#{component.attributes['tabindex']}" /> @@ -106,12 +106,12 @@ <jsp:scriptlet><![CDATA[ if (! disabled) { ]]></jsp:scriptlet> - <input type="image" src="#{down_arrow}" class="dr-spnr-bn rich-spinner-button" style="border:0" onclick="return false" - onmousedown="this.className='dr-spnr-bp rich-spinner-button'" onmouseup="this.className='dr-spnr-bn rich-spinner-button'" onmouseout="this.className='dr-spnr-bn rich-spinner-button'" /> + <input type="image" src="#{down_arrow}" class="rich-spinner-bn rich-spinner-button" style="border:0" onclick="return false" + onmousedown="this.className='rich-spinner-bp rich-spinner-button'" onmouseup="this.className='rich-spinner-bn rich-spinner-button'" onmouseout="this.className='rich-spinner-bn rich-spinner-button'" /> <jsp:scriptlet><![CDATA[ } else { ]]></jsp:scriptlet> - <input type="image" src="#{down_arrow}" class="dr-spnr-bn rich-spinner-button" style="border:0" onclick="return false" /> + <input type="image" src="#{down_arrow}" class="rich-spinner-bn rich-spinner-button" style="border:0" onclick="return false" /> <jsp:scriptlet><![CDATA[ } ]]></jsp:scriptlet> Modified: branches/community/3.3.X/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java =================================================================== --- branches/community/3.3.X/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2009-05-26 11:37:16 UTC (rev 14323) +++ branches/community/3.3.X/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2009-05-26 11:50:39 UTC (rev 14324) @@ -122,18 +122,18 @@ assertNotNull(htmlSpinner); assertTrue(htmlSpinner.getAttributeValue("class").contains( - "dr-spnr-c rich-spinner-c")); + "rich-spinner-c")); HtmlElement htmlSpinnerEdit = (HtmlElement) renderedView .getHtmlElementById(spinner.getClientId(facesContext) + "Edit"); assertNotNull(htmlSpinnerEdit); assertTrue(htmlSpinnerEdit.getAttributeValue("class").contains( - "dr-spnr-e rich-spinner-input-container")); + "rich-spinner-input-container")); HtmlInput htmlSpinnerInput = (HtmlInput) htmlSpinnerEdit.getLastChild(); assertNotNull(htmlSpinnerInput); assertTrue(htmlSpinnerInput.getAttributeValue("class").contains( - "dr-spnr-i rich-spinner-input")); + "rich-spinner-input")); HtmlElement buttonsContainer = (HtmlElement) renderedView .getHtmlElementById(spinner.getClientId(facesContext) @@ -144,7 +144,7 @@ HtmlInput child = (HtmlInput) iter.next(); assertTrue(child.getTypeAttribute().equals("image")); assertTrue(child.getAttributeValue("class").contains( - "dr-spnr-bn rich-spinner-button")); + "rich-spinner-bn rich-spinner-button")); } }