April 2008 - richfaces-svn-commits

JBoss Rich Faces SVN: r8000 - trunk/test-applications/facelets/src/main/webapp/Combobox.

by richfaces-svn-commits＠lists.jboss.org

Author: gmaksimenko Date: 2008-04-21 10:02:12 -0400 (Mon, 21 Apr 2008) New Revision: 8000 Modified: trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml Log: Add test for align Modified: trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml 2008-04-21 14:02:04 UTC (rev 7999) +++ trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml 2008-04-21 14:02:12 UTC (rev 8000) @@ -60,6 +60,10 @@ <h:inputText value="#{combobox.requiredMessage}" onchange="submit();"></h:inputText> <h:commandButton actionListener="#{combobox.checkBinding}" value="Binding"></h:commandButton> - <h:outputText value="#{combobox.bindLabel}"></h:outputText> + <h:outputText value="#{combobox.bindLabel}"></h:outputText> + + <h:outputText value="align"></h:outputText> + <h:inputText value="#{combobox.align}" onchange="submit();"></h:inputText> + </h:panelGrid> </f:subview> \ No newline at end of file

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r7999 - trunk/test-applications/seleniumTest/src/test/java/org/richfaces.

by richfaces-svn-commits＠lists.jboss.org

Author: sergeyhalipov Date: 2008-04-21 10:02:04 -0400 (Mon, 21 Apr 2008) New Revision: 7999 Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TabPanelTest.java Log: Some changes in selenium tests for tab panel. Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TabPanelTest.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TabPanelTest.java 2008-04-21 14:01:59 UTC (rev 7998) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TabPanelTest.java 2008-04-21 14:02:04 UTC (rev 7999) @@ -29,6 +29,8 @@ import org.testng.annotations.Parameters; import org.testng.annotations.Test; +import com.thoughtworks.selenium.SeleniumException; + public class TabPanelTest extends SeleniumTestBase implements RichSeleniumTest { public TabPanelTest() { @@ -76,16 +78,30 @@ clickById(linkId); waitForAjaxCompletion(); AssertValueEquals(inputId, "tab2"); + AssertTextEquals(outputId, "2"); Assert.assertTrue(isVisibleById(tabId2)); - AssertTextEquals(outputId, "2"); + Assert.assertFalse(isVisibleById(tabId4)); + try { + getTextById(tabId1); + Assert.fail("Both of 'tab1' and 'tab2' tabs were rendered for tab panel."); + } catch (SeleniumException se) { + + } linkId = parentId + "tab1_lbl"; clickById(linkId); waitForPageToLoad(); AssertValueEquals(inputId, "tab1"); + AssertTextEquals(outputId, "1"); Assert.assertTrue(isVisibleById(tabId1)); - AssertTextEquals(outputId, "1"); + Assert.assertFalse(isVisibleById(tabId4)); + try { + getTextById(tabId2); + Assert.fail("Both of 'tab1' and 'tab2' tabs were rendered for tab panel."); + } catch (SeleniumException se) { + + } linkId = parentId + "tab3_lbl"; clickById(linkId); @@ -95,6 +111,13 @@ linkId = parentId + "tab4_lbl"; clickById(linkId); Assert.assertTrue(isVisibleById(tabId4)); + Assert.assertFalse(isVisibleById(tabId1)); + try { + getTextById(tabId2); + Assert.fail("Both of 'tab1' and 'tab2' tabs were rendered for tab panel."); + } catch (SeleniumException se) { + + } } }

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r7998 - trunk/test-applications/facelets/src/main/webapp/Combobox.

by richfaces-svn-commits＠lists.jboss.org

Author: gmaksimenko Date: 2008-04-21 10:01:59 -0400 (Mon, 21 Apr 2008) New Revision: 7998 Modified: trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml Log: Add test for align Modified: trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml 2008-04-21 13:51:31 UTC (rev 7997) +++ trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml 2008-04-21 14:01:59 UTC (rev 7998) @@ -12,7 +12,8 @@ onfocus="#{event.onfocus}" onitemselected="#{event.onitemselected}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onlistcall="#{event.onlistcall}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselect="#{event.onselect}" - binding="#{combobox.myComboBox}"> + binding="#{combobox.myComboBox}" + align="#{combobox.align}"> <f:selectItem itemValue="selectItem 1"/> <f:selectItem itemValue="selectItem 2"/> <f:selectItem itemValue="selectItem 3"/>

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r7997 - trunk/test-applications/jsp/src/main/java/combobox.

by richfaces-svn-commits＠lists.jboss.org

