Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Languages/en_US/Help.php
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
$helptxt['disallow_sendBody'] = 'This setting removes the option to receive the text of replies, posts, and personal messages in notification emails.<br><br>Often, members will reply to the notification email, which in most cases means the webmaster receives the reply.';
$helptxt['enable_ajax_alerts'] = 'This option allows your members to receive AJAX notifications. This means that members do not need to refresh the page to get new notifications.<br><strong>NOTE:</strong> This option might cause a severe load at your server with many users online.';
$helptxt['alerts_auto_purge'] = 'Once an alert has been read, it is rarely needed again. For performance reasons, it is a good idea to automatically delete them after a while.';
$helptxt['jquery_source'] = 'This will determine the source used to load the jQuery Library. <em>Google CDN, jQuery CDN</em> and <em>Microsoft CDN</em> will load the jQuery library from those respective CDN networks. <em>Local</em> will only use the local source. <em>Custom</em> allows you to specify a custom URL for the library.';
$helptxt['jquery_source'] = 'This will determine the source used to load the jQuery Library. <em>Cloudflare CDN (cdnjs), Google CDN, jQuery CDN</em> and <em>Microsoft CDN</em> will load the jQuery library from those respective CDN networks. <em>Local</em> will only use the local source. <em>Custom</em> allows you to specify a custom URL for the library.';
$helptxt['compactTopicPagesEnable'] = 'This will just show a selection of the number of pages.<br><em>Example:</em>
&quot;3&quot; to display: 1 ... 4 [5] 6 ... 9 <br>
&quot;5&quot; to display: 1 ... 3 4 [5] 6 7 ... 9';
Expand Down
1 change: 1 addition & 0 deletions Languages/en_US/ManageSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
$txt['jquery_custom_label'] = 'Custom';
$txt['jquery_custom'] = 'Custom URL to the jQuery Library';
$txt['jquery_local'] = 'Local';
$txt['jquery_cloudflare_cdn'] = 'Cloudflare CDN (cdnjs)';
$txt['jquery_google_cdn'] = 'Google CDN';
$txt['jquery_jquery_cdn'] = 'jQuery CDN';
$txt['jquery_microsoft_cdn'] = 'Microsoft CDN';
Expand Down
1 change: 1 addition & 0 deletions Sources/Actions/Admin/Features.php
Original file line number Diff line number Diff line change
Expand Up @@ -1573,6 +1573,7 @@ public static function basicConfigVars(): array
'jquery_source',
[
'cdn' => Lang::getTxt('jquery_google_cdn', file: 'ManageSettings'),
'cloudflare_cdn' => Lang::getTxt('jquery_cloudflare_cdn', file: 'ManageSettings'),
'jquery_cdn' => Lang::getTxt('jquery_jquery_cdn', file: 'ManageSettings'),
'microsoft_cdn' => Lang::getTxt('jquery_microsoft_cdn', file: 'ManageSettings'),
'local' => Lang::getTxt('jquery_local', file: 'ManageSettings'),
Expand Down
1 change: 1 addition & 0 deletions Sources/Theme.php
Original file line number Diff line number Diff line change
Expand Up @@ -2229,6 +2229,7 @@ protected function loadJavaScript(): void
// Add the JQuery library to the list of files to load.
$jQueryUrls = [
'cdn' => 'https://ajax.googleapis.com/ajax/libs/jquery/' . JQUERY_VERSION . '/jquery.min.js',
'cloudflare_cdn' => 'https://cdnjs.cloudflare.com/ajax/libs/' . JQUERY_VERSION . '/jquery.min.js',
'jquery_cdn' => 'https://code.jquery.com/jquery-' . JQUERY_VERSION . '.min.js',
'microsoft_cdn' => 'https://ajax.aspnetcdn.com/ajax/jQuery/jquery-' . JQUERY_VERSION . '.min.js',
];
Expand Down