Author: musachy
Date: Sun Jun 10 09:49:10 2007
New Revision: 545909
URL: http://svn.apache.org/viewvc?view=rev&rev=545909
Log:
WW-1980 Ajax tags (most of them) are not working on IE 6
* IE doesn't like trailing commas in JSON
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTree.js
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTreeSelector.js
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/bind.ftl
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-2.txt
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js?view=diff&rev=545909&r1=545908&r2=545909
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js
Sun Jun 10 09:49:10 2007
@@ -412,5 +412,4 @@
}
return {"xml":s, "styles":styles, "titles":titles, "requires":requires,
"scripts":scripts, "url":url};
}
- }
-);
+});
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTree.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTree.js?view=diff&rev=545909&r1=545908&r2=545909
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTree.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTree.js
Sun Jun 10 09:49:10 2007
@@ -53,7 +53,7 @@
}
},
mimetype: "text/json"
- });
+ });
}
}
});
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTreeSelector.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTreeSelector.js?view=diff&rev=545909&r1=545908&r2=545909
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTreeSelector.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTreeSelector.js
Sun Jun 10 09:49:10 2007
@@ -94,6 +94,5 @@
collapse: function(message) {
var node = message.source;
this.publishTopics(this.collapsedNotifyTopicsArray, {node: node});
- },
-
+ }
});
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/bind.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/bind.ftl?view=diff&rev=545909&r1=545908&r2=545909
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/bind.ftl
(original)
+++ struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/bind.ftl
Sun Jun 10 09:49:10 2007
@@ -1,84 +1,138 @@
+<#assign firstField=true >
<script language="JavaScript" type="text/javascript">
dojo.addOnLoad(function() {
dojo.widget.createWidget("struts:BindEvent", {
<#if parameters.sources?if_exists != "">
- "sources": "${parameters.sources?html}",<#rt/>
+ <#assign firstField=false ><#t/>
+ "sources": "${parameters.sources?html}"<#t/>
</#if>
<#if parameters.events?if_exists != "">
- "events": "${parameters.events?html}",<#rt/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "events": "${parameters.events?html}"<#t/>
</#if>
<#if parameters.id?if_exists != "">
- "id": "${parameters.id?html}",<#rt/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "id": "${parameters.id?html}"<#t/>
</#if>
<#if parameters.formId?if_exists != "">
- "formId": "${parameters.formId?html}",<#rt/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "formId": "${parameters.formId?html}"<#t/>
</#if>
<#if parameters.formFilter?if_exists != "">
- "formFilter":
"${parameters.formFilter?html}",<#rt/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "formFilter":
"${parameters.formFilter?html}"<#t/>
</#if>
<#if parameters.href?if_exists != "">
- "href": "${parameters.href}",<#rt/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "href": "${parameters.href}"<#t/>
</#if>
<#if parameters.loadingText?if_exists != "">
- "loadingText" :
"${parameters.loadingText?html}",<#rt/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "loadingText" :
"${parameters.loadingText?html}"<#t/>
</#if>
<#if parameters.errorText?if_exists != "">
- "errorText" : "${parameters.errorText?html}",<#rt/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "errorText" : "${parameters.errorText?html}"<#t/>
</#if>
<#if parameters.executeScripts?exists>
- "executeScripts":
${parameters.executeScripts?string?html},<#rt/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "executeScripts":
${parameters.executeScripts?string?html}<#t/>
</#if>
<#if parameters.listenTopics?if_exists != "">
- "listenTopics":
"${parameters.listenTopics?html}",<#t/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "listenTopics":
"${parameters.listenTopics?html}"<#t/>
</#if>
<#if parameters.notifyTopics?if_exists != "">
- "notifyTopics":
"${parameters.notifyTopics?html}",<#t/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "notifyTopics":
"${parameters.notifyTopics?html}"<#t/>
</#if>
<#if parameters.beforeNotifyTopics?if_exists != "">
- "beforeNotifyTopics":
"${parameters.beforeNotifyTopics?html}",<#t/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "beforeNotifyTopics":
"${parameters.beforeNotifyTopics?html}"<#t/>
</#if>
<#if parameters.afterNotifyTopics?if_exists != "">
- "afterNotifyTopics":
"${parameters.afterNotifyTopics?html}",<#t/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "afterNotifyTopics":
"${parameters.afterNotifyTopics?html}"<#t/>
</#if>
<#if parameters.errorNotifyTopics?if_exists != "">
- "errorNotifyTopics":
"${parameters.errorNotifyTopics?html}",<#t/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "errorNotifyTopics":
"${parameters.errorNotifyTopics?html}"<#t/>
</#if>
<#if parameters.targets?if_exists != "">
- "targets": "${parameters.targets?html}",<#t/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "targets": "${parameters.targets?html}"<#t/>
</#if>
<#if parameters.indicator?if_exists != "">
- "indicator": "${parameters.indicator?html}",<#t/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "indicator": "${parameters.indicator?html}"<#t/>
</#if>
<#if parameters.showErrorTransportText?exists>
- "showError":
${parameters.showErrorTransportText?string?html},<#t/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "showError":
${parameters.showErrorTransportText?string?html}<#t/>
</#if>
<#if parameters.showLoadingText?exists>
- "showLoading":
${parameters.showLoadingText?string?html},<#t/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "showLoading":
${parameters.showLoadingText?string?html}<#t/>
</#if>
<#if parameters.handler?if_exists != "">
- "handler": "${parameters.handler?html}",<#t/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "handler": "${parameters.handler?html}"<#t/>
</#if>
<#if parameters.highlightColor?if_exists != "">
- "highlightColor" :
"${parameters.highlightColor?html}",<#t/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "highlightColor" :
"${parameters.highlightColor?html}"<#t/>
</#if>
<#if parameters.highlightDuration?if_exists != "">
- "highlightDuration" :
${parameters.highlightDuration?html},<#t/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "highlightDuration" :
${parameters.highlightDuration?html}<#t/>
</#if>
<#if parameters.validate?exists>
- "validate": ${parameters.validate?string?html},<#t/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "validate": ${parameters.validate?string?html}<#t/>
<#else>
- "validate": false,
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "validate": false
</#if>
<#if parameters.ajaxAfterValidation?exists>
- "ajaxAfterValidation":
${parameters.ajaxAfterValidation?string?html},<#t/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "ajaxAfterValidation":
${parameters.ajaxAfterValidation?string?html}<#t/>
<#else>
- "ajaxAfterValidation": false,
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "ajaxAfterValidation": false
</#if>
<#if parameters.separateScripts?exists>
- "scriptSeparation":
${parameters.separateScripts?string?html},<#rt/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "scriptSeparation":
${parameters.separateScripts?string?html}<#t/>
</#if>
<#if parameters.transport?if_exists != "">
- "transport": "${parameters.transport?html}"<#rt/>
+ <#if !firstField>,</#if><#t/>
+ <#assign firstField=false ><#t/>
+ "transport": "${parameters.transport?html}"<#t/>
</#if>
});
});
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl?view=diff&rev=545909&r1=545908&r2=545909
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
(original)
+++ struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
Sun Jun 10 09:49:10 2007
@@ -2,21 +2,21 @@
// Dojo configuration
djConfig = {
isDebug: ${parameters.debug?default(false)?string},
- bindEncoding: "${parameters.encoding}",
+ bindEncoding: "${parameters.encoding}"
<#if parameters.baseRelativePath?if_exists != "">
- baseRelativePath: "<@s.url value='${parameters.baseRelativePath}'
includeParams='none' encode='false' />",
- baseScriptUri: "<@s.url value='${parameters.baseRelativePath}'
includeParams='none' encode='false' />",
+ ,baseRelativePath: "<@s.url value='${parameters.baseRelativePath}'
includeParams='none' encode='false' />"
+ ,baseScriptUri: "<@s.url value='${parameters.baseRelativePath}'
includeParams='none' encode='false' />"
<#else>
- baseRelativePath: "${base}/struts/dojo/",
- baseScriptUri: "${base}/struts/dojo/",
+ ,baseRelativePath: "${base}/struts/dojo/"
+ ,baseScriptUri: "${base}/struts/dojo/"
</#if>
<#if parameters.locale?if_exists != "">
- locale: "${parameters.locale}",
+ ,locale: "${parameters.locale}"
</#if>
<#if parameters.extraLocales?exists>
- extraLocale: [
+ ,extraLocale: [
<#list parameters.extraLocales as locale>
- "${locale}",
+ "${locale}"<#if locale_has_next>,</#if>
</#list>
]
</#if>
Modified:
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt?view=diff&rev=545909&r1=545908&r2=545909
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
(original)
+++
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
Sun Jun 10 09:49:10 2007
@@ -9,7 +9,7 @@
extraLocale: [
"a",
"b",
- "c",
+ "c"
]
};
</script>
Modified:
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-2.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-2.txt?view=diff&rev=545909&r1=545908&r2=545909
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-2.txt
(original)
+++
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-2.txt
Sun Jun 10 09:49:10 2007
@@ -9,7 +9,7 @@
extraLocale: [
"a",
"b",
- "c",
+ "c"
]
};
</script>
