Author: nbelaevski Date: 2011-02-08 18:23:53 -0500 (Tue, 08 Feb 2011) New Revision: 21553 Modified: trunk/core/impl/src/main/resources/META-INF/resources/richfaces-queue.js trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js trunk/core/impl/src/test/resources/javascript/richfaces-queue-qunit-request.js Log: https://issues.jboss.org/browse/RF-10365 Modified: trunk/core/impl/src/main/resources/META-INF/resources/richfaces-queue.js =================================================================== --- trunk/core/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2011-02-08 22:55:55 UTC (rev 21552) +++ trunk/core/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2011-02-08 23:23:53 UTC (rev 21553) @@ -9,18 +9,22 @@ * @class * @memberOf RichFaces * @static - * @name ajax + * @name ajaxContainer * */ - richfaces.ajax = richfaces.ajax || {}; + richfaces.ajaxContainer = richfaces.ajaxContainer || {}; + if (richfaces.ajaxContainer.jsfRequest) { + return; + } + /** * JSF 2.0 original method that sends an asynchronous ajax request to the server * see jsf.ajax.request method for parameter's description * @function - * @name RichFaces.ajax.jsfRequest + * @name RichFaces.ajaxContainer.jsfRequest * * */ - richfaces.ajax.jsfRequest = jsf.ajax.request; + richfaces.ajaxContainer.jsfRequest = jsf.ajax.request; /** * RichFaces wrapper function of JSF 2.0 original method jsf.ajax.request @@ -35,9 +39,9 @@ richfaces.queue.push(source, event, options); }; - richfaces.ajax.jsfResponse = jsf.ajax.response; + richfaces.ajaxContainer.jsfResponse = jsf.ajax.response; - richfaces.ajax.isIgnoreResponse = function() { + richfaces.ajaxContainer.isIgnoreResponse = function() { return richfaces.queue.isIgnoreResponse(); }; @@ -257,7 +261,7 @@ log.debug("richfaces.queue: will submit request NOW"); var o = lastRequestedEntry.options; o["AJAX:EVENTS_COUNT"] = lastRequestedEntry.eventsCount; - richfaces.ajax.jsfRequest(lastRequestedEntry.source, lastRequestedEntry.event, o); + richfaces.ajaxContainer.jsfRequest(lastRequestedEntry.source, lastRequestedEntry.event, o); // call event handlers if (o.queueonsubmit) { @@ -285,7 +289,7 @@ }; var callEventHandler = function (handlerName, entry) { - handler = entry.queueOptions[handlerName]; + var handler = entry.queueOptions[handlerName]; if (handler) { // what is a context should be?? handler.call(null, entry); @@ -397,7 +401,7 @@ lastRequestedEntry = null; submitFirstEntry(); } else { - richfaces.ajax.jsfResponse(request, context); + richfaces.ajaxContainer.jsfResponse(request, context); } }, Modified: trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js =================================================================== --- trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js 2011-02-08 22:55:55 UTC (rev 21552) +++ trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js 2011-02-08 23:23:53 UTC (rev 21553) @@ -408,7 +408,7 @@ ignoreSuccess = true; } else if (ignoreSuccess) { return; - } else if (status == 'complete' && richfaces.ajax.isIgnoreResponse && richfaces.ajax.isIgnoreResponse()) { + } else if (status == 'complete' && richfaces.ajaxContainer.isIgnoreResponse && richfaces.ajaxContainer.isIgnoreResponse()) { return; } Modified: trunk/core/impl/src/test/resources/javascript/richfaces-queue-qunit-request.js =================================================================== --- trunk/core/impl/src/test/resources/javascript/richfaces-queue-qunit-request.js 2011-02-08 22:55:55 UTC (rev 21552) +++ trunk/core/impl/src/test/resources/javascript/richfaces-queue-qunit-request.js 2011-02-08 23:23:53 UTC (rev 21553) @@ -9,7 +9,7 @@ // reference to original jsf.ajax.request function test("Reference to origional jsf.ajax.request function", function() { expect(1); - equals(RichFaces.ajax.jsfRequest, jsf_ajax_request); + equals(RichFaces.ajaxContainer.jsfRequest, jsf_ajax_request); }); // default queue id @@ -66,7 +66,7 @@ test("jsf.ajax.request - parameters", function() { expect(5); - RichFaces.ajax.jsfRequest = function (source, event, options) { + RichFaces.ajaxContainer.jsfRequest = function (source, event, options) { for (var i=0; i<jsf.ajax.eventHandlers.length;i++) { jsf.ajax.eventHandlers[i]({type:"event", status:"success"}); } @@ -91,7 +91,7 @@ test("jsf.ajax.request - queueId", function() { expect(3); - RichFaces.ajax.jsfRequest = function (source, event, options) { + RichFaces.ajaxContainer.jsfRequest = function (source, event, options) { for (var i=0; i<jsf.ajax.eventHandlers.length;i++) { jsf.ajax.eventHandlers[i]({type:"event", status:"success"}); } @@ -116,7 +116,7 @@ test("jsf.ajax.request - 2 x queueId", function() { expect(3); - RichFaces.ajax.jsfRequest = function (source, event, options) { + RichFaces.ajaxContainer.jsfRequest = function (source, event, options) { for (var i=0; i<jsf.ajax.eventHandlers.length;i++) { jsf.ajax.eventHandlers[i]({type:"event", status:"success"}); } @@ -158,7 +158,7 @@ RichFaces.queue.clear(); } } - RichFaces.ajax.jsfRequest = function (source, event, options) { + RichFaces.ajaxContainer.jsfRequest = function (source, event, options) { for (var i=0; i<jsf.ajax.eventHandlers.length;i++) { jsf.ajax.eventHandlers[i]({type:"event", status:"success"}); } @@ -202,7 +202,7 @@ RichFaces.queue.clear(); } } - RichFaces.ajax.jsfRequest = function (source, event, options) { + RichFaces.ajaxContainer.jsfRequest = function (source, event, options) { for (var i=0; i<jsf.ajax.eventHandlers.length;i++) { jsf.ajax.eventHandlers[i]({type:"event", status:"success"}); } @@ -256,7 +256,7 @@ RichFaces.queue.clear(); } } - RichFaces.ajax.jsfRequest = function (source, event, options) { + RichFaces.ajaxContainer.jsfRequest = function (source, event, options) { for (var i=0; i<jsf.ajax.eventHandlers.length;i++) { jsf.ajax.eventHandlers[i]({type:"event", status:"success"}); }