Changes for page Macros

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

Summary

Details

Page properties
Content
... ... @@ -116,11 +116,8 @@
116 116  
117 117  #macro(createSelectElement $O_elementData $O_tagName)
118 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 - #if($O_elementData.placeholder)
120 - #if($O_elementData.select-json && $O_elementData.select-json.keySet().contains($O_elementData.value))
121 - #else
119 + #if($O_elementData.placeholder && (!$O_elementData.select-json || ($O_elementData.select-json && !$O_elementData.select-json.keySet().contains($O_elementData.value)))
122 122   <option value="" disabled=""#if(!$O_elementData.value) selected=""#end hidden="hidden">${O_elementData.placeholder}</option>
123 - #end
124 124   #end
125 125   #set($mydoc = $xwiki.getDocument('assets.pagemaker.pagemakerClass'))
126 126   #if($mydoc.isNew() && $hasProgramming)
... ... @@ -193,7 +193,7 @@
193 193   #end
194 194   #end
195 195   #end
196 - <option value="$key"#if($O_elementData.value=="$key") selected="selected"#end>$spaceDocTitle</option>
193 + <option value="$key"#if($O_elementData.value=="$key") selected=""#end>$spaceDocTitle</option>
197 197   #end
198 198   #end
199 199   </select>
... ... @@ -229,7 +229,7 @@
229 229   <input type="url" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}" autocomplete="off" pattern="https?://.*"#if($O_elementData.placeholder) placeholder="${O_elementData.placeholder}"#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.aria-label) aria-label="${O_elementData.aria-label}"#end#if($O_elementData.data-create-xobj) data-create-xobj="${O_elementData.data-create-xobj}"#end#if($O_elementData.data-xobj-classname) data-xobj-classname="${O_elementData.data-xobj-classname}"#end#if($O_elementData.data-xobj-fieldname) data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"#end>
230 230  #end
231 231  #macro(createCheckboxElement $O_elementData)
232 - <input type="checkbox" name="${O_elementData.id}"#if($O_elementData.value==1) checked="checked"#end id="${O_elementData.id}"#if($O_elementData.data-opener) data-opener="${O_elementData.data-opener}"#end#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.aria-label) aria-label="${O_elementData.aria-label}"#end>$O_elementData.label
229 + <input type="checkbox" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.data-opener) data-opener="${O_elementData.data-opener}"#end value="${O_elementData.value}"#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.aria-label) aria-label="${O_elementData.aria-label}"#end>$O_elementData.label
233 233  #end
234 234  #macro(createTextareaElement $O_elementData $O_tagName)
235 235   <textarea class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.placeholder) placeholder="${O_elementData.placeholder}"#end#if($O_elementData.textarea-rows) rows="$O_elementData.textarea-rows"#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.aria-label) aria-label="${O_elementData.aria-label}"#end></textarea>