Author: konstantin.mishin Date: 2011-02-07 15:17:53 -0500 (Mon, 07 Feb 2011) New Revision: 21523 Modified: trunk/core/impl/src/main/resources/META-INF/resources/richfaces-queue.js trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js Log: RF-10367 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-07 18:05:06 UTC (rev 21522) +++ trunk/core/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2011-02-07 20:17:53 UTC (rev 21523) @@ -37,6 +37,11 @@ richfaces.ajax.jsfResponse = jsf.ajax.response; + richfaces.ajax.isIgnoreResponse = function() { + return richfaces.queue.isIgnoreResponse(); + }; + + jsf.ajax.response = function(request, context) { richfaces.queue.response(request, context); }; @@ -388,15 +393,19 @@ }, response: function (request, context) { - var lastEntry = getLastEntry(); - if (!lastEntry || !lastRequestedEntry.isIgnoreDupResponses() || lastRequestedEntry.getRequestGroupId() != lastEntry.getRequestGroupId()) { - richfaces.ajax.jsfResponse(request, context); - } else { + if (this.isIgnoreResponse()) { lastRequestedEntry = null; submitFirstEntry(); + } else { + richfaces.ajax.jsfResponse(request, context); } }, + isIgnoreResponse: function () { + var lastEntry = getLastEntry(); + return lastEntry && lastRequestedEntry.isIgnoreDupResponses() && lastRequestedEntry.getRequestGroupId() == lastEntry.getRequestGroupId(); + }, + /** * Remove all QueueEntry from the queue * @function 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-07 18:05:06 UTC (rev 21522) +++ trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js 2011-02-07 20:17:53 UTC (rev 21523) @@ -408,6 +408,8 @@ ignoreSuccess = true; } else if (ignoreSuccess) { return; + } else if (status == 'complete' && richfaces.ajax.isIgnoreResponse && richfaces.ajax.isIgnoreResponse()) { + return; } var typeHandlers = jsfEventsAdapterEventNames[type];