Skip to content
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

Jump to bottom

jQuery Update and jQuery Migrate removal #3066

Merged
merged 2 commits into from May 4, 2020
Merged

jQuery Update and jQuery Migrate removal #3066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6086afb
Update jQuery to 3.5.0 and Migrate to 3.2.0
splitbrain May 1, 2020
dce2182
remove jQuery Migrate as outlined in #1546
splitbrain May 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions inc/confutils.php
View file
Open in desktop
Expand Up @@ -155,17 +155,12 @@ function getCdnUrls() {
$src[] = DOKU_BASE . 'lib/exe/jquery.php' . '?tseed=' . $jqmod;
} elseif($conf['jquerycdn'] == 'jquery') {
$src[] = sprintf('https://code.jquery.com/jquery-%s.min.js', $versions['JQ_VERSION']);
$src[] = sprintf('https://code.jquery.com/jquery-migrate-%s.min.js', $versions['JQM_VERSION']);
$src[] = sprintf('https://code.jquery.com/ui/%s/jquery-ui.min.js', $versions['JQUI_VERSION']);
} elseif($conf['jquerycdn'] == 'cdnjs') {
$src[] = sprintf(
'https://cdnjs.cloudflare.com/ajax/libs/jquery/%s/jquery.min.js',
$versions['JQ_VERSION']
);
$src[] = sprintf(
'https://cdnjs.cloudflare.com/ajax/libs/jquery-migrate/%s/jquery-migrate.min.js',
$versions['JQM_VERSION']
);
$src[] = sprintf(
'https://cdnjs.cloudflare.com/ajax/libs/jqueryui/%s/jquery-ui.min.js',
$versions['JQUI_VERSION']
Expand Down
1 change: 0 additions & 1 deletion lib/exe/jquery.php
View file
Open in desktop
Expand Up @@ -25,7 +25,6 @@ function jquery_out() {
$files = array(
DOKU_INC . 'lib/scripts/jquery/jquery.min.js',
DOKU_INC . 'lib/scripts/jquery/jquery-ui.min.js',
DOKU_INC . 'lib/scripts/jquery/jquery-migrate.min.js',
);
$cache_files = $files;
$cache_files[] = __FILE__;
Expand Down
2 changes: 0 additions & 2 deletions lib/scripts/jquery/jquery-migrate.min.js
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions lib/scripts/jquery/jquery.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions lib/scripts/jquery/update.sh
View file
Open in desktop
Expand Up @@ -17,8 +17,6 @@ JQUI_GIT="https://raw.githubusercontent.com/jquery/jquery-ui/$JQUI_VERSION/ui"
wget -nv https://code.jquery.com/jquery-${JQ_VERSION}.min.js -O jquery.min.js
# load jQuery-UI
wget -nv "$JQUI_HOST/jquery-ui.min.js" -O jquery-ui.min.js
# load jQuery Migrate
wget -nv https://code.jquery.com/jquery-migrate-${JQM_VERSION}.min.js -O jquery-migrate.min.js

# load the smoothness theme
mkdir -p jquery-ui-theme/images
Expand Down
3 changes: 1 addition & 2 deletions lib/scripts/jquery/versions
View file
Open in desktop
@@ -1,4 +1,3 @@
# this is loaded from the update.sh script and our PHP code
JQ_VERSION=3.1.1
JQ_VERSION=3.5.0
JQUI_VERSION=1.12.1
JQM_VERSION=3.0.0