Skip to content

Commit

Permalink
System: replaced the legacy Thickbox library with an AJAX-based modal…
Browse files Browse the repository at this point in the history
… window (#1854)
  • Loading branch information
SKuipers authored Sep 30, 2024
1 parent c042092 commit 2ea1820
Show file tree
Hide file tree
Showing 12 changed files with 85 additions and 179 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ v28.0.00
Reports: fixed Scan Asset Directories failing to create template folder if it does not exist
Timetable: fixed permission checking before displaying user status info in View Timetables list
System Admin: fixed the sanitization rules for application form fields to allow HTML

Deprecations
System: replaced the legacy Thickbox library with an AJAX-based modal window

v27.0.01
--------
Expand Down
8 changes: 1 addition & 7 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,6 @@
'dateFormat' => str_replace('yyyy', 'yy', $session->get('i18n')['dateFormat']),
'firstDay' => $session->get('firstDayOfTheWeek') == 'Monday'? 1 : ($session->get('firstDayOfTheWeek') == 'Saturday' ? 6 : 0),
],
'thickbox' => [
'pathToImage' => $session->get('absoluteURL').'/lib/thickbox/loadingAnimation.gif',
],
'tinymce' => [
'valid_elements' => $settingGateway->getSettingByScope('System', 'allowableHTML'),
]
Expand Down Expand Up @@ -344,11 +341,9 @@
}

// Set page scripts: foot - misc
$thickboxInline = 'var tb_pathToImage="'.$session->get('absoluteURL').'/lib/thickbox/loadingAnimation.gif";';
$page->scripts->add('thickboxi', $thickboxInline, ['type' => 'inline']);
$page->scripts->addMultiple([
'thickbox' => 'lib/thickbox/thickbox-compressed.js',
'tinymce' => 'lib/tinymce/tinymce.min.js',
'alpineFocus' => 'lib/htmx/alpine.focus.min.js',
'alpine' => 'lib/htmx/alpine.min.js',
], ['context' => 'foot', 'type' => 'defer']);

Expand All @@ -369,7 +364,6 @@
$page->stylesheets->addMultiple([
'jquery-ui' => 'lib/jquery-ui/css/blitzer/jquery-ui.css',
'jquery-time' => 'lib/jquery-timepicker/jquery.timepicker.css',
'thickbox' => 'lib/thickbox/thickbox.css',
], ['weight' => -1]);

// Add right-to-left stylesheet
Expand Down
15 changes: 15 additions & 0 deletions lib/htmx/alpine.focus.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed lib/thickbox/loadingAnimation.gif
Binary file not shown.
Binary file removed lib/thickbox/macFFBgHack.png
Binary file not shown.
Loading

0 comments on commit 2ea1820

Please sign in to comment.