Skip to content

refactor scripts #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonLeary42 merged 4 commits into from
Dec 29, 2025
Merged

refactor scripts #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0ed81f
refactor scripts
simonLeary42 Dec 29, 2025
4dd5704
ckeditor is not minified
simonLeary42 Dec 29, 2025
486960f
load jquery first
simonLeary42 Dec 29, 2025
d117078
put back modal where it was
simonLeary42 Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
"copyFiles": [
{
"from": "node_modules/jquery/dist/jquery.min.js",
"to": "webroot/js/jquery-3.7.1.min.js"
"to": "webroot/js/jquery.min.js"
},
{
"from": "node_modules/ckeditor5/dist/browser/ckeditor5.umd.js",
"to": "webroot/js/ckeditor5-47.3.0.min.js"
"to": "webroot/js/ckeditor5.umd.js"
},
{
"from": "node_modules/ckeditor5/dist/browser/ckeditor5.css",
"to": "webroot/css/ckeditor5-47.3.0.css"
"to": "webroot/css/ckeditor5.css"
}
]
}
2 changes: 1 addition & 1 deletion resources/templates/footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</body>
<?php
foreach (["filter", "sort", "global-late", "tables", "messages"] as $x) {
$url = getURL("js/$x.js?v=" . CONFIG["upstream"]["version"]);
$url = getURL("js/$x.js?cache_bust_increment_me=" . CONFIG["upstream"]["version"]);
echo "<script src='$url'></script>";
}
?>
Expand Down
32 changes: 11 additions & 21 deletions resources/templates/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,12 @@
<html lang="en">

<head>
<script
src="<?php echo getURL("js/jquery-3.7.1.min.js"); ?>"
integrity="sha384-1H217gwSVyLSIfaLxHbE7dRb3v4mYCKbpQvzx0cegeju1MVsGrX5xXxAvs/HgeFs"
crossorigin="anonymous"
>
</script>
<script
src="<?php echo getURL("js/ckeditor5-47.3.0.min.js"); ?>"
integrity="sha384-vfrZDzuxNDOwwU8jB6WLBRm2Y37beBm82JEKPRi7i0ntHlWOiXcKCD/d9TEJldOb"
crossorigin="anonymous"
>
</script>
<link rel='stylesheet' type='text/css' href='<?php echo getURL("css/ckeditor5-47.3.0.css") ?>' />
<?php
foreach (["jquery.min", "global-early", "ckeditor5.umd"] as $x) {
$url = getURL("js/$x.js?cache_bust_increment_me=" . CONFIG["upstream"]["version"]);
echo "<script src='$url'></script>";
}
?>
<style>
<?php
// set global css variables from branding
Expand All @@ -61,8 +54,8 @@
</style>

<?php
foreach (["global", "navbar", "modal", "tables", "filters", "messages"] as $x) {
$url = getURL("css/$x.css?v=" . CONFIG["upstream"]["version"]);
foreach (["global", "navbar", "modal", "tables", "filters", "messages", "ckeditor5"] as $x) {
$url = getURL("css/$x.css?cache_bust_increment_me=" . CONFIG["upstream"]["version"]);
echo "<link rel='stylesheet' type='text/css' href='$url' />";
}
?>
Expand Down Expand Up @@ -142,12 +135,9 @@
<div class="modalBody"></div>
</div>
</div>
<?php
foreach (["modal", "global-early"] as $x) {
$url = getURL("js/$x.js?v=" . CONFIG["upstream"]["version"]);
echo "<script src='$url'></script>";
}
?>
<script
src="<?php echo getURL("js/modal.js?cache_bust_increment_me=" . CONFIG["upstream"]["version"]) ?>"
></script>
<main>

<?php
Expand Down