Skip to content

Commit 46b351c

Browse files
authored
Merge pull request #1551 from lucee/LDEV-5901-docs
7.0.1.66-SNAPSHOT update tag attribute groups
2 parents 6b5d09e + 412cfaa commit 46b351c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+177
-101
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
with:
4242
webroot: ${{ github.workspace }}
4343
execute: /build-all.cfm
44-
luceeVersion: 7.0.1.65-SNAPSHOT
44+
luceeVersion: 7.0.1.66-SNAPSHOT
4545
# redis, chart, lucene, form. ajax, chart, argon2, websocket, ec2, json
4646
extensions: 60772C12-F179-D555-8E2CD2B4F7428718;version=3.0.0.54-SNAPSHOT,D46B46A9-A0E3-44E1-D972A04AC3A8DC10,EFDEB172-F52E-4D84-9CD1A1F561B3DFC8,FAD67145-E3AE-30F8-1C11A6CCF544F0B7,6E2CB28F-98FB-4B51-B6BE6C64ADF35473,DF28D0A4-6748-44B9-A2FDC12E4E2E4D38,7891D723-8F78-45F5-B7E333A22F8467CA,058215B3-5544-4392-A187A1649EB5CA90,261114AC-7372-4CA8-BA7090895E01682D,A03F4335-BDEF-44DE-946FB16C47802F96,3F9DFF32-B555-449D-B0EB5DB723044045
4747
- name: Upload Artifact

builders/html/templates/tag.cfm

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,55 @@
158158
</table>
159159
</div>
160160
</cfloop>
161+
162+
<!--- Collect and render unimplemented attributes (if any) --->
163+
<cfset local.unimplementedAttribs = []>
164+
<cfloop array="#local.tag.getAttributes()#" item="local.attrib">
165+
<cfif local.attrib.status neq "implemented">
166+
<cfset arrayAppend( local.unimplementedAttribs, local.attrib )>
167+
</cfif>
168+
</cfloop>
169+
<cfif ArrayLen( local.unimplementedAttribs ) gt 0>
170+
<h4>Unimplemented Attribute(s)</h4>
171+
<div class="table-responsive">
172+
<table class="table attributes">
173+
<thead>
174+
<tr>
175+
<th>Attribute</th>
176+
<th>Description</th>
177+
<cfif local.attributesHaveDefaultValues><th>Default</th></cfif>
178+
</tr>
179+
</thead>
180+
<tbody>
181+
<cfloop array="#local.unimplementedAttribs#" item="local.attrib">
182+
<tr>
183+
<td translate="no">
184+
<div class="attribute" id="attribute-#local.attrib.name#">#local.attrib.name#</div>
185+
<sub>#local.attrib.type#, #( local.attrib.required ? 'required' : 'optional' )#</sub>
186+
</td>
187+
<td>
188+
#getEditLink(path=local.tag.getSourceDir() & '_attributes/#local.attrib.name#.md', edit=args.edit)#
189+
#_markdownToHtml( local.attrib.description ?: "" )#
190+
<cfif structKeyExists(local.attrib, "aliases") && Arraylen(local.attrib.aliases) gt 0>
191+
<p title="for compatibility, this attribute has the following alias(es)"><sub>Alias:
192+
<span translate="no">#ArrayToList(local.attrib.aliases,", ")#</span></sub></p>
193+
</cfif>
194+
<cfif structKeyExists(local.attrib, "status") and local.attrib.status neq "implemented">
195+
<em>* #local.attrib.status# *</em>
196+
</cfif>
197+
#showOriginalDescription(props=local.attrib, edit=args.edit, _markdownToHtml=_markdownToHtml)#
198+
</td>
199+
<cfif local.attributesHaveDefaultValues>
200+
<td translate="no">
201+
#_markdownToHtml( local.attrib.defaultValue ?: "" )#
202+
</td>
203+
</cfif>
204+
</tr>
205+
</cfloop>
206+
</tbody>
207+
</table>
208+
</div>
209+
</cfif>
161210
<cfelse>
162211
<!--- Render flat table as before (backwards compatible) --->
163212
<div class="table-responsive">

builders/markdown/templates/tag.cfm

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,29 @@
100100
}
101101
echo( chr(10) );
102102
}
103+
104+
// Collect and render unimplemented attributes (if any)
105+
local.unimplementedAttributes = [];
106+
for ( local.attrib in local.tag.getAttributes() ) {
107+
if ( local.attrib.status neq "implemented" ) {
108+
arrayAppend( local.unimplementedAttributes, local.attrib );
109+
}
110+
}
111+
if ( arrayLen( local.unimplementedAttributes ) gt 0 ) {
112+
echo( "###### Unimplemented Attribute(s)" & chr(10) & chr(10) );
113+
echo( "| Attribute | Type | Required | Description | Default |" & chr(10) );
114+
echo( "|-----------|------|----------|-------------|---------|" & chr(10) );
115+
116+
for ( local.attrib in local.unimplementedAttributes ) {
117+
echo( "| " & markdownTableCell( local.attrib.name ) );
118+
echo( " | " & markdownTableCell( local.attrib.type ) );
119+
echo( " | " & ( local.attrib.required ? 'Yes' : 'No' ) );
120+
echo( " | " & markdownTableCell( ( local.attrib.description ?: "" ) & ( structKeyExists( local.attrib, "aliases" ) && ArrayLen( local.attrib.aliases ) gt 0 ? " *Alias: " & ArrayToList( local.attrib.aliases, ", " ) & "*" : "" ) & " *" & local.attrib.status & "*" ) );
121+
echo( " | " & markdownTableCell( local.attrib.defaultValue ?: "" ) );
122+
echo( " |" & chr(10) );
123+
}
124+
echo( chr(10) );
125+
}
103126
} else {
104127
// Render flat table as before (backwards compatible)
105128
echo( "## Attributes" & chr(10) & chr(10) );

docs/03.reference/02.tags/cache/_attributeGroups/cache.md

Lines changed: 1 addition & 1 deletion

docs/03.reference/02.tags/cache/_attributeGroups/clientCache.md

Lines changed: 1 addition & 1 deletion

docs/03.reference/02.tags/cache/_attributeGroups/content.md

Lines changed: 1 addition & 1 deletion

docs/03.reference/02.tags/cache/_attributeGroups/flush.md

Lines changed: 1 addition & 1 deletion

docs/03.reference/02.tags/cache/_attributeGroups/get.md

Lines changed: 1 addition & 1 deletion

docs/03.reference/02.tags/cache/_attributeGroups/optimal.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/03.reference/02.tags/cache/_attributeGroups/put.md

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)