Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 07:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4972 Switches incompatible_improvements to VERSION_2_3_28

Browse Source
This commit is contained in:
Lukasz Lenart
2018-12-12 08:57:24 +01:00
parent 99b97f1136
commit 796c15ee67
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
+1 -1
View File
@@ -339,7 +339,7 @@ public class FreemarkerManager {
}
protected Version getFreemarkerVersion(ServletContext servletContext) {
Version incompatibleImprovements = Configuration.VERSION_2_3_0;
Version incompatibleImprovements = Configuration.VERSION_2_3_28;
String incompatibleImprovementsParam = servletContext.getInitParameter("freemarker." + Configuration.INCOMPATIBLE_IMPROVEMENTS_KEY_SNAKE_CASE);
if (incompatibleImprovementsParam != null) {
core/src/main/resources/template/simple/radiomap.ftl
+3 -3
View File
@@ -60,9 +60,9 @@
</#if>
<input type="radio"<#rt/>
<#if parameters.name?has_content>
name="${parameters.name?html}"<#rt/>
name="${parameters.name}"<#rt/>
</#if>
id="${parameters.id?html}${itemKeyStr?html}"<#rt/>
id="${parameters.id}${itemKeyStr}"<#rt/>
<#if tag.contains(parameters.nameValue!'', itemKey)>
checked="checked"<#rt/>
</#if>
@@ -93,7 +93,7 @@
<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
/><#rt/>
<label for="${parameters.id?html}${itemKeyStr?html}"<#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl"/>><#rt/>
<label for="${parameters.id}${itemKeyStr}"<#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl"/>><#rt/>
${itemValue}<#t/>
</label>
</@s.iterator>
core/src/main/resources/template/simple/scripting-events.ftl
+14 -14
View File
@@ -19,44 +19,44 @@
*/
-->
<#if parameters.onclick??>
onclick="${parameters.onclick?html}"<#rt/>
onclick="${parameters.onclick}"<#rt/>
</#if>
<#if parameters.ondblclick??>
ondblclick="${parameters.ondblclick?html}"<#rt/>
ondblclick="${parameters.ondblclick}"<#rt/>
</#if>
<#if parameters.onmousedown??>
onmousedown="${parameters.onmousedown?html}"<#rt/>
onmousedown="${parameters.onmousedown}"<#rt/>
</#if>
<#if parameters.onmouseup??>
onmouseup="${parameters.onmouseup?html}"<#rt/>
onmouseup="${parameters.onmouseup}"<#rt/>
</#if>
<#if parameters.onmouseover??>
onmouseover="${parameters.onmouseover?html}"<#rt/>
onmouseover="${parameters.onmouseover}"<#rt/>
</#if>
<#if parameters.onmousemove??>
onmousemove="${parameters.onmousemove?html}"<#rt/>
onmousemove="${parameters.onmousemove}"<#rt/>
</#if>
<#if parameters.onmouseout??>
onmouseout="${parameters.onmouseout?html}"<#rt/>
onmouseout="${parameters.onmouseout}"<#rt/>
</#if>
<#if parameters.onfocus??>
onfocus="${parameters.onfocus?html}"<#rt/>
onfocus="${parameters.onfocus}"<#rt/>
</#if>
<#if parameters.onblur??>
onblur="${parameters.onblur?html}"<#rt/>
onblur="${parameters.onblur}"<#rt/>
</#if>
<#if parameters.onkeypress??>
onkeypress="${parameters.onkeypress?html}"<#rt/>
onkeypress="${parameters.onkeypress}"<#rt/>
</#if>
<#if parameters.onkeydown??>
onkeydown="${parameters.onkeydown?html}"<#rt/>
onkeydown="${parameters.onkeydown}"<#rt/>
</#if>
<#if parameters.onkeyup??>
onkeyup="${parameters.onkeyup?html}"<#rt/>
onkeyup="${parameters.onkeyup}"<#rt/>
</#if>
<#if parameters.onselect??>
onselect="${parameters.onselect?html}"<#rt/>
onselect="${parameters.onselect}"<#rt/>
</#if>
<#if parameters.onchange??>
onchange="${parameters.onchange?html}"<#rt/>
onchange="${parameters.onchange}"<#rt/>
</#if>