blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-25999/SearchbarStudent

Browse Source
This commit is contained in:
Harald Bamberger
2024-12-12 14:55:41 +01:00
parent 3039fd2a1e d0266e7ef0
commit 80222b7186
4 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/javascript.php
+7
View File
@@ -0,0 +1,7 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
// use vuejs dev version
$config['use_vuejs_dev_version'] = false;
// use bundled javascript
$config['use_bundled_javascript'] = false;
application/views/templates/FHC-Footer.php
+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');
}