Author: pyaschenko
Date: 2010-02-03 12:19:10 -0500 (Wed, 03 Feb 2010)
New Revision: 16405
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.js
Log:
https://jira.jboss.org/jira/browse/RF-8337
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-02-03
15:47:16 UTC (rev 16404)
+++
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2010-02-03
17:19:10 UTC (rev 16405)
@@ -149,10 +149,10 @@
log.debug("richfaces.queue: will submit request NOW");
//TODO: events counter should be submitted
//lastRequestedEntry.source.appendParameter("AJAX:EVENTS_COUNT",
lastRequestedEntry.eventsCount);
- var params = richfaces.processRequestParams(lastRequestedEntry.source,
lastRequestedEntry.options);
+ //var params = richfaces.processRequestParams(lastRequestedEntry.source,
lastRequestedEntry.options);
//TODO: copy of event should be created otherwise IE will fail
//richfaces.ajax.request = jsf.ajax.request
- richfaces.ajax.request(lastRequestedEntry.source, lastRequestedEntry.event, params);
+ richfaces.ajax.request(lastRequestedEntry.source, lastRequestedEntry.event,
lastRequestedEntry.options);
if (lastRequestedEntry.options.queueonsubmit) {
lastRequestedEntry.options.queueonsubmit.call(lastRequestedEntry);
}
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-02-03
15:47:16 UTC (rev 16404)
+++
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js 2010-02-03
17:19:10 UTC (rev 16405)
@@ -439,8 +439,8 @@
}
}());
- // TODO:
- richfaces.processRequestParams = function(source, options) {
+ richfaces.ajax = function(source, event, options) {
+
options = options || {};
var sourceId = (typeof source == 'object' && source.id) ? source.id :
source;
@@ -488,62 +488,7 @@
parameters['onerror'] = eventsAdapter;
}
- return parameters;
- };
-
- richfaces.ajax = function(source, event, options) {
-
- jsf.ajax.request(source, event, options);
-
- /*options = options || {};
- var sourceId = (typeof source == 'object' && source.id) ? source.id :
source;
-
- parameters = options.parameters || {};
- parameters.execute = "@component";
- parameters.render = "@component";
-
- if (!parameters["org.richfaces.ajax.component"]) {
- parameters["org.richfaces.ajax.component"] = sourceId;
- }
-
- var eventHandlers;
-
- for (var eventName in AJAX_EVENTS) {
- var handler = createEventHandler(options[eventName]);
-
- var serverHandler = AJAX_EVENTS[eventName];
- if (serverHandler) {
- handler = curry(serverHandler, handler);
- }
-
- if (handler) {
- eventHandlers = eventHandlers || {};
- eventHandlers[eventName] = handler;
- }
- }
-
- if (options.status) {
- var namedStatusEventHandler = function() {
setGlobalStatusNameVariable(options.status); };
-
- //TODO add support for options.submit
- eventHandlers = eventHandlers || {};
- if (eventHandlers.begin) {
- eventHandlers.begin = chain(namedStatusEventHandler, eventHandlers.begin);
- } else {
- eventHandlers.begin = namedStatusEventHandler;
- }
- }
-
- parameters[sourceId] = sourceId;
-
- if (eventHandlers) {
- var eventsAdapter = richfaces.createJSFEventsAdapter(eventHandlers);
- parameters['onevent'] = eventsAdapter;
- parameters['onerror'] = eventsAdapter;
- }
-
jsf.ajax.request(source, event, parameters);
- */
};
var RICHFACES_AJAX_STATUS = "richfaces:ajaxStatus";