JBoss Rich Faces SVN: r10256 - trunk/ui/inplaceSelect/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-08-31 19:23:23 -0400 (Sun, 31 Aug 2008)
New Revision: 10256
Modified:
trunk/ui/inplaceSelect/src/test/java/org/richfaces/component/InplaceSelectComponentTest.java
Log:
Failing inplaceSelect test fixed
Modified: trunk/ui/inplaceSelect/src/test/java/org/richfaces/component/InplaceSelectComponentTest.java
===================================================================
--- trunk/ui/inplaceSelect/src/test/java/org/richfaces/component/InplaceSelectComponentTest.java 2008-08-31 23:19:38 UTC (rev 10255)
+++ trunk/ui/inplaceSelect/src/test/java/org/richfaces/component/InplaceSelectComponentTest.java 2008-08-31 23:23:23 UTC (rev 10256)
@@ -28,9 +28,8 @@
private static Set javaScripts = new HashSet();
static {
-
-
javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
+ javaScripts.add("org/richfaces/renderkit/html/scripts/jquery/jquery.js");
javaScripts.add("scripts/comboboxUtils.js");
javaScripts.add("scripts/combolist.js");
javaScripts.add("scripts/inplaceinput.js");
16 years, 3 months
JBoss Rich Faces SVN: r10255 - trunk/ui/combobox/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-08-31 19:19:38 -0400 (Sun, 31 Aug 2008)
New Revision: 10255
Modified:
trunk/ui/combobox/src/test/java/org/richfaces/component/ComboBoxComponentTest.java
Log:
Failing comboBox test fixed
Modified: trunk/ui/combobox/src/test/java/org/richfaces/component/ComboBoxComponentTest.java
===================================================================
--- trunk/ui/combobox/src/test/java/org/richfaces/component/ComboBoxComponentTest.java 2008-08-31 23:05:34 UTC (rev 10254)
+++ trunk/ui/combobox/src/test/java/org/richfaces/component/ComboBoxComponentTest.java 2008-08-31 23:19:38 UTC (rev 10255)
@@ -53,6 +53,7 @@
static {
javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
+ javaScripts.add("org/richfaces/renderkit/html/scripts/jquery/jquery.js");
javaScripts.add("scripts/comboboxUtils.js");
javaScripts.add("scripts/combobox.js");
javaScripts.add("scripts/combolist.js");
16 years, 3 months
JBoss Rich Faces SVN: r10254 - trunk/ui/columns/src/main/java/org/richfaces/taglib.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-08-31 19:05:34 -0400 (Sun, 31 Aug 2008)
New Revision: 10254
Modified:
trunk/ui/columns/src/main/java/org/richfaces/taglib/ComponentHandler.java
Log:
https://jira.jboss.org/jira/browse/RF-3953
Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/ComponentHandler.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/taglib/ComponentHandler.java 2008-08-31 21:50:20 UTC (rev 10253)
+++ trunk/ui/columns/src/main/java/org/richfaces/taglib/ComponentHandler.java 2008-08-31 23:05:34 UTC (rev 10254)
@@ -93,7 +93,7 @@
*/
public ComponentHandler(ComponentConfig config) {
super(config);
- handler = new com.sun.facelets.tag.jsf.ComponentHandler(config);
+ handler = new ColumnTagHandler(config);
}
/**
16 years, 3 months
JBoss Rich Faces SVN: r10253 - trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-08-31 17:50:20 -0400 (Sun, 31 Aug 2008)
New Revision: 10253
Modified:
trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
Log:
https://jira.jboss.org/jira/browse/RF-4181
Modified: trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
===================================================================
--- trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2008-08-31 20:35:40 UTC (rev 10252)
+++ trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2008-08-31 21:50:20 UTC (rev 10253)
@@ -617,7 +617,13 @@
}
this.event = e;
- this.element = Event.findElement(e, 'div');
+
+ var elt = Event.element(e);
+ while (elt && (!elt.tagName || elt.tagName.toLowerCase() != 'div')) {
+ elt = elt.parentNode;
+ } //Event.findElement(e, 'div');
+
+ this.element = elt;
if (this.element.id.indexOf(":folder") == (this.element.id.length -7) ) {
this.element = this.element.parentNode;
}
16 years, 3 months
JBoss Rich Faces SVN: r10252 - trunk/ui/beanValidator/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-08-31 16:35:40 -0400 (Sun, 31 Aug 2008)
New Revision: 10252
Modified:
trunk/ui/beanValidator/src/main/config/component/beanValidator.xml
Log:
https://jira.jboss.org/jira/browse/RF-4342
Modified: trunk/ui/beanValidator/src/main/config/component/beanValidator.xml
===================================================================
--- trunk/ui/beanValidator/src/main/config/component/beanValidator.xml 2008-08-31 19:00:35 UTC (rev 10251)
+++ trunk/ui/beanValidator/src/main/config/component/beanValidator.xml 2008-08-31 20:35:40 UTC (rev 10252)
@@ -114,7 +114,11 @@
<test />
</tag>
&ui_component_attributes;
- </component>
+
+ <property hidden="true">
+ <name>rendered</name>
+ </property>
+ </component>
<validator generate="false">
<id>org.richfaces.BeanValidator</id>
<classname>
16 years, 3 months
JBoss Rich Faces SVN: r10251 - in trunk/ui/fileUpload/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-08-31 15:00:35 -0400 (Sun, 31 Aug 2008)
New Revision: 10251
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
Log:
https://jira.jboss.org/jira/browse/RF-4334
https://jira.jboss.org/jira/browse/RF-4193
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-08-31 18:48:37 UTC (rev 10250)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-08-31 19:00:35 UTC (rev 10251)
@@ -151,7 +151,8 @@
if (this.uploadObject.isFlash) {
this.uploadObject._flashSubmitForm(this);
} else {
- this.uploadObject.submitForm(this);
+ this.uploadObject.createFrame();
+ setTimeout(function(){this.uploadObject.submitForm(this)}.bind(this), 0);
}
},
@@ -994,14 +995,6 @@
return parentForm;
},
- _getAction: function(f) {
- return f.getAttributeNode('action').nodeValue;
- },
-
- _setAction: function(f, newValue) {
- f.getAttributeNode('action').nodeValue = newValue;
- },
-
submitForm: function(entry) {
var parentForm = this.getForm();
@@ -1010,20 +1003,23 @@
}
var formUpload = !(entry && entry instanceof FileUploadEntry);
- var oldTarget = parentForm.target;
- var oldEnctype = parentForm.enctype;
- var oldEncoding = parentForm.encoding;
- var oldAction = this._getAction(parentForm);
+ var oldTarget = Richfaces.readAttribute(parentForm, "target");
+ var oldEnctype = Richfaces.readAttribute(parentForm, "enctype");
+ var oldEncoding = Richfaces.readAttribute(parentForm, "encoding");
+ var oldAction = Richfaces.readAttribute(parentForm, "action");
try {
if (!formUpload) {
entry.uid = Math.random().toString();
- parentForm.encoding = "multipart/form-data";
- parentForm.enctype = "multipart/form-data";
- this._setAction(parentForm, this.actionUrl + (/\?/.test(this.actionUrl) ? '&_richfaces_upload_uid' : '?_richfaces_upload_uid') + '=' + encodeURI(entry.uid) + "&id=" + this.id + "&_richfaces_upload_file_indicator=true"+"&AJAXREQUEST="+this.progressBar.containerId);
- parentForm.target = this.id + "_iframe";
+ Richfaces.writeAttribute(parentForm, "encoding", "multipart/form-data");
+ Richfaces.writeAttribute(parentForm, "enctype", "multipart/form-data");
+ Richfaces.writeAttribute(parentForm, "action",
+ this.actionUrl + (/\?/.test(this.actionUrl) ? '&_richfaces_upload_uid' : '?_richfaces_upload_uid') + '=' + encodeURI(entry.uid) + "&id=" + this.id + "&_richfaces_upload_file_indicator=true"+"&AJAXREQUEST="+this.progressBar.containerId);
+
+ Richfaces.writeAttribute(parentForm, "target", this.id + "_iframe");
+
var inputs = parentForm.elements;
var entryInput = entry.fileInput;
@@ -1070,13 +1066,13 @@
this._enableEntries(true);
}
} finally {
- parentForm.action = oldAction;
- parentForm.encoding = oldEncoding;
- parentForm.enctype = oldEnctype;
+ Richfaces.writeAttribute(parentForm, "action", oldAction);
+ Richfaces.writeAttribute(parentForm, "encoding", oldEncoding);
+ Richfaces.writeAttribute(parentForm, "enctype", oldEnctype);
if (formUpload) {
this.currentInput.disabled = true;
}else {
- parentForm.target = oldTarget;
+ Richfaces.writeAttribute(parentForm, "target", oldTarget);
this.getFileSizeScript(entry.uid, this.formId)
}
}
@@ -1095,8 +1091,11 @@
if (!f) {
throw "No parent form found!";
}
- f.encoding = f.enctype = "multipart/form-data";
- f.action = this.actionUrl + (/\?/.test(this.actionUrl) ? '&_richfaces_upload_uid' : '?_richfaces_upload_uid') + '=_richfaces_form_upload' + "&id=" + this.id + "&_richfaces_upload_file_indicator=true";
+ Richfaces.writeAttribute(f, "encoding", "multipart/form-data");
+ Richfaces.writeAttribute(f, "enctype", "multipart/form-data");
+ Richfaces.writeAttribute(f, "action",
+ this.actionUrl + (/\?/.test(this.actionUrl) ? '&_richfaces_upload_uid' : '?_richfaces_upload_uid') + '=_richfaces_form_upload' + "&id=" + this.id + "&_richfaces_upload_file_indicator=true");
+
this.currentInput.disabled = true;
this._enableEntries(false);
return true;
Modified: trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
===================================================================
--- trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-08-31 18:48:37 UTC (rev 10250)
+++ trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-08-31 19:00:35 UTC (rev 10251)
@@ -92,7 +92,6 @@
class="rich-fileupload-hidden"
id="#{clientId}:file"
name="#{clientId}:file"
- onmousedown="$('#{clientId}').component.createFrame();"
onchange="return $('#{clientId}').component.add(this);"/>
</div>
</div>
16 years, 3 months
JBoss Rich Faces SVN: r10250 - trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-08-31 14:48:37 -0400 (Sun, 31 Aug 2008)
New Revision: 10250
Modified:
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
Log:
Added methods:
- Richfaces.readAttribute
- Richfaces.writeAttribute
Modified: trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
===================================================================
--- trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2008-08-30 22:44:13 UTC (rev 10249)
+++ trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2008-08-31 18:48:37 UTC (rev 10250)
@@ -401,4 +401,33 @@
parentNode.removeChild(node);
}
}
+};
+
+Richfaces.readAttribute = function(element, name) {
+ var result = null;
+
+ var node = element.getAttributeNode(name);
+ if (node) {
+ result = node.nodeValue;
+ }
+
+ return result;
+};
+
+Richfaces.writeAttribute = function(element, name, value) {
+ var node = element.getAttributeNode(name);
+
+ if (value !== null) {
+ if (node) {
+ node.nodeValue = value;
+ } else {
+ node = document.createAttribute(name);
+ node.nodeValue = value;
+ element.setAttributeNode(node);
+ }
+ } else {
+ if (node) {
+ element.removeAttributeNode(node);
+ }
+ }
};
\ No newline at end of file
16 years, 3 months
JBoss Rich Faces SVN: r10249 - in trunk/ui/beanValidator/src/main: java/org/richfaces/taglib and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-08-30 18:44:13 -0400 (Sat, 30 Aug 2008)
New Revision: 10249
Modified:
trunk/ui/beanValidator/src/main/config/component/beanValidator.xml
trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/BeanValidatorTag.java
Log:
https://jira.jboss.org/jira/browse/RF-4082
Modified: trunk/ui/beanValidator/src/main/config/component/beanValidator.xml
===================================================================
--- trunk/ui/beanValidator/src/main/config/component/beanValidator.xml 2008-08-30 15:28:43 UTC (rev 10248)
+++ trunk/ui/beanValidator/src/main/config/component/beanValidator.xml 2008-08-30 22:44:13 UTC (rev 10249)
@@ -137,5 +137,13 @@
Summary message for a validation errors.
</description>
</property>
+ <property exist="true">
+ <name>binding</name>
+ <classname>org.richfaces.validator.FacesBeanValidator</classname>
+ <description>
+ A ValueExpression that evaluates to an instance of
+ FacesBeanValidator.
+ </description>
+ </property>
</validator>
</components>
Modified: trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/BeanValidatorTag.java
===================================================================
--- trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/BeanValidatorTag.java 2008-08-30 15:28:43 UTC (rev 10248)
+++ trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/BeanValidatorTag.java 2008-08-30 22:44:13 UTC (rev 10249)
@@ -3,11 +3,14 @@
*/
package org.richfaces.taglib;
+import javax.el.ELContext;
import javax.el.ValueExpression;
+import javax.faces.FacesException;
import javax.faces.context.FacesContext;
import javax.faces.validator.Validator;
import javax.servlet.jsp.JspException;
+import org.richfaces.validator.BeanValidator;
import org.richfaces.validator.FacesBeanValidator;
public class BeanValidatorTag extends javax.faces.webapp.ValidatorELTag {
@@ -23,7 +26,13 @@
*/
private ValueExpression _summary;
- /**
+ /**
+ * <p>The {@link javax.el.ValueExpression} that evaluates to an object that
+ * implements {@link BeanValidator}.</p>
+ */
+ private ValueExpression binding = null;
+
+ /**
* Summary message for a validation errors. Setter for summary
*
* @param summary
@@ -33,11 +42,45 @@
this._summary = __summary;
}
+ /**
+ * <p>Set the expression that will be used to create a
+ * {@link javax.el.ValueExpression} that references a backing bean property
+ * of the {@link BeanValidator} instance to be created.</p>
+ *
+ * @param binding The new expression
+ */
+ public void setBinding(ValueExpression binding) {
+ this.binding = binding;
+ }
+
protected Validator createValidator() throws JspException {
- FacesBeanValidator validator = (FacesBeanValidator) FacesContext
- .getCurrentInstance().getApplication().createValidator(
- "org.richfaces.BeanValidator");
+ ValueExpression ve = this.binding;
+
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ FacesBeanValidator validator = null;
+
+ try {
+ ELContext elContext = facesContext.getELContext();
+ if (ve != null) {
+ validator = (FacesBeanValidator) ve.getValue(elContext);
+ }
+
+ if (validator == null) {
+ validator = (FacesBeanValidator) FacesContext
+ .getCurrentInstance().getApplication().createValidator(
+ "org.richfaces.BeanValidator");
+
+ if (ve != null && validator != null) {
+ ve.setValue(elContext, validator);
+ }
+ }
+ } catch (Exception e) {
+ throw new FacesException(e);
+ }
+
_setProperties(validator);
+
return validator;
}
16 years, 3 months
JBoss Rich Faces SVN: r10248 - trunk/ui/beanValidator/src/main/java/org/richfaces/taglib.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-08-30 11:28:43 -0400 (Sat, 30 Aug 2008)
New Revision: 10248
Modified:
trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/BeanValidatorTag.java
Log:
BeanValidatorTag pretty-formatted
Modified: trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/BeanValidatorTag.java
===================================================================
--- trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/BeanValidatorTag.java 2008-08-30 10:55:43 UTC (rev 10247)
+++ trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/BeanValidatorTag.java 2008-08-30 15:28:43 UTC (rev 10248)
@@ -12,46 +12,42 @@
public class BeanValidatorTag extends javax.faces.webapp.ValidatorELTag {
-
/**
*
*/
private static final long serialVersionUID = -5230299574915210593L;
// Fields
-
- /*
- * summary
- * Summary message for a validation errors.
- */
- private ValueExpression _summary;
- /**
- * Summary message for a validation errors.
- * Setter for summary
- * @param summary - new value
- */
- public void setSummary( ValueExpression __summary ){
- this._summary = __summary;
- }
-
-
-
- protected Validator createValidator() throws JspException
- {
- FacesBeanValidator validator = (FacesBeanValidator) FacesContext.getCurrentInstance().getApplication().createValidator("org.richfaces.BeanValidator");
- _setProperties(validator);
- return validator;
- }
+ /*
+ * summary Summary message for a validation errors.
+ */
+ private ValueExpression _summary;
- // Support method to wire in properties
- private void _setProperties(FacesBeanValidator validator) throws JspException
- {
- if (_summary != null)
- {
- if (_summary instanceof ValueExpression)
- {
- validator.setSummary(_summary);
- }
- }
- }
+ /**
+ * Summary message for a validation errors. Setter for summary
+ *
+ * @param summary
+ * - new value
+ */
+ public void setSummary(ValueExpression __summary) {
+ this._summary = __summary;
+ }
+
+ protected Validator createValidator() throws JspException {
+ FacesBeanValidator validator = (FacesBeanValidator) FacesContext
+ .getCurrentInstance().getApplication().createValidator(
+ "org.richfaces.BeanValidator");
+ _setProperties(validator);
+ return validator;
+ }
+
+ // Support method to wire in properties
+ private void _setProperties(FacesBeanValidator validator)
+ throws JspException {
+ if (_summary != null) {
+ if (_summary instanceof ValueExpression) {
+ validator.setSummary(_summary);
+ }
+ }
+ }
}
16 years, 3 months
JBoss Rich Faces SVN: r10247 - Reports/3.2.2 and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-08-30 06:55:43 -0400 (Sat, 30 Aug 2008)
New Revision: 10247
Added:
trunk/test-applications/qa/Test Reports/3.2.2/ComponentsAssignment3.2.2.CR1.xls
Log:
Added: trunk/test-applications/qa/Test Reports/3.2.2/ComponentsAssignment3.2.2.CR1.xls
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/qa/Test Reports/3.2.2/ComponentsAssignment3.2.2.CR1.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 3 months