Merge pull request #62 from lauri-openscop/bootstrap5

monim67 · web-flow · commit 1dd5828a2e54 · 2021-12-01T09:48:25.000+06:00
Bootstrap 5
diff --git a/bootstrap_datepicker_plus/static/bootstrap_datepicker_plus/js/datepicker-widget.js b/bootstrap_datepicker_plus/static/bootstrap_datepicker_plus/js/datepicker-widget.js
@@ -8,6 +8,7 @@
 }(function ($) {
   var datepickerDict = {};
   var isBootstrap4 = $.fn.collapse.Constructor.VERSION.split('.').shift() === "4";
+  var isBootstrap5 = $.fn.collapse.Constructor.VERSION.split('.').shift() == "5";
   function fixMonthEndDate(e, picker) {
     e.date && picker.val().length && picker.val(e.date.endOf('month').format('YYYY-MM-DD'));
   }
@@ -24,7 +25,7 @@
       data.$element.next('.input-group-addon').on('click', function() {
         data.datepickerdata.show();
       });
-      if (isBootstrap4) {
+      if (isBootstrap4 || isBootstrap5) {
         data.$element.on("dp.show", function(e) {
           $('.collapse.in').addClass('show');
         });
@@ -66,13 +67,19 @@
   }
   $(function(){
     $("[dp_config]:not([disabled])").djangoDatetimePicker();
-    if (isBootstrap4) {
+    if (isBootstrap4 || isBootstrap5) {
       $('body').on('show.bs.collapse','.bootstrap-datetimepicker-widget .collapse',function(e){
         $(e.target).addClass('in');
       });
       $('body').on('hidden.bs.collapse','.bootstrap-datetimepicker-widget .collapse',function(e){
         $(e.target).removeClass('in');
       });
     }
+    if(isBootstrap5){
+      $('.input-group-addon[data-target="#datetimepicker1"]').each(function (){
+        $(this).attr('data-bs-target','#datetimepicker1').removeAttr('data-target')
+        $(this).attr('data-bs-toggle','datetimepickerv').removeAttr('data-toggle')
+      })
+    }
   });
 }));
diff --git a/dev/myapp/templates/layouts/bootstrap4.html b/dev/myapp/templates/layouts/bootstrap4.html
@@ -9,7 +9,6 @@
     {% block extra_css %}
     {% endblock %}
 </head>
-
 <body>
     <nav class="navbar navbar-expand-lg navbar-light bg-light">
         <a class="navbar-brand" href="https://github.com/monim67/django-bootstrap-datepicker-plus">
@@ -42,10 +41,10 @@ <h4 class="alert-heading">Not supported!</h4>
         </div>
         {% endif %}
     </div>
-       
+
     {% bootstrap_javascript jquery='full' %} {# Embed Bootstrap JS+jQuery #}
     {% block extra_js %}
     {% endblock %}
 </body>
 
-</html>
+</html>
