Author: nbelaevski Date: 2009-08-27 11:45:42 -0400 (Thu, 27 Aug 2009) New Revision: 15351 Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-jsf-log.js Log: Log: added check for jsf global variable Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-jsf-log.js =================================================================== --- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-jsf-log.js 2009-08-27 15:43:07 UTC (rev 15350) +++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-jsf-log.js 2009-08-27 15:45:42 UTC (rev 15351) @@ -1,102 +1,103 @@ -(function(jQuery, richfaces, jsf) { - - //JSF log adapter - var identifyElement = function(elt) { - var identifier = '<' + elt.tagName.toLowerCase(); - var e = jQuery(elt); - if (e.attr('id')) { - identifier += (' id=' + e.attr('id')); +if (typeof jsf != 'undefined') { + (function(jQuery, richfaces, jsf) { + + //JSF log adapter + var identifyElement = function(elt) { + var identifier = '<' + elt.tagName.toLowerCase(); + var e = jQuery(elt); + if (e.attr('id')) { + identifier += (' id=' + e.attr('id')); + } + if (e.attr('class')) { + identifier += (' class=' + e.attr('class')); + } + + identifier += ' ...>'; + + return identifier; } - if (e.attr('class')) { - identifier += (' class=' + e.attr('class')); + + var formatPartialResponseElement = function(logElement, responseElement) { + var change = jQuery(responseElement); + + logElement.append("Element <b>" + responseElement.nodeName + "</b>"); + if (change.attr("id")) { + logElement.append(document.createTextNode(" for id=" + change.attr("id"))); + } + + jQuery(document.createElement("br")).appendTo(logElement); + jQuery("<span style='color:dimgray'></span>").appendTo(logElement).text(change.toXML()); + jQuery(document.createElement("br")).appendTo(logElement); } - - identifier += ' ...>'; - - return identifier; - } - - var formatPartialResponseElement = function(logElement, responseElement) { - var change = jQuery(responseElement); - - logElement.append("Element <b>" + responseElement.nodeName + "</b>"); - if (change.attr("id")) { - logElement.append(document.createTextNode(" for id=" + change.attr("id"))); + + var formatPartialResponse = function(partialResponse) { + var logElement = jQuery(document.createElement("span")); + + partialResponse.children().each(function() { + var responseElement = jQuery(this); + if (responseElement.is('changes')) { + logElement.append("Listing content of response <b>changes</b> element:<br />"); + responseElement.children().each(function() { + formatPartialResponseElement(logElement, this); + }); + } else { + formatPartialResponseElement(logElement, this); + } + }); + + return logElement; } - - jQuery(document.createElement("br")).appendTo(logElement); - jQuery("<span style='color:dimgray'></span>").appendTo(logElement).text(change.toXML()); - jQuery(document.createElement("br")).appendTo(logElement); - } - - var formatPartialResponse = function(partialResponse) { - var logElement = jQuery(document.createElement("span")); - - partialResponse.children().each(function() { - var responseElement = jQuery(this); - if (responseElement.is('changes')) { - logElement.append("Listing content of response <b>changes</b> element:<br />"); - responseElement.children().each(function() { - formatPartialResponseElement(logElement, this); - }); - } else { - formatPartialResponseElement(logElement, this); - } - }); - - return logElement; - } - - var jsfAjaxLogAdapter = function(data) { - try { - var log = richfaces.log; - - var source = data.source; - var type = data.type; - - var responseCode = data.responseCode; - var responseXML = data.responseXML; - var responseText = data.responseText; - - if (type != 'error') { - log.info("Received '" + type + "' event from " + identifyElement(source)); - - if (type == 'beforedomupdate') { - var partialResponse; - - if (responseXML) { - partialResponse = jQuery(responseXML).children("partial-response"); + + var jsfAjaxLogAdapter = function(data) { + try { + var log = richfaces.log; + + var source = data.source; + var type = data.type; + + var responseCode = data.responseCode; + var responseXML = data.responseXML; + var responseText = data.responseText; + + if (type != 'error') { + log.info("Received '" + type + "' event from " + identifyElement(source)); + + if (type == 'beforedomupdate') { + var partialResponse; + + if (responseXML) { + partialResponse = jQuery(responseXML).children("partial-response"); + } + + var responseTextEntry = jQuery("<span>Server returned responseText: </span><span style='color:dimgray'></span>").eq(1).text(responseText).end(); + + if (partialResponse && partialResponse.length) { + log.debug(responseTextEntry); + log.info(formatPartialResponse(partialResponse)); + } else { + log.info(responseTextEntry); + } } - - var responseTextEntry = jQuery("<span>Server returned responseText: </span><span style='color:dimgray'></span>").eq(1).text(responseText).end(); - - if (partialResponse && partialResponse.length) { - log.debug(responseTextEntry); - log.info(formatPartialResponse(partialResponse)); - } else { - log.info(responseTextEntry); - } + } else { + var status = data.status; + log.error("Received '" + type + '@' + status + "' event from " + identifyElement(source)); + log.error("[" + data.responseCode + "] " + data.errorName + ": " + data.errorMessage); } - } else { - var status = data.status; - log.error("Received '" + type + '@' + status + "' event from " + identifyElement(source)); - log.error("[" + data.responseCode + "] " + data.errorName + ": " + data.errorMessage); + } catch (e) { + //ignore logging errors } - } catch (e) { - //ignore logging errors - } - }; + }; + + var eventsListener = richfaces.createJSFEventsAdapter({ + begin: jsfAjaxLogAdapter, + beforedomupdate: jsfAjaxLogAdapter, + success: jsfAjaxLogAdapter, + complete: jsfAjaxLogAdapter, + error: jsfAjaxLogAdapter + }); - var eventsListener = richfaces.createJSFEventsAdapter({ - begin: jsfAjaxLogAdapter, - beforedomupdate: jsfAjaxLogAdapter, - success: jsfAjaxLogAdapter, - complete: jsfAjaxLogAdapter, - error: jsfAjaxLogAdapter - }); - - jsf.ajax.addOnEvent(eventsListener); - jsf.ajax.addOnError(eventsListener); - // -}(jQuery, RichFaces, jsf)); - + jsf.ajax.addOnEvent(eventsListener); + jsf.ajax.addOnError(eventsListener); + // + }(jQuery, RichFaces, jsf)); +}; \ No newline at end of file