JBoss Rich Faces SVN: r13192 - in trunk/samples/richfaces-demo/src/main: webapp/richfaces/dataTableScroller and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-03-25 13:33:19 -0400 (Wed, 25 Mar 2009)
New Revision: 13192
Modified:
trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/usage.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-5780
Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
===================================================================
--- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2009-03-25 17:19:56 UTC (rev 13191)
+++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2009-03-25 17:33:19 UTC (rev 13192)
@@ -29,7 +29,7 @@
togglePanel= richOutputs, Toggle Panel, /images/ico_TogglePanel.gif, /images/cn_TogglePanel.gif, togglePanel.html, jbossrichfaces/freezone/docs/tlddoc/rich/togglePanel.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITogglePanel.html, /richfaces/togglePanel.jsf
panelMenu= richOutputs, Panel Menu, /images/ico_panelMenu.gif, /images/cn_PanelMenu.gif, panelMenu.html, jbossrichfaces/freezone/docs/tlddoc/rich/panelMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPanelMenu.html, /richfaces/panelMenu.jsf
suggestionBox= richInputs, Suggestion Box, /images/ico_SuggestionBox.gif, /images/cn_SuggestionBox.gif, suggestionbox.html, jbossrichfaces/freezone/docs/tlddoc/rich/suggestionbox.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UISuggestionBox.html, /richfaces/suggestionBox.jsf
-dataTableScroller= richDataIterators, Data Table Scroller, /images/ico_DataTableScroller.gif, /images/cn_DataTableScroller.gif, datascroller.html, jbossrichfaces/freezone/docs/tlddoc/rich/datascroller.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDatascroller.html, /richfaces/dataTableScroller.jsf
+dataTableScroller= richDataIterators, Data Scroller, /images/ico_DataTableScroller.gif, /images/cn_DataTableScroller.gif, datascroller.html, jbossrichfaces/freezone/docs/tlddoc/rich/datascroller.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDatascroller.html, /richfaces/dataTableScroller.jsf
dropDownMenu= richMenu, Drop Down Menu, /images/ico_DropDownMenu.gif, /images/cn_DropDownMenu.gif, dropDownMenu.html, jbossrichfaces/freezone/docs/tlddoc/rich/dropDownMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDropDownMenu.html, /richfaces/dropDownMenu.jsf
menuGroup= richMenu, Menu Group, /images/ico_MenuGroup.gif, /images/cn_MenuGroup.gif, menuGroup.html, jbossrichfaces/freezone/docs/tlddoc/rich/menuGroup.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMenuGroup.html, /richfaces/dropDownMenu.jsf
menuItem= richMenu, Menu Item, /images/ico_MenuItem.gif, /images/cn_MenuItem.gif, menuItem.html, jbossrichfaces/freezone/docs/tlddoc/rich/menuItem.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMenuItem.html, /richfaces/dropDownMenu.jsf
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/usage.xhtml 2009-03-25 17:19:56 UTC (rev 13191)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/usage.xhtml 2009-03-25 17:33:19 UTC (rev 13192)
@@ -12,7 +12,7 @@
<p>The component is designed to provide the functionality of table
pagination using AJAX requests.</p>
<fieldset class="demo_fieldset">
- <legend class="demo_legend">Table pagination using DataTableScroller example</legend>
+ <legend class="demo_legend">Table pagination using Data Scroller example</legend>
<div class="sample-container">
<ui:include src="/richfaces/dataTableScroller/examples/simpleScroller.xhtml"/>
<ui:include src="/templates/include/sourceview.xhtml">
15 years, 3 months
JBoss Rich Faces SVN: r13191 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-03-25 13:19:56 -0400 (Wed, 25 Mar 2009)
New Revision: 13191
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-6018
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml 2009-03-25 17:16:07 UTC (rev 13190)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml 2009-03-25 17:19:56 UTC (rev 13191)
@@ -17,7 +17,7 @@
<rich:panelMenu style="width:200px" mode="ajax"
iconExpandedGroup="disc" iconCollapsedGroup="disc"
iconExpandedTopGroup="chevronUp" iconGroupTopPosition="right"
- iconCollapsedTopGroup="chevronDown" iconCollapsedTopPosition="right" >
+ iconCollapsedTopGroup="chevronDown">
<rich:panelMenuGroup label="Group 1">
<rich:panelMenuItem label="Item 1.1" action="#{panelMenu.updateCurrent}">
<f:param name="current" value="Item 1.1"/>
15 years, 3 months
JBoss Rich Faces SVN: r13190 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-03-25 13:16:07 -0400 (Wed, 25 Mar 2009)
New Revision: 13190
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-5999
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml 2009-03-25 17:09:42 UTC (rev 13189)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml 2009-03-25 17:16:07 UTC (rev 13190)
@@ -79,6 +79,6 @@
<h:outputText style="font-weight:bold" value="#{ddmenu.current}"></h:outputText>
</a4j:outputPanel>
<br />
- <rich:spacer width="1" height="25" border="0" alt="" />
+ <rich:spacer width="1" height="25" />
</ui:composition>
\ No newline at end of file
15 years, 3 months
JBoss Rich Faces SVN: r13189 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-03-25 13:09:42 -0400 (Wed, 25 Mar 2009)
New Revision: 13189
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/sidemenu.xhtml
Log:
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/sidemenu.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/sidemenu.xhtml 2009-03-25 17:00:25 UTC (rev 13188)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/sidemenu.xhtml 2009-03-25 17:09:42 UTC (rev 13189)
@@ -17,7 +17,7 @@
<h:form>
- <h:panelGrid class="vertical-menu-cell" columnClasses="optionList" columns="1" cellspacing="0" cellpadding="0">
+ <h:panelGrid styleClass="vertical-menu-cell" columnClasses="optionList" columns="1" cellspacing="0" cellpadding="0">
<rich:dropDownMenu style="border:1px solid #{a4jSkin.panelBorderColor}" value="Option1"
submitMode="none" direction="bottom-right" jointPoint="tr">
<rich:menuItem value="Suboption1-1" />
15 years, 3 months
JBoss Rich Faces SVN: r13188 - trunk/test-applications/realworld2/web/src/main/webapp/includes/image.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2009-03-25 13:00:25 -0400 (Wed, 25 Mar 2009)
New Revision: 13188
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageList.xhtml
Log:
Data scroller for imageList
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageList.xhtml
===================================================================
(Binary files differ)
15 years, 3 months
JBoss Rich Faces SVN: r13187 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/tooltip and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2009-03-25 12:43:18 -0400 (Wed, 25 Mar 2009)
New Revision: 13187
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tooltip/
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tooltip/tooltipAutoTest.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TooltipTest.java
Log:
https://jira.jboss.org/jira/browse/RF-6381 started
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tooltip/tooltipAutoTest.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tooltip/tooltipAutoTest.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TooltipTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TooltipTest.java (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TooltipTest.java 2009-03-25 16:43:18 UTC (rev 13187)
@@ -0,0 +1,104 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+package org.richfaces.testng;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.ajax4jsf.template.Template;
+import org.richfaces.AutoTester;
+import org.richfaces.SeleniumTestBase;
+import org.testng.annotations.Test;
+
+public class TooltipTest extends SeleniumTestBase {
+
+ private static Map<String, String> params = new HashMap<String, String>();
+
+ static {
+ params.put("parameter1", "value1");
+ params.put("parameter2", "value2");
+ params.put("parameter3", "value3");
+ }
+
+ @Test
+ public void testNestedParams(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test component encodes nested f:param tags and their values are present as request parameters");
+ tester.testRequestParameters(params);
+ }
+
+ @Test
+ public void testRenderedAttribute(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test component with rendered = false is not present on the page");
+ tester.testRendered();
+ }
+
+ @Test
+ public void testImmediate(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test immediate attribute");
+ tester.testImmediate();
+ }
+
+ @Test
+ public void testImmediateWithExternalValidationFailed(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test immediate attribute with external validation failed");
+ tester.testImmediateWithExternalValidationFailed();
+ }
+
+ @Test
+ public void testAjaxSingle(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test ajaxSingle attribute");
+ tester.testAjaxSingle();
+ }
+
+ @Test
+ public void testWithExternalValidationFailure(Template template) {
+ AutoTester autoTester = getAutoTester(this);
+ autoTester.renderPage(template, null);
+ writeStatus("Check that listeners are not invoked in case of external validation failure");
+ autoTester.testExtrenalValidationFailure();
+ }
+
+ @Override
+ public void sendAjax() {
+ selenium.clickAt(getAutoTester(this).getClientId("tooltipArea"), "1,1");
+ waitForAjaxCompletion();
+ }
+
+ @Override
+ public String getAutoTestUrl() {
+ return "pages/tooltip/tooltipAutoTest.xhtml";
+ }
+
+ @Override
+ public String getTestUrl() {
+ throw new UnsupportedOperationException();
+ }
+}
Property changes on: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TooltipTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
15 years, 3 months
JBoss Rich Faces SVN: r13186 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-03-25 12:30:16 -0400 (Wed, 25 Mar 2009)
New Revision: 13186
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplaceInputTest.java
Log:
fix testInplaceInputComponentLayout
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplaceInputTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplaceInputTest.java 2009-03-25 16:27:11 UTC (rev 13185)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplaceInputTest.java 2009-03-25 16:30:16 UTC (rev 13186)
@@ -64,12 +64,12 @@
String inplaceInputS = getParentId() + "_form:" + INPLACE_INPUT_SIMPLE;
String inplaceInputD = getParentId() + "_form:" + INPLACE_INPUT_DECORATED;
- Assert.assertTrue(isPresentById(inplaceInputS));
- int count = selenium.getXpathCount("*[@id='" + inplaceInputS + "' and (name()='span' or name()='SPAN')]").intValue();
+ Assert.assertTrue(isPresent(inplaceInputS));
+ int count = selenium.getXpathCount("//*[@id='" + inplaceInputS + "' and (name()='span' or name()='SPAN')]").intValue();
Assert.assertTrue(count == 1, "InplaceInput[" + inplaceInputS + "] has layout=inline(default) and should be rendered as 'span' element");
- Assert.assertTrue(isPresentById(inplaceInputD));
- count = selenium.getXpathCount("*[@id='" + inplaceInputD + "' and (name()='DIV' or name()='div')]").intValue();
+ Assert.assertTrue(isPresent(inplaceInputD));
+ count = selenium.getXpathCount("//*[@id='" + inplaceInputD + "' and (name()='DIV' or name()='div')]").intValue();
Assert.assertTrue(count == 1, "InplaceInput [" + inplaceInputD + "] has layout=block and should be rendered as 'div' element");
}
15 years, 3 months
JBoss Rich Faces SVN: r13185 - in trunk/test-applications/realworld2/web/src/main: webapp/WEB-INF and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2009-03-25 12:27:11 -0400 (Wed, 25 Mar 2009)
New Revision: 13185
Added:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tags/RealworldImageScrollerRenderer.java
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_left_dis.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_right_dis.png
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/imageScroller.xhtml
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_left.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_right.png
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css
Log:
scroller for image list
Added: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tags/RealworldImageScrollerRenderer.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tags/RealworldImageScrollerRenderer.java (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tags/RealworldImageScrollerRenderer.java 2009-03-25 16:27:11 UTC (rev 13185)
@@ -0,0 +1,112 @@
+/**
+ *
+ */
+package org.richfaces.realworld.tags;
+
+import java.io.IOException;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.richfaces.component.UIDatascroller;
+import org.richfaces.renderkit.html.DatascrollerTemplate;
+
+/**
+ * @author Andrey Markavtsov
+ *
+ */
+public class RealworldImageScrollerRenderer extends DatascrollerTemplate {
+
+ @Override
+ public void renderPager(FacesContext context, UIComponent component,
+ int pageIndex, int count) throws IOException {
+ ResponseWriter out = context.getResponseWriter();
+ UIDatascroller scroller = (UIDatascroller) component;
+ int currentPage = pageIndex;
+
+ int maxPages = scroller.getMaxPages();
+ if (maxPages <= 1) {
+ maxPages = 1;
+ }
+
+ int pageCount = count;
+ if (pageCount <= 1) {
+ return;
+ }
+
+ int delta = maxPages / 2;
+
+ int pages;
+ int start;
+ if (pageCount > maxPages && currentPage > delta) {
+ pages = maxPages;
+ start = currentPage - pages / 2 - 1;
+ if (start + pages > pageCount) {
+ start = pageCount - pages;
+ }
+ } else {
+ pages = pageCount < maxPages ? pageCount : maxPages;
+ start = 0;
+ }
+
+ for (int i = start, size = start + pages; i < size; i++) {
+
+ boolean isCurrentPage = (i + 1 == currentPage);
+ String styleClass;
+ String style;
+ if (isCurrentPage) {
+ styleClass = scroller.getSelectedStyleClass();
+ style = scroller.getSelectedStyle();
+ } else {
+ styleClass = scroller.getInactiveStyleClass();
+ style = scroller.getInactiveStyle();
+ }
+ if (styleClass==null){
+ styleClass="";
+ }
+
+ out.startElement("td", component);
+ out.startElement("div", component);
+
+ if (!isCurrentPage) {
+ out.writeAttribute("onclick", getOnClick(Integer.toString(i + 1)), null);
+ }
+
+ renderPageVar(context, component, i);
+
+ if (isCurrentPage) {
+ out.writeAttribute("class", styleClass, null);
+ UIComponent facet = component.getFacet("activePage");
+ if (facet != null) {
+ renderChild(context, facet);
+ }
+ } else {
+ out.writeAttribute("class", styleClass, null);
+ UIComponent facet = component.getFacet("inactivePage");
+ if (facet != null) {
+ renderChild(context, facet);
+ }
+ }
+ if (null != style) out.writeAttribute("style", style, null);
+ //out.writeText(Integer.toString(i + 1), null);
+ //renderChild(context, link);
+ out.endElement("div");
+ out.endElement("td");
+ }
+ }
+
+ void renderPageVar(FacesContext context, UIComponent component, int i) {
+ String varName = (String) component.getAttributes().get("pageVar");
+ if (varName != null && varName.length() > 0) {
+ context.getExternalContext()
+ .getRequestMap().put(varName, new Integer(i));
+ }
+ }
+
+ @Override
+ protected Class getComponentClass() {
+ return super.getComponentClass();
+ }
+
+}
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml 2009-03-25 16:26:45 UTC (rev 13184)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml 2009-03-25 16:27:11 UTC (rev 13185)
@@ -21,5 +21,10 @@
<renderer-type>org.ajax4jsf.components.RealworldAjaxCommandButtonRenderer</renderer-type>
<renderer-class>org.richfaces.realworld.tags.RealworldCommandButtonRenderer</renderer-class>
</renderer>
+ <renderer>
+ <component-family>org.richfaces.Datascroller</component-family>
+ <renderer-type>org.ajax4jsf.components.RealworldImageDataScroller</renderer-type>
+ <renderer-class>org.richfaces.realworld.tags.RealworldImageScrollerRenderer</renderer-class>
+ </renderer>
</render-kit>
</faces-config>
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml 2009-03-25 16:26:45 UTC (rev 13184)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml 2009-03-25 16:27:11 UTC (rev 13185)
@@ -27,4 +27,11 @@
<renderer-type>org.ajax4jsf.components.RealworldAjaxCommandButtonRenderer</renderer-type>
</component>
</tag>
+ <tag>
+ <tag-name>imageDataScroller</tag-name>
+ <component>
+ <component-type>org.richfaces.Datascroller</component-type>
+ <renderer-type>org.ajax4jsf.components.RealworldImageDataScroller</renderer-type>
+ </component>
+ </tag>
</facelet-taglib>
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_left.png
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_left_dis.png
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_left_dis.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_right.png
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_right_dis.png
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_right_dis.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/imageScroller.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/imageScroller.xhtml (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/imageScroller.xhtml 2009-03-25 16:27:11 UTC (rev 13185)
@@ -0,0 +1,74 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:richx="http://richfaces.org/richx">
+
+<style>
+.rich-datascr-button {
+ background-color: #CECECE;
+}
+</style>
+
+<richx:imageDataScroller reRender="tree"
+ scrollerListener="#{controller.scroll}" id="imageScroller"
+ fastControls="hide"
+ boundaryControls="hide"
+ pageVar="pageVar"
+ styleClass="imageScroller"
+ inactiveStyleClass="imageScroller-inactive"
+ tableStyleClass="imageScroller-table"
+ maxPages="5"
+ for="mainImage" align="left" page="#{model.selectedImageIndex}">
+ <f:facet name="activePage">
+ <h:panelGroup layout="block" styleClass="preview_box_photo_80" style="margin: 0px; margin-right: 3px">
+ <h:graphicImage style="border: 2px solid red" styleClass="pr_photo_bg" value="/img/shell/frame_photo_80.png" />
+ <h:panelGrid cellpadding="0">
+ <h:panelGroup>
+ <a4j:mediaOutput element="img"
+ createContent="#{imageLoader.paintImage}"
+ style="border : 2px solid #FFFFFF;"
+ value="#{fileManager.transformPath(model.selectedAlbum.images[pageVar].path, '_small80')}">
+ <f:param value="#{imageSizeHelper.currentDimension.x}" name="x" />
+ </a4j:mediaOutput>
+ <br/>
+ </h:panelGroup>
+ </h:panelGrid>
+ <h:panelGroup layout="block" styleClass="photo_name">#{model.selectedAlbum.images[pageVar].name}</h:panelGroup>
+ <h:panelGroup layout="block" styleClass="photo_data">#{pageVar+1}</h:panelGroup>
+ </h:panelGroup>
+ </f:facet>
+ <f:facet name="inactivePage">
+ <h:panelGroup layout="block" styleClass="preview_box_photo_80" style="margin: 0px">
+ <h:graphicImage styleClass="pr_photo_bg" value="/img/shell/frame_photo_80.png" />
+ <h:panelGrid cellpadding="0">
+ <h:panelGroup>
+ <a4j:mediaOutput element="img"
+ createContent="#{imageLoader.paintImage}"
+ style="border : 2px solid #FFFFFF;"
+ value="#{fileManager.transformPath(model.selectedAlbum.images[pageVar].path, '_small80')}">
+ <f:param value="#{imageSizeHelper.currentDimension.x}" name="x" />
+ </a4j:mediaOutput>
+ <br/>
+ </h:panelGroup>
+ </h:panelGrid>
+ <h:panelGroup layout="block" styleClass="photo_name">#{model.selectedAlbum.images[pageVar].name}</h:panelGroup>
+ <h:panelGroup layout="block" styleClass="photo_data">#{pageVar+1}</h:panelGroup>
+ </h:panelGroup>
+ </f:facet>
+ <f:facet name="previous">
+ <h:graphicImage styleClass="imageScroller-leftArr" value="img/shell/arr_left.png"></h:graphicImage>
+ </f:facet>
+ <f:facet name="previous_disabled">
+ <h:graphicImage styleClass="imageScroller-leftArr" value="img/shell/arr_left_dis.png"></h:graphicImage>
+ </f:facet>
+ <f:facet name="next">
+ <h:graphicImage styleClass="imageScroller-rightArr" value="img/shell/arr_right.png"></h:graphicImage>
+ </f:facet>
+ <f:facet name="next_disabled">
+ <h:graphicImage styleClass="imageScroller-rightArr" value="img/shell/arr_right_dis.png"></h:graphicImage>
+ </f:facet>
+ </richx:imageDataScroller>
+</ui:composition>
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css 2009-03-25 16:26:45 UTC (rev 13184)
+++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css 2009-03-25 16:27:11 UTC (rev 13185)
@@ -876,4 +876,40 @@
width : 155px;
padding: 5px;
font-weight: bold;
-}
\ No newline at end of file
+}
+
+.imageScroller {
+ border: none;
+ position: relative;
+ float: left;
+ background-color: #CECECE;
+}
+
+.imageScroller-inactive table {
+ border: none;
+ cursor: pointer;
+}
+
+.imageScroller-table {
+ border: none;
+ background-color: #CECECE;
+}
+
+.imageScroller-table td {
+ border: none;
+}
+
+.imageScroller-leftArr {
+ position: absolute;
+ left: -10px;
+ bottom: 5px;
+ z-index: 2;
+}
+
+.imageScroller-rightArr {
+ position: absolute;
+ right: -10px;
+ bottom: 5px;
+ z-index: 2;
+}
+
15 years, 3 months
JBoss Rich Faces SVN: r13184 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: cluts
Date: 2009-03-25 12:26:45 -0400 (Wed, 25 Mar 2009)
New Revision: 13184
Modified:
trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
trunk/docs/userguide/en/src/main/docbook/included/page.xml
trunk/docs/userguide/en/src/main/docbook/included/status.xml
Log:
RF-4502 - updated tables with facets for datascroller and checked code example. Added tables of the facets for page (checked code example) and for status (also the code example has been checked).
Modified: trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2009-03-25 16:13:18 UTC (rev 13183)
+++ trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2009-03-25 16:26:45 UTC (rev 13184)
@@ -372,6 +372,14 @@
<entry>fastrewind_disabled</entry>
<entry>Redefines the disabled "fastrewind" button with the content set</entry>
</row>
+ <row>
+ <entry>fastforward</entry>
+ <entry>Redefines the "fastforward" button with the content set</entry>
+ </row>
+ <row>
+ <entry>fastforward_disabled</entry>
+ <entry>Redefines the disabled "fastforward" button with the content set</entry>
+ </row>
<row>
<entry>previous</entry>
<entry>Redefines the "previous" button with the content set</entry>
Modified: trunk/docs/userguide/en/src/main/docbook/included/page.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/page.xml 2009-03-25 16:13:18 UTC (rev 13183)
+++ trunk/docs/userguide/en/src/main/docbook/included/page.xml 2009-03-25 16:26:45 UTC (rev 13184)
@@ -63,6 +63,26 @@
]]></programlisting>
</section>
<section>
+ <title>Facets</title>
+ <table>
+ <title>Facets</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Facet name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>head</entry>
+ <entry>Defines a head content</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+ <section>
<title>Key attributes and ways of usage</title>
<para>The component is mostly used to solve the following problem with MyFaces for erlier Ajax4jsf versions: in MyFaces <emphasis role="bold">
<property><f:view></property>
Modified: trunk/docs/userguide/en/src/main/docbook/included/status.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/status.xml 2009-03-25 16:13:18 UTC (rev 13183)
+++ trunk/docs/userguide/en/src/main/docbook/included/status.xml 2009-03-25 16:26:45 UTC (rev 13184)
@@ -72,7 +72,32 @@
...
HtmlAjaxStatus myStatus = new HtmlAjaxStatus();
...]]></programlisting>
- </section>
+ </section>
+ <section>
+ <title>Facets</title>
+ <table>
+ <title>Facets</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Facet name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>start</entry>
+ <entry>Redefines the content for display on starting request</entry>
+ </row>
+ <row>
+ <entry>stop</entry>
+ <entry>Redefines the content for display on request complete</entry>
+ </row>
+ </tbody>
+ </tgroup>
+
+ </table>
+ </section>
<section>
<title>Key attributes and ways of usage</title>
<para>There are two ways for the components or containers definition, which Ajax requests status is tracked by a component.<itemizedlist>
15 years, 3 months
JBoss Rich Faces SVN: r13183 - trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-03-25 12:13:18 -0400 (Wed, 25 Mar 2009)
New Revision: 13183
Modified:
trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
Log:
https://jira.jboss.org/jira/browse/RF-6580
Modified: trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
===================================================================
--- trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2009-03-25 15:56:53 UTC (rev 13182)
+++ trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2009-03-25 16:13:18 UTC (rev 13183)
@@ -31,8 +31,8 @@
import javax.faces.component.UIParameter;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import javax.faces.event.PhaseId;
+import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.event.AjaxEvent;
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSFunctionDefinition;
@@ -60,15 +60,15 @@
if (newPage != 0 && newPage != page) {
DataScrollerEvent event = new DataScrollerEvent(scroller,
String.valueOf(page), param, newPage);
- if (scroller.isImmediate()) {
- event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
- } else {
- event.setPhaseId(PhaseId.INVOKE_APPLICATION);
- }
+ event.queue();
- event.queue();
}
+ if (AjaxRendererUtils.isAjaxRequest(context)) {
+ AjaxContext.getCurrentInstance(context)
+ .addAreasToProcessFromComponent(context, component);
+ }
+
new AjaxEvent(component).queue();
}
}
15 years, 3 months