Fix duplicate inclusion of `WCF.Combined` via AJAX form builder forms

diff --git a/com.woltlab.wcf/templates/__labelFormField.tpl b/com.woltlab.wcf/templates/__labelFormField.tpl
index e683b7a9bcd6ad7418e500ceb1b80d520c5d5de1..13068c1c5abdf25a6eceade6e40b63543ca5e9d2 100644 (file)
--- a/com.woltlab.wcf/templates/__labelFormField.tpl
+++ b/com.woltlab.wcf/templates/__labelFormField.tpl
@@ -25,7 +25,6 @@
        </select>
 </noscript>
 
-{js application='wcf' file='WCF.Label' bundle='WCF.Combined'}
 <script data-relocate="true">
        require(['Dom/Util', 'Language', 'WoltLabSuite/Core/Form/Builder/Field/Controller/Label'], function(DomUtil, Language, FormBuilderFieldLabel) {
                Language.addObject({

diff --git a/com.woltlab.wcf/templates/__pollOptionsFormField.tpl b/com.woltlab.wcf/templates/__pollOptionsFormField.tpl
index b582ffde8947fef8564966842ef72599b939dcf1..218c479c99f7734f26ef037d7c305bd7676cbf15 100644 (file)
--- a/com.woltlab.wcf/templates/__pollOptionsFormField.tpl
+++ b/com.woltlab.wcf/templates/__pollOptionsFormField.tpl
@@ -4,7 +4,6 @@
 
 {include file='__formFieldFooter'}
 
-{js application='wcf' file='WCF.Poll' bundle='WCF.Combined'}
 <script data-relocate="true">
        require(['Dom/Traverse', 'Dom/Util', 'Language', 'WoltLabSuite/Core/Ui/Poll/Editor'], function(DomTraverse, DomUtil, Language, UiPollEditor) {
                Language.addObject({

diff --git a/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl b/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
index 7061590169f2414bcd3ddd6654fcca5dc68b2c3e..0b434700f68ed7fe751118993abb6ee63c562f0d 100644 (file)
--- a/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
+++ b/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
@@ -41,7 +41,6 @@
 </ul>
 <div id="{@$field->getPrefixedID()}_uploadButton" class="formAttachmentButtons" data-max-size="{@$field->getAttachmentHandler()->getMaxSize()}"></div>
 
-{js application='wcf' file='WCF.Attachment' bundle='WCF.Combined'}
 <script data-relocate="true">
        $(function() {
                WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/__wysiwygFormField.tpl b/com.woltlab.wcf/templates/__wysiwygFormField.tpl
index d53f7707fcf69048a3910bc630d7e857d23b5871..4be47d081246fd07f201b76c7d015fa23237a3d4 100644 (file)
--- a/com.woltlab.wcf/templates/__wysiwygFormField.tpl
+++ b/com.woltlab.wcf/templates/__wysiwygFormField.tpl
@@ -17,7 +17,6 @@
 {include file='wysiwyg' wysiwygSelector=$field->getPrefixedId()}
 
 {if $field->supportsQuotes()}
-       {js application='wcf' file='WCF.Message' bundle='WCF.Combined'}
        <script data-relocate="true">
                // Bootstrap for window.__wcf_bc_eventHandler
                require(['WoltLabSuite/Core/Bootstrap'], function(Bootstrap) {

diff --git a/com.woltlab.wcf/templates/__wysiwygTabMenuFormContainer.tpl b/com.woltlab.wcf/templates/__wysiwygTabMenuFormContainer.tpl
index 70cfabaed26e97d0fef4543a25cefd19b3e047bc..b42ab774da89ceed7eb06371a002dea2157324d3 100644 (file)
--- a/com.woltlab.wcf/templates/__wysiwygTabMenuFormContainer.tpl
+++ b/com.woltlab.wcf/templates/__wysiwygTabMenuFormContainer.tpl
@@ -1,6 +1,5 @@
 {include file='__tabMenuFormContainer' __tabMenuCSSClassName='messageTabMenuNavigation'}
 
-{js application='wcf' file='WCF.Message' bundle='WCF.Combined'}
 <script data-relocate="true">
        $(function() {
                $('#{@$container->getPrefixedId()}Container').messageTabMenu();

diff --git a/wcfsetup/install/files/acp/templates/__labelFormField.tpl b/wcfsetup/install/files/acp/templates/__labelFormField.tpl
index e683b7a9bcd6ad7418e500ceb1b80d520c5d5de1..13068c1c5abdf25a6eceade6e40b63543ca5e9d2 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__labelFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__labelFormField.tpl
@@ -25,7 +25,6 @@
        </select>
 </noscript>
 
-{js application='wcf' file='WCF.Label' bundle='WCF.Combined'}
 <script data-relocate="true">
        require(['Dom/Util', 'Language', 'WoltLabSuite/Core/Form/Builder/Field/Controller/Label'], function(DomUtil, Language, FormBuilderFieldLabel) {
                Language.addObject({

diff --git a/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl b/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl
index b582ffde8947fef8564966842ef72599b939dcf1..218c479c99f7734f26ef037d7c305bd7676cbf15 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl
@@ -4,7 +4,6 @@
 
 {include file='__formFieldFooter'}
 
-{js application='wcf' file='WCF.Poll' bundle='WCF.Combined'}
 <script data-relocate="true">
        require(['Dom/Traverse', 'Dom/Util', 'Language', 'WoltLabSuite/Core/Ui/Poll/Editor'], function(DomTraverse, DomUtil, Language, UiPollEditor) {
                Language.addObject({

diff --git a/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl b/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
index 7061590169f2414bcd3ddd6654fcca5dc68b2c3e..0b434700f68ed7fe751118993abb6ee63c562f0d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
@@ -41,7 +41,6 @@
 </ul>
 <div id="{@$field->getPrefixedID()}_uploadButton" class="formAttachmentButtons" data-max-size="{@$field->getAttachmentHandler()->getMaxSize()}"></div>
 
-{js application='wcf' file='WCF.Attachment' bundle='WCF.Combined'}
 <script data-relocate="true">
        $(function() {
                WCF.Language.addObject({

diff --git a/wcfsetup/install/files/acp/templates/__wysiwygFormField.tpl b/wcfsetup/install/files/acp/templates/__wysiwygFormField.tpl
index d53f7707fcf69048a3910bc630d7e857d23b5871..4be47d081246fd07f201b76c7d015fa23237a3d4 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__wysiwygFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__wysiwygFormField.tpl
@@ -17,7 +17,6 @@
 {include file='wysiwyg' wysiwygSelector=$field->getPrefixedId()}
 
 {if $field->supportsQuotes()}
-       {js application='wcf' file='WCF.Message' bundle='WCF.Combined'}
        <script data-relocate="true">
                // Bootstrap for window.__wcf_bc_eventHandler
                require(['WoltLabSuite/Core/Bootstrap'], function(Bootstrap) {

diff --git a/wcfsetup/install/files/acp/templates/__wysiwygTabMenuFormContainer.tpl b/wcfsetup/install/files/acp/templates/__wysiwygTabMenuFormContainer.tpl
index 70cfabaed26e97d0fef4543a25cefd19b3e047bc..b42ab774da89ceed7eb06371a002dea2157324d3 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__wysiwygTabMenuFormContainer.tpl
+++ b/wcfsetup/install/files/acp/templates/__wysiwygTabMenuFormContainer.tpl
@@ -1,6 +1,5 @@
 {include file='__tabMenuFormContainer' __tabMenuCSSClassName='messageTabMenuNavigation'}
 
-{js application='wcf' file='WCF.Message' bundle='WCF.Combined'}
 <script data-relocate="true">
        $(function() {
                $('#{@$container->getPrefixedId()}Container').messageTabMenu();

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 78670fdf118b761f1e850523751516865d7d6513..a4297de8de2df571f8d664afbdd6e3ab6d18c6d4 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -177,6 +177,10 @@
                $.holdReady(true);
                WCF.User.init({$__wcf->user->userID}, '{@$__wcf->user->username|encodeJS}');
        </script>
+       {js application='wcf' file='WCF.Attachment' bundle='WCF.Combined'}
+       {js application='wcf' file='WCF.Message' bundle='WCF.Combined'}
+       {js application='wcf' file='WCF.Label' bundle='WCF.Combined'}
+       {js application='wcf' file='WCF.Poll' bundle='WCF.Combined'}
        <script>
                $(function() {
                        if (jQuery.browser.touch) $('html').addClass('touch');