[richfaces-svn-commits] JBoss Rich Faces SVN: r21040 - in trunk: ui/core/ui/src/main/java/org/richfaces/renderkit/html and 1 other directories.

Author: konstantin.mishin Date: 2011-01-14 14:38:59 -0500 (Fri, 14 Jan 2011) New Revision: 21040 Added: trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/status.js Modified: trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java Log: RF-7821 Modified: trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js =================================================================== --- trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js 2011-01-14 19:09:58 UTC (rev 21039) +++ trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js 2011-01-14 19:38:59 UTC (rev 21040) @@ -398,7 +398,7 @@ }; }; - var setGlobalStatusNameVariable = function(statusName) { + richfaces.setGlobalStatusNameVariable = function(statusName) { //TODO: parallel requests if (statusName) { richfaces['statusName'] = statusName; @@ -413,10 +413,6 @@ } }; - var getGlobalStatusNameVariable = function() { - return richfaces.statusName; - } - var chain = function() { var functions = arguments; if (functions.length == 1) { @@ -518,7 +514,7 @@ } if (options.status) { - var namedStatusEventHandler = function() { setGlobalStatusNameVariable(options.status); }; + var namedStatusEventHandler = function() { richfaces.setGlobalStatusNameVariable(options.status); }; //TODO add support for options.submit eventHandlers = eventHandlers || {}; @@ -546,159 +542,7 @@ jsf.ajax.request(source, event, parameters); }; - var RICHFACES_AJAX_STATUS = "richfaces:ajaxStatus"; - var getStatusDataAttributeName = function(statusName) { - return statusName ? (RICHFACES_AJAX_STATUS + "@" + statusName) : RICHFACES_AJAX_STATUS; - }; - - var statusAjaxEventHandler = function(data, methodName) { - if (methodName) { - //global status name - var statusName = getGlobalStatusNameVariable(); - var source = data.source; - - var statusApplied = false; - var statusDataAttribute = getStatusDataAttributeName(statusName); - - var statusContainers; - if (statusName) { - statusContainers = [jQuery(document)]; - } else { - statusContainers = [jQuery(source).parents('form'), jQuery(document)]; - } - - for (var containerIdx = 0; containerIdx < statusContainers.length && !statusApplied; - containerIdx++) { - - var statusContainer = statusContainers[containerIdx]; - var statuses = statusContainer.data(statusDataAttribute); - if (statuses) { - for (var statusId in statuses) { - var status = statuses[statusId]; - var result = status[methodName].apply(status, arguments); - if (result) { - statusApplied = true; - } else { - delete statuses[statusId]; - } - } - - if (!statusApplied) { - statusContainer.removeData(statusDataAttribute); - } - } - } - } - }; - - var initializeStatuses = function() { - var thisFunction = arguments.callee; - if (!thisFunction.initialized) { - thisFunction.initialized = true; - - var jsfEventsListener = richfaces.createJSFEventsAdapter({ - begin: function(event) { statusAjaxEventHandler(event, 'start'); }, - error: function(event) { statusAjaxEventHandler(event, 'error'); }, - success: function(event) { statusAjaxEventHandler(event, 'success'); }, - complete: function() { setGlobalStatusNameVariable(null); } - }); - - jsf.ajax.addOnEvent(jsfEventsListener); - //TODO blocks default alert error handler - jsf.ajax.addOnError(jsfEventsListener); - } - }; - - richfaces.status = function(statusId, options) { - this.statusId = statusId; - this.options = options || {}; - this.register(); - }; - - jQuery.extend(richfaces.status.prototype, (function() { - //TODO - support for parallel requests - - var getElement = function() { - var elt = document.getElementById(this.statusId); - return elt ? jQuery(elt) : null; - }; - - var showHide = function(selector) { - var element = getElement.call(this); - if (element) { - var statusElts = element.children(); - statusElts.each(function() { - var t = jQuery(this); - t.css('display', t.is(selector) ? '': 'none'); - }); - - return true; - } - - return false; - }; - - return { - register: function() { - initializeStatuses(); - - var statusName = this.options.statusName; - var dataStatusAttribute = getStatusDataAttributeName(statusName); - - var container; - if (statusName) { - container = jQuery(document); - } else { - container = getElement.call(this).parents('form'); - if (container.length == 0) { - container = jQuery(document); - }; - } - - var statuses = container.data(dataStatusAttribute); - if (!statuses) { - statuses = {}; - container.data(dataStatusAttribute, statuses); - } - - statuses[this.statusId] = this; - }, - - start: function() { - if (this.options.onstart) { - this.options.onstart.apply(this, arguments); - } - - return showHide.call(this, '.rich-status-start'); - }, - - stop: function() { - if (this.options.onstop) { - this.options.onstop.apply(this, arguments); - } - }, - - success: function() { - if (this.options.onsuccess) { - this.options.onsuccess.apply(this, arguments); - } - this.stop(); - - return showHide.call(this, '.rich-status-stop'); - }, - - error: function() { - if (this.options.onerror) { - this.options.onerror.apply(this, arguments); - } - this.stop(); - - return showHide.call(this, ':not(.rich-status-error) + .rich-status-stop, .rich-status-error'); - } - }; - }())); - //keys codes richfaces.KEYS = { BACKSPACE: 8, Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java 2011-01-14 19:09:58 UTC (rev 21039) +++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java 2011-01-14 19:38:59 UTC (rev 21040) @@ -28,6 +28,7 @@ import java.util.HashMap; import java.util.Map; +import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -45,7 +46,9 @@ /** * @author Nick Belaevski */ -@ResourceDependency(library = "org.richfaces", name = "ajax.reslib") +@ResourceDependencies({@ResourceDependency(library = "org.richfaces", name = "ajax.reslib"), + @ResourceDependency(library = "org.richfaces", name = "base-component.reslib"), + @ResourceDependency(library = "org.richfaces", name = "status.js")}) @JsfRenderer(type = "org.richfaces.StatusRenderer", family = AbstractAjaxStatus.COMPONENT_FAMILY) public class AjaxStatusRenderer extends RendererBase { @@ -189,7 +192,7 @@ writer.startElement(HtmlConstants.SCRIPT_ELEM, component); writer.writeAttribute(HtmlConstants.TYPE_ATTR, HtmlConstants.TEXT_JAVASCRIPT_TYPE, null); - JSFunction statusConstructor = new JSFunction("new RichFaces.status", + JSFunction statusConstructor = new JSFunction("new RichFaces.ui.Status", clientId); Map<String, Object> options = new HashMap<String, Object>(); Added: trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/status.js =================================================================== --- trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/status.js (rev 0) +++ trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/status.js 2011-01-14 19:38:59 UTC (rev 21040) @@ -0,0 +1,177 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +(function(richfaces, jQuery) { + + var getGlobalStatusNameVariable = function() { + return richfaces.statusName; + } + + var RICHFACES_AJAX_STATUS = "richfaces:ajaxStatus"; + + var getStatusDataAttributeName = function(statusName) { + return statusName ? (RICHFACES_AJAX_STATUS + "@" + statusName) : RICHFACES_AJAX_STATUS; + }; + + var statusAjaxEventHandler = function(data, methodName) { + if (methodName) { + //global status name + var statusName = getGlobalStatusNameVariable(); + var source = data.source; + + var statusApplied = false; + var statusDataAttribute = getStatusDataAttributeName(statusName); + + var statusContainers; + if (statusName) { + statusContainers = [jQuery(document)]; + } else { + statusContainers = [jQuery(source).parents('form'), jQuery(document)]; + } + + for (var containerIdx = 0; containerIdx < statusContainers.length && !statusApplied; + containerIdx++) { + + var statusContainer = statusContainers[containerIdx]; + var statuses = statusContainer.data(statusDataAttribute); + if (statuses) { + for (var statusId in statuses) { + var status = statuses[statusId]; + var result = status[methodName].apply(status, arguments); + if (result) { + statusApplied = true; + } else { + delete statuses[statusId]; + } + } + + if (!statusApplied) { + statusContainer.removeData(statusDataAttribute); + } + } + } + } + }; + + var initializeStatuses = function() { + var thisFunction = arguments.callee; + if (!thisFunction.initialized) { + thisFunction.initialized = true; + + var jsfEventsListener = richfaces.createJSFEventsAdapter({ + begin: function(event) { statusAjaxEventHandler(event, 'start'); }, + error: function(event) { statusAjaxEventHandler(event, 'error'); }, + success: function(event) { statusAjaxEventHandler(event, 'success'); }, + complete: function() { richfaces.setGlobalStatusNameVariable(null); } + }); + + jsf.ajax.addOnEvent(jsfEventsListener); + //TODO blocks default alert error handler + jsf.ajax.addOnError(jsfEventsListener); + } + }; + + richfaces.ui = richfaces.ui || {}; + + richfaces.ui.Status = richfaces.BaseComponent.extendClass({ + + name: "Status", + + //TODO - support for parallel requests + init: function(id, options) { + this.id = id; + this.attachToDom(); + this.options = options || {}; + this.register(); + }, + + register: function() { + initializeStatuses(); + + var statusName = this.options.statusName; + var dataStatusAttribute = getStatusDataAttributeName(statusName); + + var container; + if (statusName) { + container = jQuery(document); + } else { + container = jQuery(richfaces.getDomElement(this.id)).parents('form'); + if (container.length == 0) { + container = jQuery(document); + }; + } + + var statuses = container.data(dataStatusAttribute); + if (!statuses) { + statuses = {}; + container.data(dataStatusAttribute, statuses); + } + + statuses[this.id] = this; + }, + + start: function() { + if (this.options.onstart) { + this.options.onstart.apply(this, arguments); + } + + return this.__showHide('.rich-status-start'); + }, + + stop: function() { + if (this.options.onstop) { + this.options.onstop.apply(this, arguments); + } + }, + + success: function() { + if (this.options.onsuccess) { + this.options.onsuccess.apply(this, arguments); + } + this.stop(); + + return this.__showHide('.rich-status-stop'); + }, + + error: function() { + if (this.options.onerror) { + this.options.onerror.apply(this, arguments); + } + this.stop(); + + return this.__showHide(':not(.rich-status-error) + .rich-status-stop, .rich-status-error'); + }, + + __showHide: function(selector) { + var element = jQuery(richfaces.getDomElement(this.id)); + if (element) { + var statusElts = element.children(); + statusElts.each(function() { + var t = jQuery(this); + t.css('display', t.is(selector) ? '': 'none'); + }); + + return true; + } + return false; + } + }); +}(window.RichFaces, jQuery));