XWIKI-18841: The WYSIWYG editor doesn't always load when adding an annotation

(cherry picked from commit b29a23b9)

xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/src/main/resources/AnnotationCode/CreateForm.xml

@@ -36,7 +36,9 @@
   <minorEdit>false</minorEdit>
   <syntaxId>xwiki/2.0</syntaxId>
   <hidden>true</hidden>
-  <content>{{include reference="AnnotationCode.Macros" /}}
+  <content>{{template name="display_macros.vm" /}}
+
+{{include reference="AnnotationCode.Macros" /}}
 
 {{velocity output="false"}}
 #if ("$!{request.reference}" != '')
@@ -70,7 +72,12 @@
 ##Even if they get sent to the server, the server will overwrite with anything's logged in in there anyway
 #set($dispose = $annData.put("author", $xcontext.user))
 #set($dispose = $annData.put("date", $datetool.date))
+## The annotation creation form is loaded asynchronously so we need to send back also the required JavaScript and CSS
+## resources (besides the form HTML).
+#initRequiredSkinExtensions()
 #displayCreateBoxFromReference($annotationReference, $annData)
+#getRequiredSkinExtensions($requiredSkinExtensions)
+#set ($discard = $response.setHeader('X-XWIKI-HTML-HEAD', $requiredSkinExtensions))
 {{/html}}
 #end
 {{/velocity}}</content>

xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/src/main/resources/AnnotationCode/EditForm.xml

@@ -36,7 +36,9 @@
   <minorEdit>false</minorEdit>
   <syntaxId>xwiki/2.0</syntaxId>
   <hidden>true</hidden>
-  <content>{{include reference="AnnotationCode.Macros" /}}
+  <content>{{template name="display_macros.vm" /}}
+
+{{include reference="AnnotationCode.Macros" /}}
 
 {{velocity output="false"}}
 #if ("$!{request.reference}" != '')
@@ -48,7 +50,12 @@
 
 {{velocity filter="none"}}
 {{html clean="false"}}
+## The annotation edit form is loaded asynchronously so we need to send back also the required JavaScript and CSS
+## resources (besides the form HTML).
+#initRequiredSkinExtensions()
 #displayEditBoxFromReference("$!{request.id}", $annotationReference)
+#getRequiredSkinExtensions($requiredSkinExtensions)
+#set ($discard = $response.setHeader('X-XWIKI-HTML-HEAD', $requiredSkinExtensions))
 {{/html}}
 {{/velocity}}</content>
 </xwikidoc>