Skip to content

Commit

Permalink
bump staticfile dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
djbrown committed Sep 26, 2019
1 parent 0b736d6 commit af75980
Show file tree
Hide file tree
Showing 28 changed files with 604 additions and 9,063 deletions.
24 changes: 12 additions & 12 deletions src/base/jinja2/base/base.j2
Expand Up @@ -12,10 +12,10 @@

{% block styles %}
<link rel="stylesheet" href="{{ static('base/styles/base.css') }}">
<link rel="stylesheet" href="{{ static('base/styles/bootstrap-4.1.1.min.css') }}">
<link rel="stylesheet" href="{{ static('base/styles/datatables-1.10.16.min.css') }}">
<link rel="stylesheet" href="{{ static('base/styles/animate.css') }}">
<link rel="stylesheet" href="{{ static('base/styles/cookieconsent-3.0.3.min.css') }}">
<link rel="stylesheet" href="{{ static('base/styles/bootstrap-4.3.1.min.css') }}">
<link rel="stylesheet" href="{{ static('base/styles/datatables-1.10.18.min.css') }}">
<link rel="stylesheet" href="{{ static('base/styles/animate-3.7.2.min.css') }}">
<link rel="stylesheet" href="{{ static('base/styles/cookieconsent-3.1.1.min.css') }}">
{% endblock %}

{% if MATOMO_URL %}
Expand Down Expand Up @@ -89,14 +89,14 @@
</footer>

{% block scripts %}
<script src="{{ static('base/scripts/jquery-3.3.1.min.js') }}"></script>
<script src="{{ static('base/scripts/popper-1.12.9.min.js') }}"></script>
<script src="{{ static('base/scripts/bootstrap-4.1.1.min.js') }}"></script>
<script src="{{ static('base/scripts/fontawesome-all-5.0.13.min.js') }}"></script>
<script src="{{ static('base/scripts/moment-2.22.1.js') }}"></script>
<script src="{{ static('base/scripts/cookieconsent-3.0.3.min.js') }}"></script>
<script src="{{ static('base/scripts/datatables-1.10.16.min.js') }}"></script>
<script src="{{ static('base/scripts/datatables-datetime-moment-1.10.16.js') }}"></script>
<script src="{{ static('base/scripts/jquery-3.4.1.min.js') }}"></script>
<script src="{{ static('base/scripts/popper-1.15.0.min.js') }}"></script>
<script src="{{ static('base/scripts/bootstrap-4.3.1.min.js') }}"></script>
<script src="{{ static('base/scripts/fa-all-5.11.2.min.js') }}"></script>
<script src="{{ static('base/scripts/moment-2.24.0.min.js') }}"></script>
<script src="{{ static('base/scripts/cookieconsent-3.1.1.min.js') }}"></script>
<script src="{{ static('base/scripts/datatables-1.10.18.min.js') }}"></script>
<script src="{{ static('base/scripts/datatables-datetime-moment-1.10.18.js') }}"></script>

<script src="{{ static('base/scripts/datatables-config.js') }}"></script>
{#<script src="{{ static('base/scripts/cookieconsent-config.js') }}"></script>#}
Expand Down
6 changes: 0 additions & 6 deletions src/base/static/base/scripts/bootstrap-4.1.1.min.js

This file was deleted.

7 changes: 7 additions & 0 deletions src/base/static/base/scripts/bootstrap-4.3.1.min.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/base/static/base/scripts/cookieconsent-3.0.3.min.js

This file was deleted.

1 change: 1 addition & 0 deletions src/base/static/base/scripts/cookieconsent-3.1.1.min.js

Large diffs are not rendered by default.

522 changes: 0 additions & 522 deletions src/base/static/base/scripts/datatables-1.10.16.min.js

This file was deleted.

367 changes: 367 additions & 0 deletions src/base/static/base/scripts/datatables-1.10.18.min.js

Large diffs are not rendered by default.

52 changes: 0 additions & 52 deletions src/base/static/base/scripts/datatables-datetime-moment-1.10.16.js

This file was deleted.

74 changes: 74 additions & 0 deletions src/base/static/base/scripts/datatables-datetime-moment-1.10.18.js
@@ -0,0 +1,74 @@
/**
* This plug-in for DataTables represents the ultimate option in extensibility
* for sorting date / time strings correctly. It uses
* [Moment.js](http://momentjs.com) to create automatic type detection and
* sorting plug-ins for DataTables based on a given format. This way, DataTables
* will automatically detect your temporal information and sort it correctly.
*
* For usage instructions, please see the DataTables blog
* post that [introduces it](//datatables.net/blog/2014-12-18).
*
* @name Ultimate Date / Time sorting
* @summary Sort date and time in any format using Moment.js
* @author [Allan Jardine](//datatables.net)
* @depends DataTables 1.10+, Moment.js 1.7+
*
* @example
* $.fn.dataTable.moment( 'HH:mm MMM D, YY' );
* $.fn.dataTable.moment( 'dddd, MMMM Do, YYYY' );
*
* $('#example').DataTable();
*/

(function (factory) {
if (typeof define === "function" && define.amd) {
define(["jquery", "moment", "datatables.net"], factory);
} else {
factory(jQuery, moment);
}
}(function ($, moment) {

$.fn.dataTable.moment = function ( format, locale ) {
var types = $.fn.dataTable.ext.type;

// Add type detection
types.detect.unshift( function ( d ) {
if ( d ) {
// Strip HTML tags and newline characters if possible
if ( d.replace ) {
d = d.replace(/(<.*?>)|(\r?\n|\r)/g, '');
}

// Strip out surrounding white space
d = $.trim( d );
}

// Null and empty values are acceptable
if ( d === '' || d === null ) {
return 'moment-'+format;
}

return moment( d, format, locale, true ).isValid() ?
'moment-'+format :
null;
} );

// Add sorting method - use an integer for the sorting
types.order[ 'moment-'+format+'-pre' ] = function ( d ) {
if ( d ) {
// Strip HTML tags and newline characters if possible
if ( d.replace ) {
d = d.replace(/(<.*?>)|(\r?\n|\r)/g, '');
}

// Strip out surrounding white space
d = $.trim( d );
}

return !moment(d, format, locale, true).isValid() ?
Infinity :
parseInt( moment( d, format, locale, true ).format( 'x' ), 10 );
};
};

}));
5 changes: 5 additions & 0 deletions src/base/static/base/scripts/fa-all-5.11.2.min.js

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions src/base/static/base/scripts/fontawesome-all-5.0.13.min.js

This file was deleted.

2 changes: 0 additions & 2 deletions src/base/static/base/scripts/jquery-3.3.1.min.js

This file was deleted.

2 changes: 2 additions & 0 deletions src/base/static/base/scripts/jquery-3.4.1.min.js

Large diffs are not rendered by default.

0 comments on commit af75980

Please sign in to comment.