Using unified names

diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index dd6ed89c1aad866f1728337b0eb55d71b7167033..2971d951b2accf590dc1adc396e64527e9a4ef8b 100644 (file)
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -11,11 +11,11 @@
        var URL_LEGACY_MODE = {if URL_LEGACY_MODE}true{else}false{/if};
 </script>
 
-{js application='wcf' file='require' bundle='WCF.Core' core='true'}
-{js application='wcf' file='require.config' bundle='WCF.Core' core='true'}
-{js application='wcf' file='require.linearExecution' bundle='WCF.Core' core='true'}
-{js application='wcf' file='wcf.globalHelper' bundle='WCF.Core' core='true'}
-{js application='wcf' file='closest' bundle='WCF.Core' core='true'}
+{js application='wcf' file='require' bundle='WoltLabSuite.Core' core='true'}
+{js application='wcf' file='require.config' bundle='WoltLabSuite.Core' core='true'}
+{js application='wcf' file='require.linearExecution' bundle='WoltLabSuite.Core' core='true'}
+{js application='wcf' file='wcf.globalHelper' bundle='WoltLabSuite.Core' core='true'}
+{js application='wcf' file='closest' bundle='WoltLabSuite.Core' core='true'}
 <script>
 requirejs.config({
        baseUrl: '{@$__wcf->getPath()}js'

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 4fffd05621febe6c096be0b5aaa6b60dbafa581d..fdb3a3074ddb328dc9903629434150e4b7d2a22b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -25,10 +25,10 @@
                var URL_LEGACY_MODE = false;
        </script>
        
-       {js application='wcf' file='require' bundle='WCF.Core' core='true'}
-       {js application='wcf' file='require.config' bundle='WCF.Core' core='true'}
-       {js application='wcf' file='require.linearExecution' bundle='WCF.Core' core='true'}
-       {js application='wcf' file='wcf.globalHelper' bundle='WCF.Core' core='true'}
+       {js application='wcf' file='require' bundle='WoltLabSuite.Core' core='true'}
+       {js application='wcf' file='require.config' bundle='WoltLabSuite.Core' core='true'}
+       {js application='wcf' file='require.linearExecution' bundle='WoltLabSuite.Core' core='true'}
+       {js application='wcf' file='wcf.globalHelper' bundle='WoltLabSuite.Core' core='true'}
        <script>
                requirejs.config({
                        baseUrl: '{@$__wcf->getPath()}js'

diff --git a/wcfsetup/install/files/js/require.build.js b/wcfsetup/install/files/js/require.build.js
index a469ff3c3baf34f07734ac00cfc9d7585bb984a5..319ddac47321926be2221ff862f1d3a190d1e8f6 100644 (file)
--- a/wcfsetup/install/files/js/require.build.js
+++ b/wcfsetup/install/files/js/require.build.js
@@ -3,7 +3,7 @@
        config = {
                mainConfigFile: 'require.config.js',
                name: "WoltLabSuite/_Meta",
-               out: "WCF.Core.min.js",
+               out: "WoltLabSuite.Core.min.js",
                useStrict: true,
                preserveLicenseComments: false,
                optimize: 'uglify2',