Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.385
edited by Jip-jan Alunkel
on February 19, 22:00
Change comment: Update document after refactoring.
To version 2.376
edited by Jip-jan Alunkel
on February 19, 19:18
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -180,10 +180,12 @@
180 180  
181 181  #macro(createSelectElement $O_elementData $O_tagName)
182 182   #set($currentSpaceName = $services.model.resolveDocument('', 'default', $doc.documentReference.lastSpaceReference).parent.getName())
183 - <select name="${O_elementData.id}" id="${O_elementData.id}" class="form-select form-control" data-value="$O_elementData.value"#if($O_elementData.data-required-spoof) data-required-spoof="true"#end#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end#if($O_elementData.data-opener) data-opener="${O_elementData.data-opener}"#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}" data-parent-space="${currentSpaceName}"#end#if($O_elementData.data-space-xobj-classname) data-space-xobj-classname="${O_elementData.data-space-xobj-classname}"#end>
183 +$O_elementData.select-json
184 +($O_elementData.select-json.keySet().contains($O_elementData.value) == false)
185 +<select name="${O_elementData.id}" id="${O_elementData.id}" data-value="$O_elementData.value" class="form-select form-control"#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end#if($O_elementData.data-opener) data-opener="${O_elementData.data-opener}"#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}" data-parent-space="${currentSpaceName}"#end#if($O_elementData.data-space-xobj-classname) data-space-xobj-classname="${O_elementData.data-space-xobj-classname}"#end>
184 184   #if($O_elementData.placeholder)
185 185   #if($O_elementData.select-json && !$O_elementData.select-json.keySet().contains($O_elementData.value))
186 - <option value="" disabled="" hidden="hidden"#if($O_elementData.value == "") selected="selected"#end>${O_elementData.placeholder}</option>
188 + <option value="" disabled=""#if(!$O_elementData.value) selected=""#end hidden="hidden">${O_elementData.placeholder}</option>
187 187   #end
188 188   #end
189 189  
... ... @@ -199,6 +199,7 @@
199 199  
200 200   ## Loop through the JSON data to create the options.
201 201   #foreach($key in $json.keySet())
204 +
202 202   <option value="$key"#if($key == $O_elementData.value) selected="selected"#end>$json[$key]</option>
203 203   #end
204 204   </select>