Cambios para el documento Macros

Última modificación por Jip-jan Alunkel el abril 15, 18:09
Desde la versión 2.113
editado por Jip-jan Alunkel
el julio 02, 22:23
Cambiar el comentario: Update document after refactoring.
Hasta la versión 2.121
editado por Jip-jan Alunkel
el julio 02, 23:12
Cambiar el comentario: Update document after refactoring.

Resumen

Detalles

Propiedades de página
Contenido
... ... @@ -115,11 +115,14 @@
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 + #if($O_elementData.select-json && $O_elementData.select-json.keySet().contains($O_elementData.value))
121 + #else
122 + <option value="" disabled=""#if(!$O_elementData.value) selected=""#end hidden="hidden">${O_elementData.placeholder}</option>
123 + #end
121 121   #end
122 - #set ($mydoc = $xwiki.getDocument('assets.pagemaker.pagemakerClass'))
125 + #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>
196 + <option value="$key"#if($O_elementData.value=="$key") selected="selected"#end>$spaceDocTitle</option>
194 194   #end
195 195   #end
196 196   </select>
... ... @@ -226,7 +226,7 @@
226 226   <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>
227 227  #end
228 228  #macro(createCheckboxElement $O_elementData)
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
232 + <input type="checkbox" name="${O_elementData.id}"#if($O_elementData.value) checked="checked" 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
230 230  #end
231 231  #macro(createTextareaElement $O_elementData $O_tagName)
232 232   <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>