Merge pull request #3066 from splitbrain/jquery-update

jQuery Update and jQuery Migrate removal
dokuwiki · May 4, 2020 · a131d86 · a131d86
2 parents c8cc405 + dce2182
commit a131d86
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 16 deletions.
diff --git a/inc/confutils.php b/inc/confutils.php
@@ -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']

diff --git a/lib/exe/jquery.php b/lib/exe/jquery.php
@@ -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__;

diff --git a/lib/scripts/jquery/jquery-migrate.min.js b/lib/scripts/jquery/jquery-migrate.min.js
diff --git a/lib/scripts/jquery/jquery.min.js b/lib/scripts/jquery/jquery.min.js
diff --git a/lib/scripts/jquery/update.sh b/lib/scripts/jquery/update.sh
@@ -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

diff --git a/lib/scripts/jquery/versions b/lib/scripts/jquery/versions
@@ -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