JBoss Rich Faces SVN: r7498 - trunk/framework/api/src/main/java/org/richfaces/model.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-03-31 14:43:26 -0400 (Mon, 31 Mar 2008)
New Revision: 7498
Modified:
trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java
Log:
TODO committed
Modified: trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java 2008-03-31 18:30:27 UTC (rev 7497)
+++ trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java 2008-03-31 18:43:26 UTC (rev 7498)
@@ -135,7 +135,8 @@
Object nextIdentifier;
if (nextChildEntry != null) {
- nextChildNode = nextChildEntry.getValue();
+ //TODO consider lazy initialization of value
+ nextChildNode = nextChildEntry.getValue();
nextIdentifier = nextChildEntry.getKey();
} else {
nextChildNode = null;
16 years, 8 months
JBoss Rich Faces SVN: r7497 - trunk/framework/api/src/main/java/org/richfaces/model.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-03-31 14:30:27 -0400 (Mon, 31 Mar 2008)
New Revision: 7497
Modified:
trunk/framework/api/src/main/java/org/richfaces/model/CacheableTreeDataModel.java
Log:
http://jira.jboss.com/jira/browse/RF-2875
Modified: trunk/framework/api/src/main/java/org/richfaces/model/CacheableTreeDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/CacheableTreeDataModel.java 2008-03-31 18:30:16 UTC (rev 7496)
+++ trunk/framework/api/src/main/java/org/richfaces/model/CacheableTreeDataModel.java 2008-03-31 18:30:27 UTC (rev 7497)
@@ -139,6 +139,29 @@
@Override
public Object convertToKey(FacesContext context, String keyString, UIComponent component, Converter converter) {
- return treeDataModel.convertToKey(context, keyString, component, converter);
+ Object convertedKey = treeDataModel.convertToKey(context, keyString, component, converter);
+
+ if (convertedKey != null) {
+ final TreeRowKey treeRowKey = (TreeRowKey) convertedKey;
+ try {
+ walk(context, null, new TreeRange() {
+
+ public boolean processChildren(TreeRowKey rowKey) {
+ return rowKey == null || rowKey.isSubKey(treeRowKey);
+ }
+
+ public boolean processNode(TreeRowKey rowKey) {
+ return this.processChildren(rowKey) || rowKey.equals(treeRowKey);
+ }
+
+ }, null);
+ } catch (IOException e) {
+ context.getExternalContext().log(e.getLocalizedMessage(), e);
+
+ return null;
+ }
}
+
+ return convertedKey;
+ }
}
16 years, 8 months
JBoss Rich Faces SVN: r7496 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits@lists.jboss.org
Author: artdaw
Date: 2008-03-31 14:30:16 -0400 (Mon, 31 Mar 2008)
New Revision: 7496
Modified:
trunk/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml
trunk/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml
Log:
fix errors in styles
Modified: trunk/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml 2008-03-31 18:24:56 UTC (rev 7495)
+++ trunk/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml 2008-03-31 18:30:16 UTC (rev 7496)
@@ -65,8 +65,8 @@
<title>Details of Usage</title>
<para>
-The <property><rich:changeExpandListener></property> is used as a nested tag with <property><rich:tree></property>
-and <property><rich:treeNode></property> components.
+ The <emphasis role="bold"><property><rich:changeExpandListener></property></emphasis> is used as a nested tag with <emphasis role="bold"><property><rich:tree></property></emphasis>
+ and <emphasis role="bold"><property><rich:treeNode></property></emphasis> components.
</para>
<para>
Attribute <emphasis><property>"type"</property></emphasis> defines the fully qualified Java class name for the listener.
Modified: trunk/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml 2008-03-31 18:24:56 UTC (rev 7495)
+++ trunk/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml 2008-03-31 18:30:16 UTC (rev 7496)
@@ -66,8 +66,8 @@
<title>Details of Usage</title>
<para>
-The <property><rich:nodeSelectListener></property> is used as a nested tag with <property><rich:tree></property>
-and <property><rich:treeNode></property> components.
+ The <emphasis role="bold"><property><rich:nodeSelectListener></property></emphasis> is used as a nested tag with <emphasis role="bold"><property><rich:tree></property></emphasis>
+ and <emphasis role="bold"><property><rich:treeNode></property></emphasis> components.
</para>
<para>
Attribute <emphasis><property>"type"</property></emphasis> defines the fully qualified Java class name for listener.
16 years, 8 months
JBoss Rich Faces SVN: r7495 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples.
by richfaces-svn-commits@lists.jboss.org
Author: SergeySmirnov
Date: 2008-03-31 14:24:56 -0400 (Mon, 31 Mar 2008)
New Revision: 7495
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml
Log:
bg for button is removed
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml 2008-03-31 18:12:42 UTC (rev 7494)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml 2008-03-31 18:24:56 UTC (rev 7495)
@@ -24,10 +24,6 @@
padding:2px;
}
- .navPanel input[type="button"] {
- background-color: #{richSkin.additionalBackgroundColor};
- }
-
</style>
<br/>
<h:panelGrid width="100%" columns="2" columnClasses="col1,col2">
16 years, 8 months
JBoss Rich Faces SVN: r7494 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/support/examples.
by richfaces-svn-commits@lists.jboss.org
Author: SergeySmirnov
Date: 2008-03-31 14:12:42 -0400 (Mon, 31 Mar 2008)
New Revision: 7494
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/support/examples/echo.xhtml
Log:
Explicitly generated ids are added. Without them, high traffic Ajax might cause the wrong id generation that JSF 1.2 is used
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/support/examples/echo.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/support/examples/echo.xhtml 2008-03-31 18:00:43 UTC (rev 7493)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/support/examples/echo.xhtml 2008-03-31 18:12:42 UTC (rev 7494)
@@ -5,9 +5,9 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
- <h:form>
+ <h:form id="myform">
<h:panelGrid columns="2">
- <h:inputText value="#{userBean.name}">
+ <h:inputText id="myinput" value="#{userBean.name}">
<a4j:support event="onkeyup" reRender="outtext" />
</h:inputText>
<h:outputText id="outtext" value="#{userBean.name}" />
16 years, 8 months
JBoss Rich Faces SVN: r7493 - trunk/ui/tooltip/src/main/java/org/richfaces/taglib.
by richfaces-svn-commits@lists.jboss.org
Author: pyaschenko
Date: 2008-03-31 14:00:43 -0400 (Mon, 31 Mar 2008)
New Revision: 7493
Modified:
trunk/ui/tooltip/src/main/java/org/richfaces/taglib/ToolTipTagHandlerBase.java
Log:
http://jira.jboss.com/jira/browse/RF-2879
Modified: trunk/ui/tooltip/src/main/java/org/richfaces/taglib/ToolTipTagHandlerBase.java
===================================================================
--- trunk/ui/tooltip/src/main/java/org/richfaces/taglib/ToolTipTagHandlerBase.java 2008-03-31 17:36:31 UTC (rev 7492)
+++ trunk/ui/tooltip/src/main/java/org/richfaces/taglib/ToolTipTagHandlerBase.java 2008-03-31 18:00:43 UTC (rev 7493)
@@ -10,23 +10,27 @@
import com.sun.facelets.tag.jsf.ComponentConfig;
public abstract class ToolTipTagHandlerBase extends AjaxComponentHandler {
-
- public ToolTipTagHandlerBase(ComponentConfig config) {
- super(config);
- }
-
- protected MetaRuleset createMetaRuleset(Class type) {
- TagAttributes attributes = this.tag.getAttributes();
- TagAttribute attribute = attributes.get("event");
- if (attribute != null && attributes.get("showEvent") != null) {
- TagAttribute idAttribute = attributes.get("id");
- FacesContext facesContext = FacesContext.getCurrentInstance();
- facesContext.getExternalContext().log("showEvent attribute has been already set for component with id: " +
- idAttribute != null ? idAttribute.getValue() : null +
- "[" + attribute.getValue() + "]. event attribute is deprecated and thus has been dropped!");
- }
- return super.createMetaRuleset(type).alias("event", "showEvent");
- }
+ public ToolTipTagHandlerBase(ComponentConfig config) {
+ super(config);
+ }
+ protected MetaRuleset createMetaRuleset(Class type) {
+ TagAttributes attributes = this.tag.getAttributes();
+ TagAttribute eventAttribute = attributes.get("event");
+ TagAttribute showEventAttribute = attributes.get("showEvent");
+ MetaRuleset ruleset = super.createMetaRuleset(type);
-
-}
+ if (eventAttribute != null) {
+ if (showEventAttribute != null) {
+ TagAttribute idAttribute = attributes.get("id");
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ facesContext.getExternalContext().log("showEvent attribute has been already set for component with id: " +
+ idAttribute != null ? idAttribute.getValue() : null +
+ "[" + eventAttribute.getValue() + "]. event attribute is deprecated and thus has been dropped!");
+ ruleset.ignore("event");
+ } else {
+ ruleset.alias("event", "showEvent");
+ }
+ }
+ return ruleset;
+ }
+}
\ No newline at end of file
16 years, 8 months
JBoss Rich Faces SVN: r7492 - trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2008-03-31 13:36:31 -0400 (Mon, 31 Mar 2008)
New Revision: 7492
Modified:
trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
Log:
http://jira.jboss.com/jira/browse/RF-2792
Modified: trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
===================================================================
--- trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-03-31 17:24:08 UTC (rev 7491)
+++ trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-03-31 17:36:31 UTC (rev 7492)
@@ -71,10 +71,18 @@
buttonClickHandler : function(e) {
this.tempKeeperClickHandler();
this.tempValueKeeper.focus();
+ this.button.isClicked = true;
Event.stop(e);
},
tmpValueBlurHandler : function($super, event) {
+
+ if (this.button.isClicked) {
+ // click on arrow under IE
+ this.button.isClicked = false;
+ return;
+ }
+
if (this.clickOnScroll) {
//click on scroll under IE
this.clickOnScroll = false;
16 years, 8 months
JBoss Rich Faces SVN: r7491 - trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: pyaschenko
Date: 2008-03-31 13:24:08 -0400 (Mon, 31 Mar 2008)
New Revision: 7491
Modified:
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
Log:
http://jira.jboss.com/jira/browse/RF-2890
Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
===================================================================
--- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2008-03-31 17:16:53 UTC (rev 7490)
+++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2008-03-31 17:24:08 UTC (rev 7491)
@@ -613,10 +613,10 @@
Element.hide(eCdiv);
element.style.visibility = "";
+ this.lastOnfocus();
+
Element.show(eCdiv);
- this.lastOnfocus();
-
var event = {};
event.parameters = opts || {};
this.shown = true;
16 years, 8 months
JBoss Rich Faces SVN: r7490 - Reports/3.2.0 and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: mvitenkov
Date: 2008-03-31 13:16:53 -0400 (Mon, 31 Mar 2008)
New Revision: 7490
Added:
trunk/test-applications/qa/Test Reports/3.2.0/DailyReport320CR831032008mvitenkov.xls
Log:
Added: trunk/test-applications/qa/Test Reports/3.2.0/DailyReport320CR831032008mvitenkov.xls
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/qa/Test Reports/3.2.0/DailyReport320CR831032008mvitenkov.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 8 months
JBoss Rich Faces SVN: r7489 - in trunk/ui/inplaceSelect/src/main: java/org/richfaces/renderkit and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2008-03-31 12:42:56 -0400 (Mon, 31 Mar 2008)
New Revision: 7489
Modified:
trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java
trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
Log:
fix for ajax reRender support
Modified: trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
===================================================================
--- trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2008-03-31 16:40:37 UTC (rev 7488)
+++ trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2008-03-31 16:42:56 UTC (rev 7489)
@@ -66,7 +66,7 @@
<name>defaultLabel</name>
<classname>java.lang.String</classname>
<description>The attribute is used to display text while value is undefined</description>
- <defaultvalue><![CDATA["\u00a0\u00a0\u00a0"]]></defaultvalue>
+ <defaultvalue>"   "</defaultvalue>
</property>
<property>
<name>showControls</name>
Modified: trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java
===================================================================
--- trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2008-03-31 16:40:37 UTC (rev 7488)
+++ trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2008-03-31 16:42:56 UTC (rev 7489)
@@ -150,7 +150,7 @@
protected String createDefaultLabel(UIComponent component) {
String defaultLabel = (String) component.getAttributes().get("defaultLabel");
if (defaultLabel == null || defaultLabel.equals("")) {
- defaultLabel = "\u00a0\u00a0\u00a0";
+ defaultLabel = "   ";
}
return defaultLabel;
}
Modified: trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
===================================================================
--- trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-03-31 16:40:37 UTC (rev 7488)
+++ trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-03-31 16:42:56 UTC (rev 7489)
@@ -200,10 +200,9 @@
['#{clientId}bar', '#{clientId}ok', '#{clientId}cancel', '#{clientId}buttons', '#{clientId}btns_shadow'], '#{clientId}inselArrow');
</script>
</div>
- #{fieldLabel}
-
<jsp:scriptlet>
+ writer.write(convertToString(variables.getVariable("fieldLabel")));
if (layout.equals("block")) {
</jsp:scriptlet>
</div>
16 years, 8 months