Changes for page AutoGallery

Summary

• Objects (1 modified, 0 added, 0 removed)
  • XWiki.WikiMacroClass[0]

Details

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -1,28 +1,29 @@
1		-{{groovy}}
2		-def attachments = doc.getAttachmentList()
3		-def imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'webp']
	1	+import java.util.stream.Collectors
	2	+import org.xwiki.rendering.block.XDOM
4	4
5		-def galleryImages = attachments.findAll { att ->
6		- def ext = att.filename.toLowerCase().tokenize('.').last()
7		- imageExtensions.contains(ext)
	4	+def attachments = doc.getAttachmentList().findAll {
	5	+ it.filename.toLowerCase().matches('.*\\.(jpg|jpeg|png|gif)$')
8	8	}
9	9
10		-if (galleryImages) {
11		- def blocks = []
12		- galleryImages.each { image ->
13		- def url = "$xwiki.getURL(doc.fullName, 'download', "filename=${image.filename}")"
14		- blocks.add("<img src='${url}' style='max-width:100%; margin: 10px;'/>")
15		- }
	8	+if (attachments.isEmpty()) {
	9	+ def fallback = "{{html}}<div><em>No images available.</em></div>{{/html}}"
	10	+ def fallbackRendered = services.rendering.parse(fallback, xcontext.syntax).xdom
	11	+ wikimacro.result = fallbackRendered.children
	12	+ return
	13	+}
16	16
17		- wikimacro.result = $services.rendering.parse(
18		- "<div style='display:flex; flex-wrap:wrap;'>${blocks.join('')}</div>",
19		- xcontext.syntax
20		- ).children
21		-} else {
22		- wikimacro.result = $services.rendering.parse(
23		- "<em>No image attachments found.</em>",
24		- xcontext.syntax
25		- ).children
	15	+def html = new StringBuilder()
	16	+html << "{{html}}"
	17	+html << "<div style='display:flex; flex-wrap:wrap; gap:10px;'>"
	18	+
	19	+attachments.each { attachment ->
	20	+ def url = "${doc.getExternalURL('download')}/${attachment.filename.encodeAsURL()}"
	21	+ html << "<img src='${url}' style='max-width:200px; height:auto; border:1px solid #ccc;'/>"
26	26	}
27		-{{/groovy}}
28	28
	24	+html << "</div>"
	25	+html << "{{/html}}"
	26	+
	27	+def rendered = services.rendering.parse(html.toString(), xcontext.syntax).xdom
	28	+wikimacro.result = rendered.children
	29	+