Author: nbelaevski
Date: 2008-12-08 06:12:50 -0500 (Mon, 08 Dec 2008)
New Revision: 11625
Modified:
trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java
trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java
Log:
https://jira.jboss.org/jira/browse/RF-5216
Modified:
trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java
===================================================================
---
trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java 2008-12-08
00:33:55 UTC (rev 11624)
+++
trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java 2008-12-08
11:12:50 UTC (rev 11625)
@@ -79,7 +79,7 @@
Map<String, Object> queues = (Map<String, Object>) data;
ResponseWriter writer = context.getResponseWriter();
- writer.writeText("if (A4J) { if (A4J.AJAX) { with (A4J.AJAX) {", null);
+ writer.writeText("if (typeof A4J != 'undefined') { if (A4J.AJAX) { with
(A4J.AJAX) {", null);
for (Entry<String, Object> entry : queues.entrySet()) {
encodeQueue(writer, entry.getKey(), (QueueRendererData) entry.getValue());
}
Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java
===================================================================
--- trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java 2008-12-08
00:33:55 UTC (rev 11624)
+++ trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java 2008-12-08
11:12:50 UTC (rev 11625)
@@ -84,7 +84,7 @@
DomText text = (DomText) list.get(0);
String scriptData = text.getData();
- return scriptData.replaceAll("^\\Qif (A4J) { if (A4J.AJAX) { with (A4J.AJAX)
{\\E|\\Q}}};\\E$", "");
+ return scriptData.replaceAll("^\\Qif (typeof A4J != 'undefined') { if
(A4J.AJAX) { with (A4J.AJAX) {\\E|\\Q}}};\\E$", "");
}
private String[] splitScript(String s) {