Permalink
Browse files

Merge pull request #2465 from byunite/feature/jquery-update

Feature: update jquery to version 3.3.1 and jquery.tablesorter to 2.31.1
  • Loading branch information...
ozh committed Nov 23, 2018
2 parents 1cfe955 + e7df0dc commit 32874cf2a21059eaee4a6efc7f7437cdc9bc43c0
Showing with 46 additions and 49 deletions.
  1. +3 −2 includes/functions-html.php
  2. +2 −0 js/jquery-3.3.1.min.js
  3. +1 −0 js/jquery-3.tablesorter.min.js
  4. +0 −47 js/jquery.tablesorter.min.js
  5. +40 −0 js/tablesorte.js
@@ -88,7 +88,7 @@ function yourls_html_head( $context = 'index', $title = '' ) {
<meta name="description" content="YOURLS &raquo; Your Own URL Shortener' | <?php yourls_site_url(); ?>" />
<?php yourls_do_action('html_head_meta', $context); ?>
<link rel="shortcut icon" href="<?php yourls_favicon(); ?>" />
<script src="<?php yourls_site_url(); ?>/js/jquery-2.2.4.min.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
<script src="<?php yourls_site_url(); ?>/js/jquery-3.3.1.min.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
<script src="<?php yourls_site_url(); ?>/js/common.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
<script src="<?php yourls_site_url(); ?>/js/jquery.notifybar.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
<link rel="stylesheet" href="<?php yourls_site_url(); ?>/css/style.css?v=<?php echo YOURLS_VERSION; ?>" type="text/css" media="screen" />
@@ -98,7 +98,8 @@ function yourls_html_head( $context = 'index', $title = '' ) {
<?php } ?>
<?php if ( $tablesorter ) { ?>
<link rel="stylesheet" href="<?php yourls_site_url(); ?>/css/tablesorter.css?v=<?php echo YOURLS_VERSION; ?>" type="text/css" media="screen" />
<script src="<?php yourls_site_url(); ?>/js/jquery.tablesorter.min.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
<script src="<?php yourls_site_url(); ?>/js/jquery-3.tablesorter.min.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
<script src="<?php yourls_site_url(); ?>/js/tablesorte.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
<?php } ?>
<?php if ( $insert ) { ?>
<script src="<?php yourls_site_url(); ?>/js/insert.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 32874cf

Please sign in to comment.