Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.113
edited by Jip-jan Alunkel
on July 02, 22:23
Change comment: Update document after refactoring.
To version 2.117
edited by Jip-jan Alunkel
on July 02, 22:39
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -115,11 +115,11 @@
115 115  #end
116 116  
117 117  #macro(createSelectElement $O_elementData $O_tagName)
118 - <select class="form-select form-control"#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end aria-describedby="${O_elementData.id}_helpBlock"#if($O_elementData.required == "true") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end data-set-space="${O_elementData.data-set-space}"#if($O_elementData.select-spaces-json) data-select-spaces-json="true"#end name="${O_elementData.id}" id="${O_elementData.id}">
118 + <select class="form-select form-control"#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end aria-describedby="${O_elementData.id}_helpBlock"#if($O_elementData.required == "true") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end#if(${O_elementData.data-set-space}) data-set-space="${O_elementData.data-set-space}"#end#if($O_elementData.select-spaces-json) data-select-spaces-json="true"#end name="${O_elementData.id}" id="${O_elementData.id}">
119 119   #if($O_elementData.placeholder)
120 - <option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
120 + <option value="" disabled=""#if(!$O_elementData.value) selected=""#end hidden="hidden">${O_elementData.placeholder}</option>
121 121   #end
122 - #set ($mydoc = $xwiki.getDocument('assets.pagemaker.pagemakerClass'))
122 + #set($mydoc = $xwiki.getDocument('assets.pagemaker.pagemakerClass'))
123 123   #if($mydoc.isNew() && $hasProgramming)
124 124   #set ($myinternaldoc = $mydoc.getDocument())
125 125   #set ($myclass = $myinternaldoc.getXClass())
... ... @@ -190,7 +190,7 @@
190 190   #end
191 191   #end
192 192   #end
193 - <option value="$key"#if($O_elementData.value=="$key") selected="selected">$spaceDocTitle</option>
193 + <option value="$key"#if($O_elementData.value=="$key") selected=""#end>$spaceDocTitle</option>
194 194   #end
195 195   #end
196 196   </select>