Merge branch '64636-rename-cms-js-because-of-caching' into '7.1.x'

ref #64636: rename cms.js because of caching See merge request chameleon-system-oss/chameleon-base!99
chameleon-system · Oct 8, 2024 · 77efeb7 · 77efeb7
2 parents 429bf05 + 29c32e9
commit 77efeb7
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/...Bundle/Resources/public/javascript/cms.js → ...dle/Resources/public/javascript/cms.v1.js b/...Bundle/Resources/public/javascript/cms.js → ...dle/Resources/public/javascript/cms.v1.js
diff --git a/src/CoreBundle/private/library/classes/TCMSMessageManager/TCMSMessageManager.class.php b/src/CoreBundle/private/library/classes/TCMSMessageManager/TCMSMessageManager.class.php
@@ -453,7 +453,7 @@ public function GetClassesForConsumer($sConsumerName, $sDivider = ' ')
 
     /**
      * @param string $id message ID to be translated
-     * @param string $type one of the message types defined in cms.js:toasterMessage()
+     * @param string $type one of the message types defined in cms.v1.js:toasterMessage()
      * @param array $parameters for the message translation
      * @param string $domain for the message translation
      */

diff --git a/src/CoreBundle/private/modules/CMSModuleDocumentChooser/CMSModuleDocumentChooser.class.php b/src/CoreBundle/private/modules/CMSModuleDocumentChooser/CMSModuleDocumentChooser.class.php
@@ -45,7 +45,7 @@ public function GetHtmlHeadIncludes()
     {
         $aIncludes = parent::GetHtmlHeadIncludes();
         // first the includes that are needed for the all fields
-        $aIncludes[] = '<script src="'.TGlobal::GetStaticURLToWebLib('/javascript/cms.js?v=1').'" type="text/javascript"></script>';
+        $aIncludes[] = '<script src="'.TGlobal::GetStaticURLToWebLib('/javascript/cms.v1.js').'" type="text/javascript"></script>';
         $aIncludes[] = '<link href="'.TGlobal::GetPathTheme().'/css/table.css" rel="stylesheet" type="text/css" />';
         $aIncludes[] = '<script src="'.TGlobal::GetStaticURLToWebLib('/javascript/table.js').'" type="text/javascript"></script>';
 

diff --git a/src/CoreBundle/private/modules/CMSTemplateEngine/CMSTemplateEngine.class.php b/src/CoreBundle/private/modules/CMSTemplateEngine/CMSTemplateEngine.class.php
@@ -503,7 +503,7 @@ public function GetHtmlHeadIncludes()
         $aIncludes = array();
         // first the includes that are needed for the all fields
 
-        $aIncludes[] = '<script src="'.TGlobal::GetStaticURLToWebLib('/javascript/cms.js?v=1').'" type="text/javascript"></script>';
+        $aIncludes[] = '<script src="'.TGlobal::GetStaticURLToWebLib('/javascript/cms.v1.js').'" type="text/javascript"></script>';
         $aIncludes[] = '<link href="'.TGlobal::GetPathTheme().'/css/tableeditcontainer.css" rel="stylesheet" type="text/css" />';
         $aIncludes[] = '<script src="'.TGlobal::GetStaticURLToWebLib('/javascript/tableEditor.js').'" type="text/javascript"></script>';
         $aIncludes[] = '<link href="'.TGlobal::GetStaticURLToWebLib('/components/select2.v4/css/select2.min.css').'" media="screen" rel="stylesheet" type="text/css" />';

diff --git a/src/CoreBundle/private/rendering/layouts/includes/cms_footer_data.inc.php b/src/CoreBundle/private/rendering/layouts/includes/cms_footer_data.inc.php
@@ -32,7 +32,7 @@
     <script src="<?= TGlobal::GetStaticURLToWebLib('/components/bootstrap3-typeahead/bootstrap3-typeahead.min.js'); ?>" type="text/javascript"></script>
     <script src="<?= TGlobal::GetStaticURLToWebLib('/javascript/jquery/jquery-form-4.2.2/jquery.form.min.js'); ?>"
             type="text/javascript"></script>
-    <script src="<?= TGlobal::GetStaticURLToWebLib('/javascript/cms.js?v=1'); ?>" type="text/javascript"></script>
+    <script src="<?= TGlobal::GetStaticURLToWebLib('/javascript/cms.v1.js'); ?>" type="text/javascript"></script>
     <?php // Scrollbar JS needs to be loaded before CoreUI?>
     <script src="<?= TGlobal::GetPathTheme(); ?>/coreui/js/perfect-scrollbar.min.js" type="text/javascript"></script>
     <script src="<?= TGlobal::GetPathTheme(); ?>/coreui/js/coreui.min.js" type="text/javascript"></script>