root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Rossen Stoyanchev 2014-07-22 15:40:49 -04:00
parent 1b53882f55
commit 105ea196e4
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm
View File

@ -112,7 +112,7 @@
*# *#
#macro( springFormInput $path $attributes ) #macro( springFormInput $path $attributes )
#springBind($path) #springBind($path)
<input type="text" id="#xmlId(${status.expression})" name="${status.expression}" value="$!status.value" ${attributes}#springCloseTag() <input type="text" id="#springXmlId(${status.expression})" name="${status.expression}" value="$!status.value" ${attributes}#springCloseTag()
#end #end
#** #**
@ -129,7 +129,7 @@
*# *#
#macro( springFormPasswordInput $path $attributes ) #macro( springFormPasswordInput $path $attributes )
#springBind($path) #springBind($path)
<input type="password" id="#xmlId(${status.expression})" name="${status.expression}" value="" ${attributes}#springCloseTag() <input type="password" id="#springXmlId(${status.expression})" name="${status.expression}" value="" ${attributes}#springCloseTag()
#end #end
#** #**
@ -145,7 +145,7 @@
*# *#
#macro( springFormHiddenInput $path $attributes ) #macro( springFormHiddenInput $path $attributes )
#springBind($path) #springBind($path)
<input type="hidden" id="#xmlId(${status.expression})" name="${status.expression}" value="$!status.value" ${attributes}#springCloseTag() <input type="hidden" id="#springXmlId(${status.expression})" name="${status.expression}" value="$!status.value" ${attributes}#springCloseTag()
#end #end
#** #**
@ -161,7 +161,7 @@
*# *#
#macro( springFormTextarea $path $attributes ) #macro( springFormTextarea $path $attributes )
#springBind($path) #springBind($path)
<textarea id="#xmlId(${status.expression})" name="${status.expression}" ${attributes}>$!status.value</textarea> <textarea id="#springXmlId(${status.expression})" name="${status.expression}" ${attributes}>$!status.value</textarea>
#end #end
#** #**
@ -182,7 +182,7 @@
*# *#
#macro( springFormSingleSelect $path $options $attributes ) #macro( springFormSingleSelect $path $options $attributes )
#springBind($path) #springBind($path)
<select id="#xmlId(${status.expression})" name="${status.expression}" ${attributes}> <select id="#springXmlId(${status.expression})" name="${status.expression}" ${attributes}>
#foreach($option in $options.keySet()) #foreach($option in $options.keySet())
<option value="${option}" <option value="${option}"
#if ("$!status.value" == "$option") selected="selected" #end> #if ("$!status.value" == "$option") selected="selected" #end>
@ -204,7 +204,7 @@
*# *#
#macro( springFormMultiSelect $path $options $attributes ) #macro( springFormMultiSelect $path $options $attributes )
#springBind($path) #springBind($path)
<select multiple="multiple" id="#xmlId(${status.expression})" name="${status.expression}" ${attributes}> <select multiple="multiple" id="#springXmlId(${status.expression})" name="${status.expression}" ${attributes}>
#foreach($option in $options.keySet()) #foreach($option in $options.keySet())
<option value="${option}" <option value="${option}"
#foreach($item in $status.actualValue) #foreach($item in $status.actualValue)
@ -274,8 +274,8 @@
*# *#
#macro( springFormCheckbox $path $attributes ) #macro( springFormCheckbox $path $attributes )
#springBind($path) #springBind($path)
<input type="hidden" name="_#xmlId(${status.expression})" value="on"/> <input type="hidden" name="_#springXmlId(${status.expression})" value="on"/>
<input type="checkbox" id="#xmlId(${status.expression})" name="${status.expression}"#if ("$!{status.value}"=="true") checked="checked"#end ${attributes}/> <input type="checkbox" id="#springXmlId(${status.expression})" name="${status.expression}"#if ("$!{status.value}"=="true") checked="checked"#end ${attributes}/>
#end #end
#** #**
@ -316,7 +316,7 @@
*# *#
#macro( springCloseTag )#if ($springXhtmlCompliant)/>#else>#end #end #macro( springCloseTag )#if ($springXhtmlCompliant)/>#else>#end #end
#macro( xmlId $id)#if($id)$id.replaceAll("\[","").replaceAll("\]","")#else$id#end#end #macro( springXmlId $id)#if($id)$id.replaceAll("\[","").replaceAll("\]","")#else$id#end#end

1
spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java
View File

@ -191,6 +191,7 @@ public class VelocityMacroTests extends TestCase {
} }
// SPR-5172 // SPR-5172
public void testIdContainsBraces() throws Exception { public void testIdContainsBraces() throws Exception {
DummyMacroRequestContext rc = new DummyMacroRequestContext(request); DummyMacroRequestContext rc = new DummyMacroRequestContext(request);
Map<String, String> msgMap = new HashMap<String, String>(); Map<String, String> msgMap = new HashMap<String, String>();