1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00

Bootstrap upgraded to v5.1.1

This commit is contained in:
Cameron
2021-09-13 18:05:35 -07:00
parent 5860d23882
commit 48ace946f4
4 changed files with 64 additions and 12 deletions

View File

@@ -239,9 +239,18 @@ class e_jsmanager
} }
else // Front-End. else // Front-End.
{ {
e107::library('load', 'jquery'); if(defset('e_DEBUG_JQUERY') === 3)
// jQuery Once is used in e107.behaviors. {
e107::library('load', 'jquery.once'); e107::library('load', 'cdn.jquery3');
}
else
{
e107::library('load', 'jquery');
// jQuery Once is used in e107.behaviors.
e107::library('load', 'jquery.once');
}
} }
// TODO // TODO

View File

@@ -47,9 +47,12 @@ class core_library
{ {
$libraries = array(); $libraries = array();
// jQuery (CDN). // jQuery (CDN).
$libraries['cdn.jquery'] = array( $libraries['cdn.jquery'] = array(
'name' => 'jQuery (CDN)', 'name' => 'jQuery 2 (CDN)',
'vendor_url' => 'https://jquery.com/', 'vendor_url' => 'https://jquery.com/',
'version_arguments' => array( 'version_arguments' => array(
'file' => 'jquery.min.js', 'file' => 'jquery.min.js',
@@ -85,7 +88,7 @@ class core_library
// jQuery (local). // jQuery (local).
$libraries['jquery'] = array( $libraries['jquery'] = array(
'name' => 'jQuery (local)', 'name' => 'jQuery 2 (local)',
'vendor_url' => 'https://jquery.com/', 'vendor_url' => 'https://jquery.com/',
'version_arguments' => array( 'version_arguments' => array(
'file' => 'dist/jquery.min.js', 'file' => 'dist/jquery.min.js',
@@ -285,6 +288,46 @@ class core_library
); );
// ----------------- jQuery 3 (frontend only) --------------//
// https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js
https://cdn.jsdelivr.net/jquery/npm/jquery@3.6.0/dist/jquery.min.js
$libraries['cdn.jquery3'] = array(
'name' => 'jQuery 3 (CDN)',
'vendor_url' => 'https://jquery.com/',
'version_arguments' => array(
'file' => 'dist/jquery.min.js',
'pattern' => '/jQuery\s+v(\d\.\d\.\d+)/',
'lines' => 5,
),
'files' => array(
'js' => array(
'dist/jquery.min.js' => array(
'zone' => 1,
'type' => 'url',
),
),
),
'variants' => array(
// 'unminified' version for debugging.
'dev' => array(
'files' => array(
'js' => array(
'jquery.js' => array(
'zone' => 1,
'type' => 'url',
),
),
),
),
),
// Override library path to CDN.
'library_path' => 'https://cdn.jsdelivr.net/npm/',
'path' => 'jquery@3.6.0',
'version' => '3.6.0',
);
// ----------------- Bootstrap 5 ---------------------------// // ----------------- Bootstrap 5 ---------------------------//
// Bootstrap (CDN). // Bootstrap (CDN).
@@ -331,9 +374,9 @@ class core_library
), ),
// Override library path to CDN. // Override library path to CDN.
//https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/css/bootstrap.min.css //https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/css/bootstrap.min.css
'library_path' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.1.0', 'library_path' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.1.1',
'path' => '', 'path' => '',
'version' => '5.1.0', 'version' => '5.1.1',
); );
@@ -379,7 +422,7 @@ class core_library
),*/ ),*/
'library_path' => '{e_WEB}lib/bootstrap', 'library_path' => '{e_WEB}lib/bootstrap',
'path' => '5', 'path' => '5',
'version' => '5.1.0', 'version' => '5.1.1',
); );

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long