Author: pyaschenko Date: 2010-04-29 10:11:41 -0400 (Thu, 29 Apr 2010) New Revision: 16844 Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js Log: queue form search was added 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-04-29 13:56:40 UTC (rev 16843) +++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2010-04-29 14:11:41 UTC (rev 16844) @@ -2,7 +2,7 @@ * @author Pavel Yaschenko */ -(function(jQuery, richfaces, jsf) { +(function($, richfaces, jsf) { /** * RichFaces Ajax container @@ -58,14 +58,31 @@ this.source = source; this.options = options || {}; this.queueOptions = {} + var id; + + // find default options for QueueEntry if (options.hasOwnProperty("queueId")) { if (defaultQueueOptions[options.queueId]) { - this.queueOptions = defaultQueueOptions[options.queueId]; + id = options.queueId; } } else { - // TODO: find form options or use view options - this.queueOptions = defaultQueueOptions[DEFAULT_QUEUE_ID]; + var element = richfaces.getDomElement(source); + var form; + if (element) { + element = $(element).closest("form"); + if (element.length>0) { + form = element.get(0); + } + } + if (form && form.id && defaultQueueOptions[form.id]) { + id = form.id; + } else { + id = DEFAULT_QUEUE_ID; + } } + if (id) { + this.queueOptions = defaultQueueOptions[id]; + } this.event = event; //similarityGroupingId is mutable, thus we need special field for it @@ -73,7 +90,7 @@ this.eventsCount = 1; }; - jQuery.extend(QueueEntry.prototype, { + $.extend(QueueEntry.prototype, { isIgnoreDupResponses: function() { return this.options.ignoreDupResponses;