TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Combine jQuery and migrate into the same file (#3919) 

Fixes #3917. This fixes the double alias that was introduced when jquery was updated and migrate was added. Credit to @CptMeatball
This commit is contained in:
Antonie Hogewoning 2018-11-17 23:22:51 +01:00 committed by Luke Towers
parent d64c010e4b
commit 0e9b3ce786
2 changed files with 218 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

217
modules/backend/assets/js/vendor/jquery-and-migrate.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

3
modules/system/classes/CombineAssets.php
View File

@ -147,8 +147,7 @@ class CombineAssets
/*
* Common Aliases
*/
$this->registerAlias('jquery', '~/modules/backend/assets/js/vendor/jquery.min.js');
$this->registerAlias('jquery', '~/modules/backend/assets/js/vendor/jquery-migrate.min.js');
$this->registerAlias('jquery', '~/modules/backend/assets/js/vendor/jquery-and-migrate.min.js');
$this->registerAlias('framework', '~/modules/system/assets/js/framework.js');
$this->registerAlias('framework.extras', '~/modules/system/assets/js/framework.extras.js');
$this->registerAlias('framework.extras', '~/modules/system/assets/css/framework.extras.css');