Änderungen von Dokument VelocityMacros

Zusammenfassung

• Seiteneigenschaften (2 geändert, 0 hinzugefügt, 0 gelöscht)

Details

Seiteneigenschaften

Dokument-Autor

...	...	@@ -1,1 +1,1 @@
1		-XWiki.admin
	1	+XWiki.dherrman

Inhalt

...	...	@@ -23,9 +23,10 @@
23	23	## directly in the current page, e.g. when CKEditor is used in-line (no iframe). We still need to send back the
24	24	## required style sheets and JavaScript files because some of them might not be available in the target page, e.g.
25	25	## when a macro is inserted and it needs resource files not available on every page.
26		- #ckeditor_initRequiredSkinExtensions()
	26	+ #template('display_macros.vm')
	27	+ #initRequiredSkinExtensions()
27	27	#set ($output = "#ckeditor_getRenderedContent($source)$!html")
28		- #set ($discard = $response.setHeader('X-XWIKI-HTML-HEAD', "#ckeditor_getRequiredSkinExtensions()"))
	29	+ #sendRequiredSkinExtensions()
29	29	#else
30	30	## Returns a full HTML page, including the HEAD tag with the style sheets and possibly the JavaScript includes.
31	31	## This is needed when the edited content is loaded in an iframe, which is the case when CKEditor replaces a text
...	...	@@ -197,6 +197,9 @@
197	197	</dl>
198	198	#end
199	199
	201	+#**
	202	+ * Deprecated. Use #initRequiredSkinExtensions() from display_macros.vm instead.
	203	+*#
200	200	#macro (ckeditor_initRequiredSkinExtensions)
201	201	#set ($requiredSkinExtensions = $collectiontool.orderedMap)
202	202	## Save the import string for each skin extension plugin in order to be able to remove the always used extensions
...	...	@@ -206,6 +206,9 @@
206	206	#end
207	207	#end
208	208
	213	+#**
	214	+ * Deprecated. Use #getRequiredSkinExtensions() from display_macros.vm instead.
	215	+*#
209	209	#macro (ckeditor_getRequiredSkinExtensions)
210	210	#foreach ($entry in $requiredSkinExtensions.entrySet())
211	211	#set ($importString = $xwiki.get($entry.key).importString)