From ac042511eae31f3fe3254382249f32b28aac55f0 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 25 May 2021 17:53:12 +0200 Subject: [PATCH] switch to vanillajs-datepicker see https://git.mpib-berlin.mpg.de/castellum/castellum/-/merge_requests/1726 --- package.json | 3 +-- scheduler/main/static/scheduler.js | 4 ++-- scheduler/main/templates/base.html | 6 +++--- scheduler/settings/default.py | 9 ++++----- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 1a9a2ac..32926de 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,6 @@ "version": "1.0.0", "dependencies": { "bootstrap": "^4.5.3", - "bootstrap-datepicker": "^1.9.0", - "jquery": "^3.5.1" + "vanillajs-datepicker": "^1.1.4" } } diff --git a/scheduler/main/static/scheduler.js b/scheduler/main/static/scheduler.js index c26db24..fe56de8 100644 --- a/scheduler/main/static/scheduler.js +++ b/scheduler/main/static/scheduler.js @@ -147,12 +147,12 @@ document.querySelectorAll('[type="date"]').forEach(function(e) { if (e.type !== 'date') { - $(e).datepicker({ + new Datepicker(e, { format: 'yyyy-mm-dd', language: document.documentElement.lang, autoclose: true, calendarWeeks: true, - daysOfWeekHighlighted: '0,6', + daysOfWeekHighlighted: [0, 6], todayHighlight: true, }); } diff --git a/scheduler/main/templates/base.html b/scheduler/main/templates/base.html index 64d5323..5f30359 100644 --- a/scheduler/main/templates/base.html +++ b/scheduler/main/templates/base.html @@ -9,7 +9,7 @@ {% block title %}{{ TITLE }}{% endblock %} - + @@ -41,8 +41,8 @@ - - + + {% block extra_scripts %}{% endblock %} diff --git a/scheduler/settings/default.py b/scheduler/settings/default.py index 193e5e9..f4fe5fa 100644 --- a/scheduler/settings/default.py +++ b/scheduler/settings/default.py @@ -111,12 +111,11 @@ NPM_FILE_PATTERNS = { 'bootstrap': [ 'dist/css/bootstrap.min.css', ], - 'bootstrap-datepicker': [ - 'dist/css/bootstrap-datepicker3.min.css', - 'dist/js/bootstrap-datepicker.min.js', - 'dist/locales/bootstrap-datepicker.de.min.js', + 'vanillajs-datepicker': [ + 'dist/css/datepicker.min.css', + 'dist/js/datepicker.min.js', + 'dist/js/locales/de.js', ], - 'jquery': ['dist/jquery.min.js'], } BOOTSTRAP4 = { -- GitLab