Changes for page Macros

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

Summary

Details

Page properties
Content
... ... @@ -50,9 +50,7 @@
50 50   #if($elementType == 'captcha')
51 51   #set($paragraphCSSClass = ' class="required slideCaptcha-box"')
52 52   #else
53 - #if($O_elementData.data-required-spoof != "true")
54 - #set($paragraphCSSClass = ' class="required"')
55 - #end
53 + #set($paragraphCSSClass = ' class="required"')
56 56   #end
57 57   #elseif($elementDataObj.type == 'captcha')
58 58   #set($paragraphCSSClass = ' class="slideCaptcha-box"')
... ... @@ -182,10 +182,12 @@
182 182  
183 183  #macro(createSelectElement $O_elementData $O_tagName)
184 184   #set($currentSpaceName = $services.model.resolveDocument('', 'default', $doc.documentReference.lastSpaceReference).parent.getName())
185 - <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>
186 186   #if($O_elementData.placeholder)
187 187   #if($O_elementData.select-json && !$O_elementData.select-json.keySet().contains($O_elementData.value))
188 - <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>
189 189   #end
190 190   #end
191 191  
... ... @@ -201,6 +201,7 @@
201 201  
202 202   ## Loop through the JSON data to create the options.
203 203   #foreach($key in $json.keySet())
204 +
204 204   <option value="$key"#if($key == $O_elementData.value) selected="selected"#end>$json[$key]</option>
205 205   #end
206 206   </select>