Merge branch 'master' into feature-53599/Eingabe_von_Bankdaten_durch_Studierende

This commit is contained in:
Paolo
2024-12-12 21:10:58 +01:00
10 changed files with 85 additions and 45 deletions
+11 -1
View File
@@ -13,6 +13,9 @@
$calledPath = $this->router->directory.$this->router->class;
$calledMethod = $this->router->method;
$this->load->config('javascript');
$use_vuejs_dev_version = $this->config->item('use_vuejs_dev_version');
// By default set the parameters to null
$customJSs = isset($customJSs) ? $customJSs : null;
$customJSModules = isset($customJSModules) ? $customJSModules : null;
@@ -110,7 +113,14 @@
// Vue 3 JS
if ($vue3 === true)
{
generateJSsInclude('vendor/vuejs/vuejs3/vue.global.prod.js');
if($use_vuejs_dev_version && $use_vuejs_dev_version === true)
{
generateJSsInclude('vendor/vuejs/vuejs3_dev/vue.global.js');
}
else
{
generateJSsInclude('vendor/vuejs/vuejs3/vue.global.prod.js');
}
generateJSsInclude('vendor/vuejs/vuerouter4/vue-router.global.js');
}