JBoss Rich Faces SVN: r20454 - in trunk/ui/output/ui/src/main: resources/META-INF and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-12-08 07:19:29 -0500 (Wed, 08 Dec 2010)
New Revision: 20454
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java
trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
Log:
RF-9890 panelMenu: itemChangeListener never fired and activeItem not put to model
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2010-12-08 12:16:21 UTC (rev 20453)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2010-12-08 12:19:29 UTC (rev 20454)
@@ -30,6 +30,7 @@
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
+import javax.faces.component.UIOutput;
import javax.faces.context.FacesContext;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
@@ -39,7 +40,7 @@
* @author akolonitsky
* @since 2010-10-25
*/
-public abstract class AbstractPanelMenu extends AbstractActionComponent implements ItemChangeSource {
+public abstract class AbstractPanelMenu extends UIOutput implements ItemChangeSource {
public static final String COMPONENT_TYPE = "org.richfaces.PanelMenu";
@@ -77,7 +78,7 @@
String previous = (String) getValue();
setActiveItem(activeItem);
setSubmittedActiveItem(null);
- if (previous != null && !previous.equalsIgnoreCase(activeItem)) {
+ if (previous == null || !previous.equalsIgnoreCase(activeItem)) {
queueEvent(new ItemChangeEvent(this, previous, activeItem));
}
}
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-08 12:16:21 UTC (rev 20453)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-08 12:19:29 UTC (rev 20454)
@@ -1712,18 +1712,6 @@
<component-class>org.richfaces.component.html.HtmlPanelMenu</component-class>
<property>
- <property-name>action</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
- </property>
- <property>
- <property-name>actionExpression</property-name>
- <property-class>javax.el.MethodExpression</property-class>
- </property>
- <property>
- <property-name>actionListener</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
- </property>
- <property>
<description></description>
<property-name>disabled</property-name>
<property-class>boolean</property-class>
14 years, 1 month
JBoss Rich Faces SVN: r20453 - in trunk: examples/output-demo/src/main/webapp/WEB-INF and 3 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-12-08 07:16:21 -0500 (Wed, 08 Dec 2010)
New Revision: 20453
Added:
trunk/examples/output-demo/src/main/java/org/richfaces/RF9851.java
trunk/examples/output-demo/src/main/webapp/examples/accordion/RF-9851.xhtml
Modified:
trunk/examples/output-demo/src/main/webapp/WEB-INF/faces-config.xml
trunk/examples/output-demo/src/main/webapp/templates/template.xhtml
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java
Log:
RF-9851 accordion: wrong decode behavior
Added: trunk/examples/output-demo/src/main/java/org/richfaces/RF9851.java
===================================================================
--- trunk/examples/output-demo/src/main/java/org/richfaces/RF9851.java (rev 0)
+++ trunk/examples/output-demo/src/main/java/org/richfaces/RF9851.java 2010-12-08 12:16:21 UTC (rev 20453)
@@ -0,0 +1,60 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * 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;
+
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.SessionScoped;
+
+/**
+ * @author akolonitsky
+ * @since Dec 6, 2010
+ */
+@ManagedBean(name = "RF9851")
+@SessionScoped
+public class RF9851 {
+ private String name;
+ private String email;
+
+ public RF9851() {
+ System.out.println("RF9851.RF9851");
+ }
+
+ public String getName() {
+ System.out.println("RF9851.getName");
+ return name;
+ }
+
+ public void setName(String name) {
+ System.out.println("RF9851.setName name = " + name);
+ this.name = name;
+ }
+
+ public String getEmail() {
+ System.out.println("RF9851.getEmail");
+ return email;
+ }
+
+ public void setEmail(String email) {
+ System.out.println("RF9851.setEmail email = " + email);
+ this.email = email;
+ }
+}
Modified: trunk/examples/output-demo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/WEB-INF/faces-config.xml 2010-12-08 11:55:26 UTC (rev 20452)
+++ trunk/examples/output-demo/src/main/webapp/WEB-INF/faces-config.xml 2010-12-08 12:16:21 UTC (rev 20453)
@@ -62,6 +62,10 @@
<to-view-id>/examples/accordion/RF-9364.xhtml</to-view-id>
</navigation-case>
<navigation-case>
+ <from-outcome>RF-9851</from-outcome>
+ <to-view-id>/examples/accordion/RF-9851.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
<from-outcome>qunit/accordion</from-outcome>
<to-view-id>/qunit/accordion.xhtml</to-view-id>
</navigation-case>
Added: trunk/examples/output-demo/src/main/webapp/examples/accordion/RF-9851.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/examples/accordion/RF-9851.xhtml (rev 0)
+++ trunk/examples/output-demo/src/main/webapp/examples/accordion/RF-9851.xhtml 2010-12-08 12:16:21 UTC (rev 20453)
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:pn="http://richfaces.org/output">
+
+<body>
+<ui:composition template="/templates/template.xhtml">
+
+ <ui:define name="title">Accordion Example</ui:define>
+ <ui:define name="body_head">Accordion Example</ui:define>
+
+ <ui:define name="body">
+ <p>Page</p>
+
+ <pre>
+ two critical issues there:
+ 1)
+ a) enter something into input at default item
+ b) switch to second
+ c) enter something to input there
+ d) click submit
+ RESULT - nothing being encoded for outputText's
+
+ 2)
+ a) enter something into input at default item
+ b) switch to second
+ c) enter something to input there
+ d) return to default tab(in order current item to be in sync with server side current)
+ e) click submit
+ RESULT - only one typed message encoded.
+ </pre>
+
+ <h:form>
+ <pn:accordion switchType="ajax" id="acc">
+ <pn:accordionItem header="Overview:" id="i1">
+ <h:inputText value="#{RF9851.name}"/>
+ </pn:accordionItem>
+ <pn:accordionItem header="JSF 2 and RichFaces 4:" id="i2">
+ <h:inputText value="#{RF9851.email}"/>
+
+ </pn:accordionItem>
+ </pn:accordion>
+ <h:commandButton/>
+ <h:outputText value="#{RF9851.name}"/>
+ <h:outputText value="#{RF9851.email}"/>
+ <h:messages/>
+ </h:form>
+ </ui:define>
+</ui:composition>
+</body>
+</html>
+
Modified: trunk/examples/output-demo/src/main/webapp/templates/template.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/templates/template.xhtml 2010-12-08 11:55:26 UTC (rev 20452)
+++ trunk/examples/output-demo/src/main/webapp/templates/template.xhtml 2010-12-08 12:16:21 UTC (rev 20453)
@@ -80,6 +80,7 @@
<p>Bugs</p>
<ul>
<li><h:commandLink value="RF-9364" action="RF-9364" /></li>
+ <li><h:commandLink value="RF-9851" action="RF-9851" /></li>
</ul>
</li>
</ul>
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2010-12-08 11:55:26 UTC (rev 20452)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2010-12-08 12:16:21 UTC (rev 20453)
@@ -111,7 +111,6 @@
return (Boolean) getStateHelper().eval(PropertyKeys.valid, true);
}
-
public void setValid(boolean valid) {
getStateHelper().put(PropertyKeys.valid, valid);
}
@@ -129,12 +128,10 @@
getStateHelper().put(PropertyKeys.required, required);
}
-
public boolean isImmediate() {
return (Boolean) getStateHelper().eval(PropertyKeys.immediate, false);
}
-
public void setImmediate(boolean immediate) {
getStateHelper().put(PropertyKeys.immediate, immediate);
}
@@ -170,7 +167,7 @@
String activeItem = getActiveItemValue();
while (kids.hasNext()) {
UIComponent kid = kids.next();
- if (isActiveItem(kid, activeItem)) {
+ if (isActiveItem(kid, activeItem) || this.getSwitchType() == SwitchType.client) {
kid.processDecodes(context);
}
}
@@ -184,8 +181,6 @@
} finally {
popComponentFromEL(context);
}
-
- executeValidate(context);
}
/**
@@ -222,7 +217,7 @@
String activeItem = getActiveItemValue();
while (kids.hasNext()) {
UIComponent kid = kids.next();
- if (isActiveItem(kid, activeItem)) {
+ if (isActiveItem(kid, activeItem) || this.getSwitchType() == SwitchType.client) {
kid.processValidators(context);
}
}
@@ -262,13 +257,13 @@
String activeItem = getActiveItemValue();
while (kids.hasNext()) {
UIComponent kid = kids.next();
- if (isActiveItem(kid, activeItem)) {
+ if (isActiveItem(kid, activeItem) || this.getSwitchType() == SwitchType.client) {
kid.processUpdates(context);
}
}
-
+
popComponentFromEL(context);
-
+
try {
updateModel(context);
} catch (RuntimeException e) {
@@ -276,6 +271,7 @@
throw e;
}
+ executeValidate(context);
if (!isValid()) {
context.renderResponse();
}
@@ -310,7 +306,7 @@
if (ve == null) {
return;
}
-
+
Throwable caught = null;
FacesMessage message = null;
try {
@@ -327,7 +323,7 @@
}
if (messageStr == null) {
- message = ServiceTracker.getService(MessageFactory.class).createMessage(context,
+ message = ServiceTracker.getService(MessageFactory.class).createMessage(context,
FacesMessage.SEVERITY_ERROR,
FacesMessages.UIINPUT_UPDATE, MessageUtil.getLabel(context, this));
} else {
@@ -347,7 +343,7 @@
@SuppressWarnings({"ThrowableInstanceNeverThrown"})
UpdateModelException toQueue = new UpdateModelException(message, caught);
ExceptionQueuedEventContext eventContext = new ExceptionQueuedEventContext(context,
- toQueue, this, PhaseId.UPDATE_MODEL_VALUES);
+ toQueue, this, PhaseId.UPDATE_MODEL_VALUES);
context.getApplication().publishEvent(context, ExceptionQueuedEvent.class, eventContext);
}
}
@@ -404,7 +400,6 @@
}
}
-
@Override
public void broadcast(FacesEvent event) throws AbortProcessingException {
super.broadcast(event);
@@ -416,6 +411,7 @@
}
// -------------------------------------------------- Panel Items Managing
+
@Override
public String getFamily() {
return COMPONENT_FAMILY;
@@ -442,7 +438,7 @@
if (kid == null || value == null) {
return false;
}
-
+
return getChildName(kid).equals(value);
}
@@ -457,7 +453,7 @@
return ((AbstractTogglePanelItem) item).getName();
}
-
+
public AbstractTogglePanelItem getItemByIndex(final int index) {
List<AbstractTogglePanelItem> children = getRenderedItems();
if (isCycledSwitching()) {
@@ -523,14 +519,14 @@
if (name == null) {
throw new IllegalArgumentException("Name is required parameter.");
}
-
+
List<AbstractTogglePanelItem> items = getRenderedItems();
for (int ind = 0; ind < items.size(); ind++) {
if (name.equals(items.get(ind).getName())) {
return ind;
}
}
-
+
return Integer.MIN_VALUE;
}
@@ -583,7 +579,6 @@
public abstract MethodExpression getItemChangeListener();
-
// ------------------------------------------------ Event Processing Methods
public void addItemChangeListener(ItemChangeListener listener) {
14 years, 1 month
JBoss Rich Faces SVN: r20452 - in modules/tests/metamer/trunk/application/src/main: resources/org/richfaces/tests/metamer/bean and 4 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-12-08 06:55:26 -0500 (Wed, 08 Dec 2010)
New Revision: 20452
Added:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarBean.java
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichToolbarBean.properties
modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/
modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/list.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/
modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/copy.gif
modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/create_doc.gif
modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/create_folder.gif
modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/open.gif
modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/save.gif
modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/save_all.gif
modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/save_as.gif
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
Log:
https://jira.jboss.org/browse/RF-9761
* added one sample for rich:toolbar
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-12-08 11:34:06 UTC (rev 20451)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-12-08 11:55:26 UTC (rev 20452)
@@ -146,6 +146,7 @@
components.put("richToggleControl", "Rich Toggle Control");
components.put("richTogglePanel", "Rich Toggle Panel");
components.put("richTogglePanelItem", "Rich Toggle Panel Item");
+ components.put("richToolbar", "Rich Toolbar");
components.put("richTooltip", "Rich Tooltip");
components.put("richTree", "Rich Tree");
}
Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarBean.java (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarBean.java 2010-12-08 11:55:26 UTC (rev 20452)
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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 software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.bean;
+
+import java.io.Serializable;
+
+import javax.annotation.PostConstruct;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.SessionScoped;
+import org.richfaces.component.UIToolbar;
+
+import org.richfaces.tests.metamer.Attributes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Managed bean for rich:toolbar.
+ *
+ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
+ * @version $Revision$
+ */
+@ManagedBean(name = "richToolbarBean")
+@SessionScoped
+public class RichToolbarBean implements Serializable {
+
+ private static final long serialVersionUID = -1L;
+ private static Logger logger;
+ private Attributes attributes;
+
+ /**
+ * Initializes the managed bean.
+ */
+ @PostConstruct
+ public void init() {
+ logger = LoggerFactory.getLogger(getClass());
+ logger.debug("initializing bean " + getClass().getName());
+
+ attributes = Attributes.getUIComponentAttributes(UIToolbar.class, getClass());
+
+ attributes.setAttribute("height", 28);
+ attributes.setAttribute("rendered", true);
+ }
+
+ public Attributes getAttributes() {
+ return attributes;
+ }
+
+ public void setAttributes(Attributes attributes) {
+ this.attributes = attributes;
+ }
+}
Property changes on: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarBean.java
___________________________________________________________________
Name: svn:keywords
+ Revision
Added: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichToolbarBean.properties
===================================================================
--- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichToolbarBean.properties (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichToolbarBean.properties 2010-12-08 11:55:26 UTC (rev 20452)
@@ -0,0 +1,6 @@
+attr.itemSeparator.none=none
+attr.itemSeparator.line=line
+attr.itemSeparator.square=square
+attr.itemSeparator.disc=disc
+attr.itemSeparator.grid=grid
+attr.itemSeparator.null=
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/list.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/list.xhtml 2010-12-08 11:55:26 UTC (rev 20452)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:metamer="http://java.sun.com/jsf/composite/metamer">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software 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 software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition template="/templates/list.xhtml">
+
+ <ui:define name="pageTitle">Rich Toolbar</ui:define>
+
+ <ui:define name="links">
+
+ <metamer:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page containing <b>rich:toolbar</b> and inputs for all its attributes.
+ </metamer:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/simple.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/simple.xhtml 2010-12-08 11:55:26 UTC (rev 20452)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer"
+ xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software 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 software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition template="/templates/template.xhtml">
+ <ui:define name="head">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ <style type="text/css">
+ .pic {
+ margin-right: 2px;
+ margin-top: 2px;
+ }
+
+ .barsearch {
+ height: 14px;
+ width: 100px;
+ }
+ </style>
+ </ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ </ui:define>
+
+ <ui:define name="component">
+
+ <rich:toolbar id="toolbar"
+ height="#{richToolbarBean.attributes['height'].value}"
+ itemClass="#{richToolbarBean.attributes['itemClass'].value}"
+ itemSeparator="#{richToolbarBean.attributes['itemSeparator'].value}"
+ itemStyle="#{richToolbarBean.attributes['itemStyle'].value}"
+ onitemclick="#{richToolbarBean.attributes['onitemclick'].value}"
+ onitemdblclick="#{richToolbarBean.attributes['onitemdblclick'].value}"
+ onitemkeydown="#{richToolbarBean.attributes['onitemkeydown'].value}"
+ onitemkeypress="#{richToolbarBean.attributes['onitemkeypress'].value}"
+ onitemkeyup="#{richToolbarBean.attributes['onitemkeyup'].value}"
+ onitemmousedown="#{richToolbarBean.attributes['onitemmousedown'].value}"
+ onitemmousemove="#{richToolbarBean.attributes['onitemmousemove'].value}"
+ onitemmouseout="#{richToolbarBean.attributes['onitemmouseout'].value}"
+ onitemmouseover="#{richToolbarBean.attributes['onitemmouseover'].value}"
+ onitemmouseup="#{richToolbarBean.attributes['onitemmouseup'].value}"
+ rendered="#{richToolbarBean.attributes['rendered'].value}"
+ style="#{richToolbarBean.attributes['style'].value}"
+ styleClass="#{richToolbarBean.attributes['styleClass'].value}"
+ width="#{richToolbarBean.attributes['width'].value}"
+ >
+
+ <rich:toolbarGroup>
+ <h:graphicImage library="images/icons" name="create_doc.gif" styleClass="pic" />
+ <h:graphicImage library="images/icons" name="create_folder.gif" styleClass="pic" />
+ <h:graphicImage library="images/icons" name="copy.gif" styleClass="pic" />
+ </rich:toolbarGroup>
+
+ <rich:toolbarGroup>
+ <h:graphicImage library="images/icons" name="save.gif" styleClass="pic" />
+ <h:graphicImage library="images/icons" name="save_as.gif" styleClass="pic" />
+ <h:graphicImage library="images/icons" name="save_all.gif" styleClass="pic" />
+ </rich:toolbarGroup>
+
+ <rich:toolbarGroup location="right">
+ <h:inputText styleClass="barsearch" />
+ <h:commandButton onclick="return false;" value="Search" />
+ </rich:toolbarGroup>
+
+ </rich:toolbar>
+
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ <metamer:attributes value="#{richToolbarBean.attributes}" id="attributes" render="log"/>
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added: modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/copy.gif
===================================================================
(Binary files differ)
Property changes on: modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/copy.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/create_doc.gif
===================================================================
(Binary files differ)
Property changes on: modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/create_doc.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/create_folder.gif
===================================================================
(Binary files differ)
Property changes on: modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/create_folder.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/open.gif
===================================================================
(Binary files differ)
Property changes on: modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/open.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/save.gif
===================================================================
(Binary files differ)
Property changes on: modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/save.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/save_all.gif
===================================================================
(Binary files differ)
Property changes on: modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/save_all.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/save_as.gif
===================================================================
(Binary files differ)
Property changes on: modules/tests/metamer/trunk/application/src/main/webapp/resources/images/icons/save_as.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 1 month
JBoss Rich Faces SVN: r20451 - trunk/ui/output/ui/src/main/templates.
by richfaces-svn-commits@lists.jboss.org
Author: amarkhel
Date: 2010-12-08 06:34:06 -0500 (Wed, 08 Dec 2010)
New Revision: 20451
Modified:
trunk/ui/output/ui/src/main/templates/popupPanel.template.xml
Log:
RF-9888 Popup panel: attribute zIndex ignored.
Modified: trunk/ui/output/ui/src/main/templates/popupPanel.template.xml
===================================================================
--- trunk/ui/output/ui/src/main/templates/popupPanel.template.xml 2010-12-08 11:31:30 UTC (rev 20450)
+++ trunk/ui/output/ui/src/main/templates/popupPanel.template.xml 2010-12-08 11:34:06 UTC (rev 20451)
@@ -14,6 +14,8 @@
</cc:interface>
<cc:implementation>
+ <cdk:object name="zindex" value="#{component.attributes['zindex']}" />
+
<cdk:call expression="checkOptions(facesContext, component)" />
<div id="#{clientId}" style="visibility: hidden;">
<c:if test="#{component.attributes['modal']}">
@@ -30,7 +32,7 @@
</c:if>
<div id="#{clientId}_shadow" style="position: #{component.attributes['followByScroll'] ? 'fixed' : 'absolute'};" class="rf-pp-shdw"/>
- <div id="#{clientId}_container" style="position: #{component.attributes['followByScroll'] ? 'fixed' : 'absolute'};" cdk:passThroughWithExclusions="id style class styleClass" class="rf-pp-cntr #{component.attributes['styleClass']}">
+ <div id="#{clientId}_container" style="position: #{component.attributes['followByScroll'] ? 'fixed' : 'absolute'}; #{not empty zindex ? 'z-index:'+zindex+';':''}" cdk:passThroughWithExclusions="id style class styleClass" class="rf-pp-cntr #{component.attributes['styleClass']}">
<c:if test="#{component.getFacet('header')!=null and component.getFacet('header').rendered}">
<div id="#{clientId}_header" class="rf-pp-hdr #{component.attributes['headerClass']}" >
14 years, 1 month
JBoss Rich Faces SVN: r20450 - trunk/examples/input-demo/src/main/webapp/examples.
by richfaces-svn-commits@lists.jboss.org
Author: pyaschenko
Date: 2010-12-08 06:31:30 -0500 (Wed, 08 Dec 2010)
New Revision: 20450
Modified:
trunk/examples/input-demo/src/main/webapp/examples/calendar.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-9648
example fix
Modified: trunk/examples/input-demo/src/main/webapp/examples/calendar.xhtml
===================================================================
--- trunk/examples/input-demo/src/main/webapp/examples/calendar.xhtml 2010-12-08 11:29:25 UTC (rev 20449)
+++ trunk/examples/input-demo/src/main/webapp/examples/calendar.xhtml 2010-12-08 11:31:30 UTC (rev 20450)
@@ -120,9 +120,13 @@
<f:selectItem itemLabel="bottom-right" itemValue="bottom-right" />
</h:selectOneMenu>
<h:outputText value="Horisontal offset:" />
- <h:inputText value="#{calendarBean.horizontalOffset}" />
+ <h:inputText value="#{calendarBean.horizontalOffset}">
+ <f:ajax execute="@form" event="change" render="calendar @this" />
+ </h:inputText>
<h:outputText value="Vertical offset:" />
- <h:inputText value="#{calendarBean.verticalOffset}" />
+ <h:inputText value="#{calendarBean.verticalOffset}">
+ <f:ajax execute="@form" event="change" render="calendar @this" />
+ </h:inputText>
</h:panelGrid>
<h:panelGroup layout="block">
<div>
14 years, 1 month
JBoss Rich Faces SVN: r20449 - in trunk: examples/input-demo/src/main/java/org/richfaces/demo and 3 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: pyaschenko
Date: 2010-12-08 06:29:25 -0500 (Wed, 08 Dec 2010)
New Revision: 20449
Modified:
trunk/core/impl/src/main/resources/META-INF/resources/jquery.position.js
trunk/examples/input-demo/src/main/java/org/richfaces/demo/CalendarBean.java
trunk/examples/input-demo/src/main/webapp/examples/calendar.xhtml
trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js
Log:
http://jira.jboss.com/jira/browse/RF-9648
offsets support also was added to jquery.position plugin
Modified: trunk/core/impl/src/main/resources/META-INF/resources/jquery.position.js
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-12-08 11:28:52 UTC (rev 20448)
+++ trunk/core/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-12-08 11:29:25 UTC (rev 20449)
@@ -182,21 +182,6 @@
}
return rect;
- /*
- var jqe = $(element);
- var offset = jqe.offset();
- var width = jqe.width();
- var height = jqe.height();
- if (width == 0 && height==0) {
- //TODO: create getComputedStyle function for this
- var e = jqe.get(0);
- if (e.currentStyle) {
- width = parseInt(e.currentStyle['width'],10) || 0;
- height = parseInt(e.currentStyle['height'],10) || 0;
- }
- }
- return {width: width, height: height, left: Math.floor(offset.left), top: Math.floor(offset.top)};
- */
};
function checkCollision (elementRect, windowRect) {
@@ -237,7 +222,6 @@
function getPositionRect(baseRect, rectOffset, elementDim, pos) {
var rect = {};
// TODO: add support for center and middle // may be middle rename to center too
- // TODO: add rectOffset support && tests
var v = pos.charAt(0);
if (v=='L') {
@@ -255,17 +239,21 @@
v = pos.charAt(2);
if (v=='L') {
+ rect.left -= rectOffset[0];
rect.right = rect.left;
rect.left -= elementDim.width;
} else if (v=='R') {
+ rect.left += rectOffset[0];
rect.right = rect.left + elementDim.width;
}
v = pos.charAt(3);
if (v=='T') {
+ rect.top -= rectOffset[1];
rect.bottom = rect.top;
rect.top -= elementDim.height;
} else if (v=='B') {
+ rect.top += rectOffset[1];
rect.bottom = rect.top + elementDim.height;
}
Modified: trunk/examples/input-demo/src/main/java/org/richfaces/demo/CalendarBean.java
===================================================================
--- trunk/examples/input-demo/src/main/java/org/richfaces/demo/CalendarBean.java 2010-12-08 11:28:52 UTC (rev 20448)
+++ trunk/examples/input-demo/src/main/java/org/richfaces/demo/CalendarBean.java 2010-12-08 11:29:25 UTC (rev 20449)
@@ -20,7 +20,9 @@
private String mode = "client";
private String jointPoint = "auto-auto";
private String direction = "auto-auto";
-
+ private int horizontalOffset = 0;
+ private int verticalOffset = 0;
+
public CalendarBean() {
locale = Locale.US;
@@ -110,4 +112,20 @@
return direction;
}
+ public void setHorizontalOffset(int horizontalOffset) {
+ this.horizontalOffset = horizontalOffset;
+ }
+
+ public int getHorizontalOffset() {
+ return horizontalOffset;
+ }
+
+ public void setVerticalOffset(int verticalOffset) {
+ this.verticalOffset = verticalOffset;
+ }
+
+ public int getVerticalOffset() {
+ return verticalOffset;
+ }
+
}
\ No newline at end of file
Modified: trunk/examples/input-demo/src/main/webapp/examples/calendar.xhtml
===================================================================
--- trunk/examples/input-demo/src/main/webapp/examples/calendar.xhtml 2010-12-08 11:28:52 UTC (rev 20448)
+++ trunk/examples/input-demo/src/main/webapp/examples/calendar.xhtml 2010-12-08 11:29:25 UTC (rev 20449)
@@ -58,7 +58,9 @@
onclean="return onEvent.call(this, event);"
ondatemouseout="return onEvent.call(this, event);"
ondatemouseover="return onEvent.call(this, event);"
-
+ firstWeekDay="4"
+ horizontalOffset="#{calendarBean.horizontalOffset}"
+ verticalOffset="#{calendarBean.verticalOffset}"
>
<f:ajax event="change" render="echo-text" />
</calendar:calendar>
@@ -97,7 +99,7 @@
<h:selectOneMenu value="#{calendarBean.mode}" onchange="submit()">
<f:selectItem itemValue="client"/>
<f:selectItem itemValue="ajax"/>
- </h:selectOneMenu><br/>
+ </h:selectOneMenu>
<h:outputText value="Select joint point:" />
<h:selectOneMenu value="#{calendarBean.jointPoint}">
@@ -116,7 +118,11 @@
<f:selectItem itemLabel="top-right" itemValue="top-right" />
<f:selectItem itemLabel="bottom-left" itemValue="bottom-left" />
<f:selectItem itemLabel="bottom-right" itemValue="bottom-right" />
- </h:selectOneMenu>
+ </h:selectOneMenu>
+ <h:outputText value="Horisontal offset:" />
+ <h:inputText value="#{calendarBean.horizontalOffset}" />
+ <h:outputText value="Vertical offset:" />
+ <h:inputText value="#{calendarBean.verticalOffset}" />
</h:panelGrid>
<h:panelGroup layout="block">
<div>
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2010-12-08 11:28:52 UTC (rev 20448)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2010-12-08 11:29:25 UTC (rev 20449)
@@ -159,10 +159,10 @@
public abstract String getBoundaryDatesMode();
@Attribute(defaultValue = "0")
- public abstract String getHorizontalOffset();
+ public abstract int getHorizontalOffset();
@Attribute(defaultValue = "0")
- public abstract String getVerticalOffset();
+ public abstract int getVerticalOffset();
@Attribute(defaultValue = "3")
public abstract int getZindex();
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js 2010-12-08 11:28:52 UTC (rev 20448)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js 2010-12-08 11:29:25 UTC (rev 20449)
@@ -342,7 +342,7 @@
}
this.params.labels = value;
- this.popupOffset = {dx:this.params.horizontalOffset, dy:this.params.verticalOffset};
+ this.popupOffset = [this.params.horizontalOffset, this.params.verticalOffset];
//
if (!this.params.popup) this.params.showApplyButton = false;
14 years, 1 month
JBoss Rich Faces SVN: r20448 - modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel.
by richfaces-svn-commits@lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-12-08 06:28:52 -0500 (Wed, 08 Dec 2010)
New Revision: 20448
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml
Log:
https://jira.jboss.org/browse/RFPL-676
* samples for popup panel fixed (ZIndex was renamed to zindex)
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml 2010-12-08 10:18:04 UTC (rev 20447)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml 2010-12-08 11:28:52 UTC (rev 20448)
@@ -47,7 +47,6 @@
</h:commandButton>
<rich:popupPanel id="popupPanel"
- ZIndex="#{richPopupPanelBean.attributes['ZIndex'].value}"
autosized="#{richPopupPanelBean.attributes['autosized'].value}"
controlsClass="#{richPopupPanelBean.attributes['controlsClass'].value}"
domElementAttachment="#{richPopupPanelBean.attributes['domElementAttachment'].value}"
@@ -87,6 +86,7 @@
trimOverlayedElements="#{richPopupPanelBean.attributes['trimOverlayedElements'].value}"
visualOptions="#{richPopupPanelBean.attributes['visualOptions'].value}"
width="#{richPopupPanelBean.attributes['width'].value}"
+ zindex="#{richPopupPanelBean.attributes['zindex'].value}"
>
<f:facet name="controls">
<h:outputLink value="#" onclick="#{rich:component('popupPanel')}.hide(); return false;">X</h:outputLink>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml 2010-12-08 10:18:04 UTC (rev 20447)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml 2010-12-08 11:28:52 UTC (rev 20448)
@@ -84,7 +84,7 @@
trimOverlayedElements="#{richPopupPanelBean.attributes['trimOverlayedElements'].value}"
visualOptions="#{richPopupPanelBean.attributes['visualOptions'].value}"
width="#{richPopupPanelBean.attributes['width'].value}"
- zIndex="#{richPopupPanelBean.attributes['zIndex'].value}"
+ zindex="#{richPopupPanelBean.attributes['zindex'].value}"
>
<f:facet name="controls">
<h:outputLink value="#" onclick="#{rich:component('popupPanel')}.hide(); return false;">X</h:outputLink>
14 years, 1 month
JBoss Rich Faces SVN: r20447 - in trunk: examples/output-demo/src/main/webapp/examples and 3 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: amarkhel
Date: 2010-12-08 05:18:04 -0500 (Wed, 08 Dec 2010)
New Revision: 20447
Modified:
trunk/examples/output-demo/src/main/java/org/richfaces/ModalPanel.java
trunk/examples/output-demo/src/main/webapp/examples/popupPanel.xhtml
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPopupPanel.java
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java
trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
Log:
RF-9742: Popup panel: rename ZIndex attribute
Modified: trunk/examples/output-demo/src/main/java/org/richfaces/ModalPanel.java
===================================================================
--- trunk/examples/output-demo/src/main/java/org/richfaces/ModalPanel.java 2010-12-08 09:02:50 UTC (rev 20446)
+++ trunk/examples/output-demo/src/main/java/org/richfaces/ModalPanel.java 2010-12-08 10:18:04 UTC (rev 20447)
@@ -55,8 +55,17 @@
this.shadowOpacity = "3";
this.show = false;
this.domElementAttachment = "body";
+ this.zindex = 123;
}
+ public int getZindex() {
+ return zindex;
+ }
+
+ public void setZindex(int zindex) {
+ this.zindex = zindex;
+ }
+
public int getHeight() {
return height;
}
Modified: trunk/examples/output-demo/src/main/webapp/examples/popupPanel.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/examples/popupPanel.xhtml 2010-12-08 09:02:50 UTC (rev 20446)
+++ trunk/examples/output-demo/src/main/webapp/examples/popupPanel.xhtml 2010-12-08 10:18:04 UTC (rev 20447)
@@ -28,6 +28,7 @@
shadowOpacity="#{modalPanel.shadowOpacity}"
show="#{modalPanel.show}"
domElementAttachment="#{modalPanel.domElementAttachment}"
+ zindex="#{modalPanel.zindex}"
>
<f:facet name="header">
<h:outputText value="HEADER for popup" />
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPopupPanel.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPopupPanel.java 2010-12-08 09:02:50 UTC (rev 20446)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPopupPanel.java 2010-12-08 10:18:04 UTC (rev 20447)
@@ -45,7 +45,7 @@
public abstract String getVisualOptions();
@Attribute(defaultValue = "100")
- public abstract int getZIndex();
+ public abstract int getZindex();
@Attribute(defaultValue = "-1")
public abstract int getHeight();
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java 2010-12-08 09:02:50 UTC (rev 20446)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java 2010-12-08 10:18:04 UTC (rev 20447)
@@ -187,7 +187,7 @@
addToScriptHash(options, "followByScroll", panel.isFollowByScroll(), "true");
addToScriptHash(options, "left", panel.getLeft(), "auto");
addToScriptHash(options, "top", panel.getTop(), "auto");
- addToScriptHash(options, "zindex", panel.getZIndex(), "100");
+ addToScriptHash(options, "zindex", panel.getZindex(), "100");
addToScriptHash(options, "shadowDepth", panel.getShadowDepth(), "2");
addToScriptHash(options, "shadowOpacity", panel.getShadowOpacity(), "0.1");
addToScriptHash(options, "domElementAttachment", panel.getDomElementAttachment());
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-08 09:02:50 UTC (rev 20446)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-08 10:18:04 UTC (rev 20447)
@@ -785,11 +785,187 @@
<tag>
<tag-name>popupPanel</tag-name>
<component>
+ <description>JSF component class</description>
<component-type>org.richfaces.PopupPanel</component-type>
<renderer-type>org.richfaces.PopupPanelRenderer</renderer-type>
</component>
+ <attribute>
+ <name>autosized</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <description>The value binding expression used to wire up this component to a component property of a JavaBean class</description>
+ <icon/>
+ <name>binding</name>
+ <type>javax.faces.component.UIComponent</type>
+ </attribute>
+ <attribute>
+ <name>controlsClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>domElementAttachment</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>followByScroll</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>header</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>headerClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>height</name>
+ <type>int</type>
+ </attribute>
+ <attribute>
+ <description>The component identifier for this component. This value must be unique within the closest parent component that is a naming container.</description>
+ <display-name>Component Identifier</display-name>
+ <icon/>
+ <name>id</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>keepVisualState</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>left</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>maxHeight</name>
+ <type>int</type>
+ </attribute>
+ <attribute>
+ <name>maxWidth</name>
+ <type>int</type>
+ </attribute>
+ <attribute>
+ <name>minHeight</name>
+ <type>int</type>
+ </attribute>
+ <attribute>
+ <name>minWidth</name>
+ <type>int</type>
+ </attribute>
+ <attribute>
+ <name>modal</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>moveable</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>onbeforehide</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onbeforeshow</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onhide</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmaskclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmaskcontextmenu</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmaskdblclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmaskmousedown</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmaskmousemove</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmaskmouseout</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmaskmouseover</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmaskmouseup</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmove</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onresize</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onshow</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>overlapEmbedObjects</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <description>Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit. The default value for this property is true.</description>
+ <display-name>Rendered Flag</display-name>
+ <icon/>
+ <name>rendered</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>resizeable</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>shadowDepth</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>shadowOpacity</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>show</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>top</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>trimOverlayedElements</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>visualOptions</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>width</name>
+ <type>int</type>
+ </attribute>
+ <attribute>
+ <name>zindex</name>
+ <type>int</type>
+ </attribute>
</tag>
-
<tag>
<tag-name>tabPanel</tag-name>
<component>
14 years, 1 month
JBoss Rich Faces SVN: r20446 - modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar.
by richfaces-svn-commits@lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-12-08 04:02:50 -0500 (Wed, 08 Dec 2010)
New Revision: 20446
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml
Log:
https://jira.jboss.org/browse/RFPL-864
* facet complete renamed to finish
* added pause button to client-type progress bar
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml 2010-12-08 08:13:40 UTC (rev 20445)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml 2010-12-08 09:02:50 UTC (rev 20446)
@@ -80,7 +80,7 @@
rendered="#{richProgressBarBean.buttonRendered}"
style="margin: 9px 0px 5px;" />
</f:facet>
- <f:facet name="complete">
+ <f:facet name="finish">
<h:outputText id="completeOutput" value="Process Done" />
<br/>
<a4j:commandButton id="restartButton"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml 2010-12-08 08:13:40 UTC (rev 20445)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml 2010-12-08 09:02:50 UTC (rev 20446)
@@ -41,25 +41,35 @@
<ui:define name="component">
<script type="text/javascript">
- //<![CDATA[
- var counter = 1;
- var intervalID;
+ //<![CDATA[
+ var counter = 1;
+ var intervalID;
+
function updateProgress(i) {
- RichFaces.$('#{rich:clientId('progressBar')}').setValue(counter*5);
+ #{rich:component('progressBar')}.setValue(counter*5);
if ((counter++)>20){
clearInterval(intervalID);
- document.getElementById('button').disabled=false;
+ #{rich:element('startButton')}.disabled=false;
+ #{rich:element('pauseButton')}.disabled=true;
+ counter=1;
}
}
function startProgress(){
- counter=1;
- document.getElementById('button').disabled=true;
- RichFaces.$('#{rich:clientId('progressBar')}').enable();
- RichFaces.$('#{rich:clientId('progressBar')}').setValue(1);
+ #{rich:element('startButton')}.disabled=true;
+ #{rich:element('pauseButton')}.disabled=false;
+ #{rich:component('progressBar')}.enable();
+ #{rich:component('progressBar')}.setValue(counter*5);
intervalID = setInterval(updateProgress,1000);
}
- //]]>
+
+ function pauseProgress(){
+ #{rich:element('startButton')}.disabled=false;
+ #{rich:element('pauseButton')}.disabled=true;
+ #{rich:component('progressBar')}.disable();
+ clearInterval(intervalID);
+ }
+ //]]>
</script>
<rich:progressBar id="progressBar"
@@ -95,12 +105,14 @@
<f:facet name="initial">
<h:outputText id="initialOutput" value="Process hasn't started yet"/>
</f:facet>
- <f:facet name="complete">
+ <f:facet name="finish">
<h:outputText id="completeOutput" value="Process Done"/>
</f:facet>
</rich:progressBar>
- <button type="button" onclick="startProgress();" style="margin: 9px 0px 5px;" id="button">Start Progress</button>
+ <h:commandButton id="startButton" onclick="startProgress(); return false;" style="margin: 9px 0px 5px;" value="Start Progress"/>
+ <h:commandButton id="pauseButton" onclick="pauseProgress(); return false;" style="margin: 9px 0px 5px;" disabled="true" value="Pause Progress"/>
+
</ui:define>
<ui:define name="outOfTemplateAfter">
14 years, 1 month
JBoss Rich Faces SVN: r20445 - in trunk/ui/output/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: amarkhel
Date: 2010-12-08 03:13:40 -0500 (Wed, 08 Dec 2010)
New Revision: 20445
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDropDownMenu.java
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js
Log:
https://jira.jboss.org/browse/RF-9676 Dropdown menu component minor update
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDropDownMenu.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDropDownMenu.java 2010-12-08 01:41:14 UTC (rev 20444)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDropDownMenu.java 2010-12-08 08:13:40 UTC (rev 20445)
@@ -29,10 +29,10 @@
@Attribute
public abstract boolean isDisabled();
- @Attribute(defaultValue = "800")
+ @Attribute(defaultValue = "300")
public abstract int getHideDelay();
- @Attribute(defaultValue = "800")
+ @Attribute(defaultValue = "50")
public abstract int getShowDelay();
@Attribute(defaultValue = "250")
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js 2010-12-08 01:41:14 UTC (rev 20444)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js 2010-12-08 08:13:40 UTC (rev 20445)
@@ -6,7 +6,7 @@
attachToBody: false,
positionOffset: [0, 0],
showDelay: 50,
- hideDelay: 800,
+ hideDelay: 300,
verticalOffset: 0,
horisantalOffset: 0,
showEvent: 'mouseover',
14 years, 1 month