Ä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.dherrman
	1	+XWiki.admin

Inhalt

...	...	@@ -23,10 +23,9 @@
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		- #template('display_macros.vm')
27		- #initRequiredSkinExtensions()
	26	+ #ckeditor_initRequiredSkinExtensions()
28	28	#set ($output = "#ckeditor_getRenderedContent($source)$!html")
29		- #sendRequiredSkinExtensions()
	28	+ #set ($discard = $response.setHeader('X-XWIKI-HTML-HEAD', "#ckeditor_getRequiredSkinExtensions()"))
30	30	#else
31	31	## Returns a full HTML page, including the HEAD tag with the style sheets and possibly the JavaScript includes.
32	32	## This is needed when the edited content is loaded in an iframe, which is the case when CKEditor replaces a text
...	...	@@ -198,9 +198,6 @@
198	198	</dl>
199	199	#end
200	200
201		-#**
202		- * Deprecated. Use #initRequiredSkinExtensions() from display_macros.vm instead.
203		-*#
204	204	#macro (ckeditor_initRequiredSkinExtensions)
205	205	#set ($requiredSkinExtensions = $collectiontool.orderedMap)
206	206	## Save the import string for each skin extension plugin in order to be able to remove the always used extensions
...	...	@@ -210,9 +210,6 @@
210	210	#end
211	211	#end
212	212
213		-#**
214		- * Deprecated. Use #getRequiredSkinExtensions() from display_macros.vm instead.
215		-*#
216	216	#macro (ckeditor_getRequiredSkinExtensions)
217	217	#foreach ($entry in $requiredSkinExtensions.entrySet())
218	218	#set ($importString = $xwiki.get($entry.key).importString)