Author: gmaksimenko Date: 2008-04-21 09:51:31 -0400 (Mon, 21 Apr 2008) New Revision: 7997 Modified: trunk/test-applications/jsp/src/main/java/combobox/Combobox.java Log: Add test for align Modified: trunk/test-applications/jsp/src/main/java/combobox/Combobox.java =================================================================== --- trunk/test-applications/jsp/src/main/java/combobox/Combobox.java 2008-04-21 13:51:16 UTC (rev 7996) +++ trunk/test-applications/jsp/src/main/java/combobox/Combobox.java 2008-04-21 13:51:31 UTC (rev 7997) @@ -37,7 +37,9 @@ public ArrayList<SelectItem> selectItem; private HtmlComboBox myComboBox = null; private String bindLabel; - + private String align; + + public Combobox() { this.disabled = false; this.defaultLabel = "defaultLabel"; @@ -62,6 +64,7 @@ this.suggestionValues = new ArrayList<String>(); this.selectItem = new ArrayList<SelectItem>(); this.bindLabel = "Click Binding"; + this.align = "left"; Random r = new Random(); for(int i = 0; i < 10; i++){ suggestionValues.add("suggestionValues " + r.nextInt(10) + " N=" + i); @@ -268,5 +271,13 @@ public void checkBinding(ActionEvent actionEvent){ FacesContext context = FacesContext.getCurrentInstance(); bindLabel = myComboBox.getClientId(context); + } + + public String getAlign() { + return align; } + + public void setAlign(String align) { + this.align = align; + } }

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r7996 - trunk/test-applications/jsp/src/main/webapp/Combobox.

by richfaces-svn-commits＠lists.jboss.org

Author: gmaksimenko Date: 2008-04-21 09:51:16 -0400 (Mon, 21 Apr 2008) New Revision: 7996 Modified: trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxProperty.jsp Log: Add test for align Modified: trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxProperty.jsp 2008-04-21 13:51:03 UTC (rev 7995) +++ trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxProperty.jsp 2008-04-21 13:51:16 UTC (rev 7996) @@ -57,6 +57,10 @@ <h:inputText value="#{combobox.requiredMessage}" onchange="submit();"></h:inputText> <h:commandButton actionListener="#{combobox.checkBinding}" value="Binding"></h:commandButton> - <h:outputText value="#{combobox.bindLabel}"></h:outputText> + <h:outputText value="#{combobox.bindLabel}"></h:outputText> + + <h:outputText value="align"></h:outputText> + <h:inputText value="#{combobox.align}" onchange="submit();"></h:inputText> + </h:panelGrid> </f:subview> \ No newline at end of file

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r7995 - trunk/test-applications/jsp/src/main/webapp/Combobox.

by richfaces-svn-commits＠lists.jboss.org

Author: gmaksimenko Date: 2008-04-21 09:51:03 -0400 (Mon, 21 Apr 2008) New Revision: 7995 Modified: trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp Log: Add test for align Modified: trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp 2008-04-21 13:30:36 UTC (rev 7994) +++ trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp 2008-04-21 13:51:03 UTC (rev 7995) @@ -17,7 +17,8 @@ onfocus="#{event.onfocus}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onlistcall="#{event.onlistcall}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselect="#{event.onselect}" - binding="#{combobox.myComboBox}"> + binding="#{combobox.myComboBox}" + align="#{combobox.align}"> <f:selectItem itemValue="selectItem 1"/> <f:selectItem itemValue="selectItem 2"/> <f:selectItem itemValue="selectItem 3"/>

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r7994 - trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2008-04-21 09:30:36 -0400 (Mon, 21 Apr 2008) New Revision: 7994 Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js Log: http://jira.jboss.com/jira/browse/RF-3070 Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js =================================================================== --- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-04-21 12:14:27 UTC (rev 7993) +++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-04-21 13:30:36 UTC (rev 7994) @@ -150,8 +150,8 @@ rowsAmount = this.getItems().length; currentItemsHeight = itemHeight * rowsAmount; - if (this.height && (parseInt(this.height) < currentItemsHeight)) { - if (this.height < currentItemsHeight) { + if (this.height) { + if (parseInt(this.height) > currentItemsHeight) { height = currentItemsHeight; } } else {

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r7993 - trunk/ui/inplaceSelect/src/main/templates.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2008-04-21 08:14:27 -0400 (Mon, 21 Apr 2008) New Revision: 7993 Modified: trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx Log: fix custom icon URI defenition Modified: trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx =================================================================== --- trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-04-21 12:14:09 UTC (rev 7992) +++ trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-04-21 12:14:27 UTC (rev 7993) @@ -51,12 +51,12 @@ String saveIcon = (String)component.getAttributes().get("saveControlIcon"); if (saveIcon != null && saveIcon.length() != 0 ) { - variables.setVariable("saveIcon", saveIcon); + variables.setVariable("saveIcon", getResource(saveIcon).getUri(context, component)); } String cancelIcon = (String)component.getAttributes().get("cancelControlIcon"); if (cancelIcon != null && cancelIcon.length() != 0 ) { - variables.setVariable("cancelIcon", cancelIcon); + variables.setVariable("cancelIcon", getResource(cancelIcon).getUri(context, component)); } String controlClass = (String)component.getAttributes().get("controlClass"); @@ -158,7 +158,7 @@ class="rich-inplace-select-control #{controlClass}" onmousedown="this.className='rich-inplace-select-control-press #{controlPressedClass}'" onmouseout="this.className='rich-inplace-select-control #{controlClass}'" - onmouseup="this.className='rich-inplace-select-control#{controlClass}'" + onmouseup="this.className='rich-inplace-select-control #{controlClass}'" onmouseover="this.className='rich-inplace-select-control #{controlHoverClass}'" /> </div>

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r7992 - in trunk/ui/inplaceInput/src/main: templates and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2008-04-21 08:14:09 -0400 (Mon, 21 Apr 2008) New Revision: 7992 Modified: trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx Log: fix custom icon URI defenition, in the render remove static call of the getAsEventHandler function Modified: trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java =================================================================== --- trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-04-21 12:12:35 UTC (rev 7991) +++ trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-04-21 12:14:09 UTC (rev 7992) @@ -219,7 +219,7 @@ } public String getAsEventHandler(FacesContext context, UIComponent component, String attributeName) { - JSFunctionDefinition script = RendererUtils.getAsEventHandler(context, component, attributeName, null); + JSFunctionDefinition script = getUtils().getAsEventHandler(context, component, attributeName, null); return ScriptUtils.toScript(script); } Modified: trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx =================================================================== --- trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-04-21 12:12:35 UTC (rev 7991) +++ trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-04-21 12:14:09 UTC (rev 7992) @@ -46,12 +46,12 @@ String saveIcon = (String)component.getAttributes().get("saveControlIcon"); if (saveIcon != null && saveIcon.length() != 0 ) { - variables.setVariable("saveIcon", saveIcon); + variables.setVariable("saveIcon", getResource(saveIcon).getUri(context, component)); } String cancelIcon = (String)component.getAttributes().get("cancelControlIcon"); if (cancelIcon != null && cancelIcon.length() != 0 ) { - variables.setVariable("cancelIcon", cancelIcon); + variables.setVariable("cancelIcon", getResource(cancelIcon).getUri(context, component)); } String controlClass = (String)component.getAttributes().get("controlClass");

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r7991 - trunk/ui/combobox/src/main/templates.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2008-04-21 08:12:35 -0400 (Mon, 21 Apr 2008) New Revision: 7991 Modified: trunk/ui/combobox/src/main/templates/combobox.jspx Log: http://jira.jboss.com/jira/browse/RF-2933, http://jira.jboss.com/jira/browse/RF-2936 Modified: trunk/ui/combobox/src/main/templates/combobox.jspx =================================================================== --- trunk/ui/combobox/src/main/templates/combobox.jspx 2008-04-21 12:11:52 UTC (rev 7990) +++ trunk/ui/combobox/src/main/templates/combobox.jspx 2008-04-21 12:12:35 UTC (rev 7991) @@ -11,7 +11,8 @@ component="org.richfaces.component.UIComboBox"> <jsp:directive.page import="org.richfaces.component.util.HtmlUtil" /> - <jsp:directive.page import=" java.util.List"/> + <jsp:directive.page import="java.util.List"/> + <jsp:directive.page import="org.ajax4jsf.renderkit.compiler.TemplateContext"/> <h:styles>css/combobox.xcss</h:styles> <h:scripts> @@ -181,19 +182,19 @@ String buttonIcon = (String)component.getAttributes().get("buttonIcon"); if (!"".equals(buttonIcon)) { - buttonIcon = "url('" + buttonIcon + "')"; + buttonIcon = "url('" + getResource(buttonIcon).getUri(context, component) + "')"; } variables.setVariable("buttonIcon", buttonIcon); String buttonIconDisabled = (String)component.getAttributes().get("buttonIconDisabled"); if (!"".equals(buttonIconDisabled)) { - buttonIconDisabled = "url('" + buttonIconDisabled + "')"; + buttonIconDisabled = "url('" + getResource(buttonIconDisabled).getUri(context, component) + "')"; } variables.setVariable("buttonIconDisabled", buttonIconDisabled); String buttonIconInactive = (String)component.getAttributes().get("buttonIconInactive"); if (!"".equals(buttonIconInactive)) { - buttonIconInactive = "url('" + buttonIconInactive + "')"; + buttonIconInactive = "url('" + getResource(buttonIconInactive).getUri(context, component) + "')"; } variables.setVariable("buttonIconInactive", buttonIconInactive); variables.setVariable("enableManualInput", !component.isEnableManualInput()); @@ -223,7 +224,7 @@ type="text" value="" class="rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive"/> - <input id="#{clientId}comboboxButton" readonly="true" disabled="#{disabled}" type="text" value="" style="#{buttonStyle}; background-image: #{buttonIconNormal};" + <input id="#{clientId}comboboxButton" readonly="true" disabled="#{disabled}" type="text" value="" style="#{buttonStyle}; background-image: #{buttonIconInactive};" class="rich-combobox-font-inactive rich-combobox-button-icon-inactive rich-combobox-button-inactive #{buttonDisabledClass}"/> <div class="rich-combobox-strut rich-combobox-font" style="width:#{correction}">Strut</div> </div>

16 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits April 2008