extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

* WebAuthN: fix not working registration of new authentication devices or browsers

Browse Source 
generally prefer app.min.js over old, pre RollupJS app.js
This commit is contained in:
ralf 2023-03-23 11:55:17 +01:00
parent 81eb6ccb6e
commit 4ec4ddb2a1
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/Framework.php
View File

@ -1479,6 +1479,13 @@ abstract class Framework extends Framework\Extra
*/
static function includeJS($package, $file=null, $app='api', $append=true)
{
// prefer app.min.js over old, pre RollupJS app.js
if ($package[0] === '/' && substr($package, -7) === '/app.js' &&
self::$js_include_mgr->include_js_file(substr($package, 0, -3).'.min.js', $file, $app, $append) ||
$file === 'app' && self::$js_include_mgr->include_js_file($package, 'app.min', $app, $append))
{
return;
}
self::$js_include_mgr->include_js_file($package, $file, $app, $append);
}