Author: dmorozov Date: 2008-11-18 10:44:24 -0500 (Tue, 18 Nov 2008) New Revision: 11220 Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js Log: https://jira.jboss.org/jira/browse/RF-4899 Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js =================================================================== --- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-11-18 15:13:49 UTC (rev 11219) +++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-11-18 15:44:24 UTC (rev 11220) @@ -777,6 +777,20 @@ } else if(typeof(A4J.AJAX.onError)== "function"){ req._onerror = A4J.AJAX.onError; } + + var _queueonerror = options.queueonerror; + if (_queueonerror) { + var _onerror = req._onerror; + if (_onerror) { + req._onerror = function() { + _queueonerror.call(arguments); + _onerror.call(arguments); + }; + } else { + req._onerror = _queueonerror; + } + } + req.onfinish = A4J.AJAX.finishRequest; LOG.debug("NEW AJAX REQUEST !!! with form: " + (form.id || form.name || form)); Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js =================================================================== --- trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-11-18 15:13:49 UTC (rev 11219) +++ trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-11-18 15:44:24 UTC (rev 11220) @@ -413,10 +413,12 @@ submit: function() { this.query.appendParameter("AJAX:EVENTS_COUNT", this.eventsCount); var request = A4J.AJAX.SubmitQuery(this.query, this.options) - request.queue = this.queue; + var queue = this.queue; + request.queue = queue; + if (this.options.queueonsubmit) { - this.options.queueonsubmit.call(this.queue, request); + this.options.queueonsubmit.call(queue, request); } return request;