JBoss Rich Faces SVN: r16734 - root/framework/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2010-04-06 11:52:57 -0400 (Tue, 06 Apr 2010)
New Revision: 16734
Modified:
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js
Log:
typo fix
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js 2010-04-06 15:50:27 UTC (rev 16733)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js 2010-04-06 15:52:57 UTC (rev 16734)
@@ -237,7 +237,7 @@
*
* @param {string} [componentName] - component name
* @param {string} [id] - element id
- * @param {string} [prefix=RichFaces.Event.RICH_NAMESPACE] - namespace prefix or
+ * @param {string} [prefix=RichFaces.Event.RICH_NAMESPACE] - namespace prefix
* @return {string} namespace string
* */
// TODO: rename argument names
14 years, 8 months
JBoss Rich Faces SVN: r16733 - root/framework/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2010-04-06 11:50:27 -0400 (Tue, 06 Apr 2010)
New Revision: 16733
Modified:
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-base-component.js
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js
Log:
global jsdoc fixes for using 2.3.0 version
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-base-component.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-base-component.js 2010-04-06 15:39:42 UTC (rev 16732)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-base-component.js 2010-04-06 15:50:27 UTC (rev 16733)
@@ -8,7 +8,33 @@
richfaces.blankFunction = function (){}; //TODO: add it to global library
/**
- * @class Base class for all components
+ * @class Base class for all components.
+ * All RichFaces components should use this class as base or another RichFaces class which based on it.
+ *
+ <pre><code>
+ //Inheritance example:
+ (function (jQuery, richfaces, params) {
+
+ // Constructor definition
+ richfaces.MyComponent = function(componentId) {
+ $super.constructor.call(this, componentId);
+ };
+
+ // Extend component class
+ var $super = richfaces.BaseComponent.extend(richfaces.BaseComponent, richfaces.MyComponent);
+
+ // Add new properties and methods
+ jQuery.extend(richfaces.MyComponent.prototype, (function (params) {
+ return {
+ name:"MyComponent",
+ f:function (){alert("hello");
+ }
+ };
+ })(params));
+ })(jQuery, RichFaces);
+ </code></pre>
+ *
+ * @memberOf RichFaces
* @name BaseComponent
*
* @constructor
@@ -22,8 +48,8 @@
* Method extends child class prototype with parent prototype
* and return parent's prototype ($super)
*
- * @methodOf
- * @name BaseComponent.extend
+ * @function
+ * @name RichFaces.BaseComponent.extend
*
* @return {object}
* */
@@ -41,7 +67,7 @@
/**
* Component name.
*
- * @name BaseComponent#name
+ * @name RichFaces.BaseComponent#name
* @type String
* */
name: "BaseComponent",
@@ -49,8 +75,8 @@
/**
* Method for converting object to string
*
- * @methodOf
- * @name BaseComponent#toString
+ * @function
+ * @name RichFaces.BaseComponent#toString
*
* @return {String}
* */
@@ -64,10 +90,11 @@
},
/**
- * Method returns enement's id as jQuery selector
+ * Method returns element's id as jQuery selector for event handlers binding.
+ * Event API calls this method when binding by component object as selector was used.
*
- * @methodOf
- * @name BaseComponent#getEventElement
+ * @function
+ * @name RichFaces.BaseComponent#getEventElement
*
* @return {String}
* */
@@ -77,20 +104,4 @@
};
})(params));
-})(jQuery, window.RichFaces || (window.RichFaces={}));
-
-
-/*
-(function (jQuery, richfaces, params) {
-
- richfaces.MyComponent = function(componentId) {
- $super.constructor.call(this, componentId);
- };
-
- var $super = richfaces.BaseComponent.extend(richfaces.BaseComponent, richfaces.MyComponent);
-
- jQuery.extend(richfaces.MyComponent.prototype, (function (params) {
- return {name:"MyComponent", f:function (){alert("hello");}};
- })(params));
-})(jQuery, RichFaces);
-*/
\ No newline at end of file
+})(jQuery, window.RichFaces || (window.RichFaces={}));
\ No newline at end of file
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js 2010-04-06 15:39:42 UTC (rev 16732)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js 2010-04-06 15:50:27 UTC (rev 16733)
@@ -5,7 +5,10 @@
(function($, richfaces) {
/**
+ * RichFaces Event API container
* @class
+ * @memberOf RichFaces
+ * @static
* @name Event
* */
richfaces.Event = richfaces.Event || {};
@@ -27,16 +30,16 @@
$.extend(richfaces.Event, {
/**
* @constant
- * @name Event.RICH_NAMESPACE
+ * @name RichFaces.Event.RICH_NAMESPACE
* @type string
* */
RICH_NAMESPACE : "RICH:",
/**
- * Attach an event handler to execute when the DOM is fully loaded
- * @methodOf
- * @name Event.ready
- *
+ * Attach an event handler to execute when the DOM is fully loaded.
+ *
+ * @function
+ * @name RichFaces.Event.ready
* @param {function} fn - event handler
* @return {jQuery} document element wrapped by jQuery
* */
@@ -51,9 +54,9 @@
},
/**
- * Attach a handler to an event for the elements
- * @methodOf
- * @name Event.bind
+ * Attach a handler to an event for the elements.
+ * @function
+ * @name RichFaces.Event.bind
*
* @param {string|DOMElement|jQuery} selector - jQuery elements selector
* @param {string} type - one or more JavaScript event types, such as "click" or "submit," or custom event names
@@ -72,9 +75,9 @@
},
/**
- * Attach a handler to an event for the element by element id
- * @methodOf
- * @name Event.bindById
+ * Attach a handler to an event for the element by element id.
+ * @function
+ * @name RichFaces.Event.bindById
*
* @param {string} id - DOM element id
* @param {string} type - one or more JavaScript event types, such as "click" or "submit," or custom event names
@@ -93,10 +96,10 @@
},
/**
- * Attach a handler to an event for the elements
- * The handler will be called only once when event happened
- * @methodOf
- * @name Event.bindOne
+ * Attach a handler to an event for the elements.
+ * The handler will be called only once when event happened.
+ * @function
+ * @name RichFaces.Event.bindOne
*
* @param {string|DOMElement|jQuery} selector - jQuery elements selector
* @param {string} type - one or more JavaScript event types, such as "click" or "submit," or custom event names
@@ -115,10 +118,10 @@
},
/**
- * Attach a handler to an event for the element by element id
- * The handler will be called only once when event happened
- * @methodOf
- * @name Event.bindOneById
+ * Attach a handler to an event for the element by element id.
+ * The handler will be called only once when event happened.
+ * @function
+ * @name RichFaces.Event.bindOneById
*
* @param {string} id - DOM element id
* @param {string} type - one or more JavaScript event types, such as "click" or "submit," or custom event names
@@ -137,9 +140,9 @@
},
/**
- * Remove a previously-attached event handler from the elements
- * @methodOf
- * @name Event.unbind
+ * Remove a previously-attached event handler from the elements.
+ * @function
+ * @name RichFaces.Event.unbind
*
* @param {string|DOMElement|jQuery} selector - jQuery elements selector
* @param {string} [type] - one or more JavaScript event types, such as "click" or "submit," or custom event names
@@ -152,10 +155,10 @@
},
/**
- * Remove a previously-attached event handler from the elements by element id
- * The handler will be called only once when event happened
- * @methodOf
- * @name Event.unbindById
+ * Remove a previously-attached event handler from the elements by element id.
+ * The handler will be called only once when event happened.
+ * @function
+ * @name RichFaces.Event.unbindById
*
* @param {string} id - DOM element id
* @param {string} [type] - one or more JavaScript event types, such as "click" or "submit," or custom event names
@@ -168,9 +171,9 @@
},
/**
- * Execute all handlers and behaviors attached to the matched elements for the given event type
- * @methodOf
- * @name Event.fire
+ * Execute all handlers and behaviors attached to the matched elements for the given event type.
+ * @function
+ * @name RichFaces.Event.fire
*
* @param {string|DOMElement|jQuery} selector - jQuery elements selector
* @param {string} event - event name
@@ -182,9 +185,9 @@
},
/**
- * The same as the fire method, but selects element by id
- * @methodOf
- * @name Event.fireById
+ * The same as the fire method, but selects element by id.
+ * @function
+ * @name RichFaces.Event.fireById
*
* @param {string} id - DOM element id
* @param {string} event - event name
@@ -201,8 +204,8 @@
* - does not bubble up event
* - call handler only for the first founded element
* - returns whatever value that was returned by the handler
- * @methodOf
- * @name Event.callHandler
+ * @function
+ * @name RichFaces.Event.callHandler
*
* @param {string|DOMElement|jQuery} selector - jQuery elements selector
* @param {string} event - event name
@@ -214,9 +217,9 @@
},
/**
- * The same as the callHandler method, but selects element by id
- * @methodOf
- * @name Event.callHandlerById
+ * The same as the callHandler method, but selects element by id.
+ * @function
+ * @name RichFaces.Event.callHandlerById
*
* @param {string} id - DOM element id
* @param {string} event - event name
@@ -228,9 +231,9 @@
},
/**
- * Create an event namespace for the components
- * @methodOf
- * @name Event.createNamespace
+ * Create an event namespace for the components.
+ * @function
+ * @name RichFaces.Event.createNamespace
*
* @param {string} [componentName] - component name
* @param {string} [id] - element id
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2010-04-06 15:39:42 UTC (rev 16732)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2010-04-06 15:50:27 UTC (rev 16733)
@@ -1,25 +1,31 @@
+/**
+ * @author Pavel Yaschenko
+ */
+
(function(jQuery, richfaces, jsf) {
- /**
+ /**
+ * RichFaces Ajax container
* @class
+ * @memberOf RichFaces
+ * @static
* @name ajax
- *
* */
richfaces.ajax = richfaces.ajax || {};
/**
* JSF 2.0 original method that sends an asynchronous ajax request to the server
* see jsf.ajax.request method for parameter's description
- * @methodOf
- * @name ajax.request
+ * @function
+ * @name RichFaces.ajax.request
*
* */
richfaces.ajax.request = jsf.ajax.request;
/**
* RichFaces wrapper function of JSF 2.0 original method jsf.ajax.request
- * @methodOf
- * @name jsf_ajax.request
+ * @function
+ * @name jsf.ajax.request
*
* @param {string|DOMElement} source - The DOM element or an id that triggered this ajax request
* @param {object} [event] - The DOM event that triggered this ajax request
@@ -35,7 +41,10 @@
var defaultQueueOptions = {mode: QUEUE_MODE_PULL, requestDelay:0};
/**
+ * RichFaces Queue API container
* @class
+ * @memberOf RichFaces
+ * @static
* @name queue
* */
richfaces.queue = function(opts){
@@ -207,8 +216,8 @@
/**
* Get current queue size
- * @methodOf
- * @name queue.getSize
+ * @function
+ * @name RichFaces.queue.getSize
*
* @return {number} size of items in the queue
* */
@@ -216,8 +225,8 @@
/**
* Check if queue is empty
- * @methodOf
- * @name queue.isEmpty
+ * @function
+ * @name RichFaces.queue.isEmpty
*
* @return {boolean} returns true if queue is empty
* */
@@ -225,15 +234,15 @@
/**
* Extract and submit first QueueEntry in the queue if QueueEntry is ready to submit
- * @methodOf
- * @name queue.submitFirst
+ * @function
+ * @name RichFaces.queue.submitFirst
* */
submitFirst: submitFirst,
/**
* Create and push QueueEntry to the queue for ajax requests
- * @methodOf
- * @name queue.push
+ * @function
+ * @name RichFaces.queue.push
*
* @param {string|DOMElement} source - The DOM element or an id that triggered this ajax request
* @param {object} [event] - The DOM event that triggered this ajax request
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js 2010-04-06 15:39:42 UTC (rev 16732)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js 2010-04-06 15:50:27 UTC (rev 16733)
@@ -1,9 +1,10 @@
/**
* Global object container for RichFaces API.
- * All classes should be defined here
+ * All classes should be defined here.
* @class
* @name RichFaces
+ * @static
*
* */
window.RichFaces = {};
14 years, 8 months
JBoss Rich Faces SVN: r16732 - root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-04-06 11:39:42 -0400 (Tue, 06 Apr 2010)
New Revision: 16732
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java
Log:
Fixed checkstyle violation in generator
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java 2010-04-06 15:37:22 UTC (rev 16731)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java 2010-04-06 15:39:42 UTC (rev 16732)
@@ -10,7 +10,6 @@
import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.ConverterModel;
import org.richfaces.cdk.model.DescriptionGroup;
-import org.richfaces.cdk.model.FacetModel;
import org.richfaces.cdk.model.ModelElementBase;
import org.richfaces.cdk.model.TagModel;
import org.richfaces.cdk.model.ValidatorModel;
14 years, 8 months
JBoss Rich Faces SVN: r16731 - branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-04-06 11:37:22 -0400 (Tue, 06 Apr 2010)
New Revision: 16731
Modified:
branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
Log:
Fix RF-8562
Modified: branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
===================================================================
--- branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2010-04-06 15:35:53 UTC (rev 16730)
+++ branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2010-04-06 15:37:22 UTC (rev 16731)
@@ -871,8 +871,10 @@
HttpServletResponse httpResponse = (HttpServletResponse) response;
// httpResponse.setHeader(AjaxContainerRenderer.AJAX_UPDATE_HEADER,
// senderString.toString());
- httpResponse.setHeader(AjaxContainerRenderer.AJAX_FLAG_HEADER,
- "true");
+ if(!httpResponse.containsHeader(AjaxContainerRenderer.AJAX_FLAG_HEADER)){
+ httpResponse.setHeader(AjaxContainerRenderer.AJAX_FLAG_HEADER,
+ "true");
+ }
} else {
try {
Method setHeadergMethod = response.getClass()
14 years, 8 months
JBoss Rich Faces SVN: r16729 - branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-04-06 11:28:15 -0400 (Tue, 06 Apr 2010)
New Revision: 16729
Modified:
branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/component/UIRangedNumberInput.java
Log:
Fix RF-8463
Modified: branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/component/UIRangedNumberInput.java
===================================================================
--- branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/component/UIRangedNumberInput.java 2010-04-06 15:23:49 UTC (rev 16728)
+++ branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/component/UIRangedNumberInput.java 2010-04-06 15:28:15 UTC (rev 16729)
@@ -35,6 +35,11 @@
*/
public abstract class UIRangedNumberInput extends UIInput {
+ private static final String MSG_MAXMIN_IS_NULL = "org.richfaces.component.UIRangedNumberInput.MaxMinIsNull";
+ private static final String MSG_VALUE_IS_NULL = "org.richfaces.component.UIRangedNumberInput.ValueIsNull";
+ private static final String MSG_LT_MINIMAL = "org.richfaces.component.UIRangedNumberInput.LessThatMinimal";
+ private static final String MSG_GT_MAXIMAL = "org.richfaces.component.UIRangedNumberInput.GreaterThanMaximal";
+
public abstract String getMaxValue();
public abstract void setMaxValue(String value);
@@ -68,29 +73,30 @@
context.addMessage(this.getClientId(context), mess);
}
- if (value != null) {
- if (null == minValue || null == maxValue) {
- setValid(false);
- FacesMessage mess = new FacesMessage(label + ": conversation error, maxValue or minValue is null!");
- mess.setSeverity(FacesMessage.SEVERITY_ERROR);
- context.addMessage(this.getClientId(context), mess);
- } else if (minValue.doubleValue() > value.doubleValue()) {
- setValid(false);
- FacesMessage mess = new FacesMessage(label + ": input value is less than minimal value!");
- mess.setSeverity(FacesMessage.SEVERITY_ERROR);
- context.addMessage(this.getClientId(context), mess);
- } else if (maxValue.doubleValue() < value.doubleValue()) {
- setValid(false);
- FacesMessage mess = new FacesMessage(label + ": input value is more than maximum value!");
- mess.setSeverity(FacesMessage.SEVERITY_ERROR);
- context.addMessage(this.getClientId(context), mess);
- }
- } else {
- setValid(false);
- FacesMessage mess = new FacesMessage(label + ": input value can't be null!");
- mess.setSeverity(FacesMessage.SEVERITY_ERROR);
- context.addMessage(this.getClientId(context), mess);
- }
+ if (value != null) {
+ if (null == minValue || null == maxValue) {
+ setValid(false);
+ FacesMessage mess = ComponentMessageUtil.getMessage(context, (MSG_MAXMIN_IS_NULL), new Object[] { label });
+ mess.setSeverity(FacesMessage.SEVERITY_ERROR);
+ context.addMessage(this.getClientId(context), mess);
+ } else if (minValue.doubleValue() > value.doubleValue()) {
+ setValid(false);
+ FacesMessage mess = ComponentMessageUtil.getMessage(context, (MSG_LT_MINIMAL), new Object[] { label });
+ mess.setSeverity(FacesMessage.SEVERITY_ERROR);
+ context.addMessage(this.getClientId(context), mess);
+ } else if (maxValue.doubleValue() < value.doubleValue()) {
+ setValid(false);
+ FacesMessage mess = ComponentMessageUtil.getMessage(context, (MSG_GT_MAXIMAL), new Object[] { label });
+ mess.setSeverity(FacesMessage.SEVERITY_ERROR);
+ context.addMessage(this.getClientId(context), mess);
+ }
+ } else {
+ setValid(false);
+ FacesMessage mess = ComponentMessageUtil.getMessage(context, (MSG_VALUE_IS_NULL), new Object[] { label });
+ mess.setSeverity(FacesMessage.SEVERITY_ERROR);
+ context.addMessage(this.getClientId(context), mess);
+ }
+
}
super.validateValue(context, newValue);
14 years, 8 months
JBoss Rich Faces SVN: r16728 - branches/community/3.3.X/ui/colorPicker/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-04-06 11:23:49 -0400 (Tue, 06 Apr 2010)
New Revision: 16728
Modified:
branches/community/3.3.X/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx
Log:
Fix RF-8491
Modified: branches/community/3.3.X/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx
===================================================================
--- branches/community/3.3.X/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2010-04-06 15:20:31 UTC (rev 16727)
+++ branches/community/3.3.X/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2010-04-06 15:23:49 UTC (rev 16728)
@@ -30,7 +30,7 @@
<f:call name="initButtonLabels" />
<span id="#{clientId}" class="rich-color-picker-span" x:passThruWithExclusions="value,name,type,id,styleClass,class,style">
- <input readonly="readonly" type="text" name="#{clientId}" value="#{value}" size="#{component.attributes['inputSize']}"/>
+ <input class="rich-color-picker-input" readonly="readonly" type="text" name="#{clientId}" value="#{value}" size="#{component.attributes['inputSize']}"/>
<jsp:scriptlet><![CDATA[
if(component.getFacet("icon")!=null && component.getFacet("icon").isRendered()) {
]]></jsp:scriptlet>
14 years, 8 months
JBoss Rich Faces SVN: r16727 - branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-04-06 11:20:31 -0400 (Tue, 06 Apr 2010)
New Revision: 16727
Modified:
branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Image.java
Log:
Fix RF-8560
Modified: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Image.java
===================================================================
--- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Image.java 2010-04-06 13:44:28 UTC (rev 16726)
+++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Image.java 2010-04-06 15:20:31 UTC (rev 16727)
@@ -506,7 +506,7 @@
return true;
}
- if (obj == null || getClass() != obj.getClass()) {
+ if (obj == null) {
return false;
}
14 years, 8 months
JBoss Rich Faces SVN: r16726 - root/framework/trunk/impl/src/main/java/org/richfaces/context.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-04-06 09:44:28 -0400 (Tue, 06 Apr 2010)
New Revision: 16726
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/context/PartialViewContextImpl.java
Log:
PartialViewContextImpl not decoded view when execute="@all" - fixed
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/context/PartialViewContextImpl.java
===================================================================
--- root/framework/trunk/impl/src/main/java/org/richfaces/context/PartialViewContextImpl.java 2010-04-06 11:40:45 UTC (rev 16725)
+++ root/framework/trunk/impl/src/main/java/org/richfaces/context/PartialViewContextImpl.java 2010-04-06 13:44:28 UTC (rev 16726)
@@ -97,6 +97,7 @@
if (executeIds == null) {
executeIds = new LinkedHashSet<String>();
+ setupExecuteIds(executeIds);
}
return executeIds;
@@ -192,10 +193,6 @@
Collection<String> executeIds = pvc.getExecuteIds();
Collection<String> renderIds = pvc.getRenderIds();
- if (phaseId == PhaseId.APPLY_REQUEST_VALUES) {
- setupExecuteIds(executeIds);
- }
-
if (phaseId == PhaseId.APPLY_REQUEST_VALUES
|| phaseId == PhaseId.PROCESS_VALIDATIONS
|| phaseId == PhaseId.UPDATE_MODEL_VALUES) {
14 years, 8 months
JBoss Rich Faces SVN: r16725 - root/examples-sandbox/trunk/components/tables/src/main/webapp.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-04-06 07:40:45 -0400 (Tue, 06 Apr 2010)
New Revision: 16725
Modified:
root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml
Log:
RF-7852 ExtendedDataTable sample
Modified: root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml
===================================================================
--- root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml 2010-04-06 11:27:37 UTC (rev 16724)
+++ root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml 2010-04-06 11:40:45 UTC (rev 16725)
@@ -60,12 +60,12 @@
//-->
</script>
<input id="js_api_id_input" type="text" value="form1:extendedDataTable" />
- <input id="js_api_function_string_input" type="text" value="filter('column_name', 'gate')" size="60"/>
+ <input id="js_api_function_string_input" type="text" value="sort('column_title')" size="60"/>
<input type="button" value="Run" onclick="invokeJSAPI()" />
<input id="js_api_result" type="text" readonly="readonly" size="60"/>
<rich:extendedDataTable id="extendedDataTable" clientRows="40" rows="100" frozenColumns="2"
value="#{dataBean.state ? dataBean.employeeList : null}" var="record" noDataLabel="There isn't data."
- styleClass="extendedDataTable" rowKeyVar="rkv" filterVar="fv">
+ styleClass="extendedDataTable" rowKeyVar="rkv" filterVar="fv" sortMode="multi">
<f:facet name="header">
<h:outputText value="Current date: #{dataBean.date}"/>
</f:facet>
@@ -84,7 +84,7 @@
<h:outputText value="index"/>
</f:facet>
</rich:column>
- <rich:column id="column_name" filterExpression="#{fn:containsIgnoreCase(record.name, fv)}" >
+ <rich:column id="column_name" filterExpression="#{fn:containsIgnoreCase(record.name, fv)}" sortBy="#{record.name}">
<f:facet name="header">
<h:outputText id="columnHeader1" value="Column Header Facet"/>
</f:facet>
@@ -94,7 +94,7 @@
</f:facet>
</rich:column>
- <rich:column id="column_title" width="200px">
+ <rich:column id="column_title" width="200px" sortBy="#{record.title}">
<h:outputText value="#{record.title}" />
<f:facet name="footer">
<h:outputText id="columnFooter2" value="Column Footer Facet2"/>
14 years, 8 months