[richfaces-svn-commits] JBoss Rich Faces SVN: r17204 - root/core/trunk/impl/src/main/resources/META-INF/resources.

Author: pyaschenko Date: 2010-05-24 08:33:38 -0400 (Mon, 24 May 2010) New Revision: 17204 Modified: root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js Log: Modified: root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2010-05-24 11:23:59 UTC (rev 17203) +++ root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2010-05-24 12:33:38 UTC (rev 17204) @@ -85,8 +85,25 @@ this.queueOptions = defaultQueueOptions[id] || {}; if (this.queueOptions.queueId) { this.queueOptions = $.extend({}, (defaultQueueOptions[this.queueOptions.queueId]||{}), this.queueOptions); + } else { + // TODO: clean duplicated code + 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 = $.extend({}, (defaultQueueOptions[id]||{}), this.queueOptions); + } } - } this.event = event;