Author: pyaschenko
Date: 2010-05-05 11:40:30 -0400 (Wed, 05 May 2010)
New Revision: 16897
Modified:
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js
Log:
queue options changes
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-05-05
15:07:26 UTC (rev 16896)
+++
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js 2010-05-05
15:40:30 UTC (rev 16897)
@@ -480,12 +480,18 @@
}
}());
- richfaces.ajax = function(source, event, parameters, queueId) {
+ richfaces.ajax = function(source, event, options) {
+ var sourceId = (typeof source == 'object' && source.id) ? source.id :
source;
- var sourceId = (typeof source == 'object' && source.id) ? source.id :
source;
- var options = (richfaces.queue) ? richfaces.queue.getQueueOptions(queueId || sourceId)
: {};
+ options = options || {};
+ if (richfaces.queue) {
+ var queueOptions = richfaces.queue.getQueueOptions(options.queueId || sourceId);
+ var saveQueueId = queueOptions.queueId;
+ options = jQuery.extend({}, queueOptions, options);
+ options.queueId = saveQueueId;
+ }
- //parameters = options.parameters || {}; // TODO: change "parameters" to
"richfaces.ajax.params"
+ parameters = options.parameters || {}; // TODO: change "parameters" to
"richfaces.ajax.params"
parameters.execute = "@component";
parameters.render = "@component";