mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-02 01:52:10 +09:00
Merge branch 'rhymix:master' into master
This commit is contained in:
commit
25f6d02677
27 changed files with 945 additions and 1153 deletions
|
|
@ -7,8 +7,8 @@ class HTMLDisplayHandler
|
|||
*/
|
||||
public const JQUERY_V2 = '2.2.4';
|
||||
public const JQUERY_V2_MIGRATE = '1.4.1';
|
||||
public const JQUERY_V3 = '3.6.3';
|
||||
public const JQUERY_V3_MIGRATE = '3.4.0';
|
||||
public const JQUERY_V3 = '3.7.1';
|
||||
public const JQUERY_V3_MIGRATE = '3.6.0';
|
||||
|
||||
/**
|
||||
* Default viewport setting
|
||||
|
|
@ -746,7 +746,8 @@ class HTMLDisplayHandler
|
|||
*/
|
||||
private function _loadCommonJSCSS()
|
||||
{
|
||||
if (config('view.jquery_version') === 3)
|
||||
$jquery_version = config('view.jquery_version') ?: 2;
|
||||
if ($jquery_version == 3)
|
||||
{
|
||||
$jquery_version = self::JQUERY_V3;
|
||||
$jquery_migrate_version = self::JQUERY_V3_MIGRATE;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue