Skip to content

Commit

Permalink
Merge pull request stisla#190 from masif088/fixing_datetime
Browse files Browse the repository at this point in the history
fixing datetimepicker on forms-advanced-form.html
  • Loading branch information
nauvalazhar authored May 6, 2021
2 parents 3e8203d + a499054 commit c3b6477
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions assets/js/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,23 +94,23 @@ $(function() {
if(me.parent().hasClass("active")){
active = true;
}

$('.main-sidebar .sidebar-menu li.active > .dropdown-menu').slideUp(500, function() {
update_sidebar_nicescroll();
update_sidebar_nicescroll();
return false;
});

$('.main-sidebar .sidebar-menu li.active').removeClass('active');

if(active==true) {
me.parent().removeClass('active');
me.parent().find('> .dropdown-menu').slideUp(500, function() {
me.parent().removeClass('active');
me.parent().find('> .dropdown-menu').slideUp(500, function() {
update_sidebar_nicescroll();
return false;
});
}else{
me.parent().addClass('active');
me.parent().find('> .dropdown-menu').slideDown(500, function() {
me.parent().addClass('active');
me.parent().find('> .dropdown-menu').slideDown(500, function() {
update_sidebar_nicescroll();
return false;
});
Expand All @@ -120,7 +120,7 @@ $(function() {
});

$('.main-sidebar .sidebar-menu li.active > .dropdown-menu').slideDown(500, function() {
update_sidebar_nicescroll();
update_sidebar_nicescroll();
return false;
});
}
Expand Down Expand Up @@ -589,7 +589,7 @@ $(function() {
}
if($(".datetimepicker").length) {
$('.datetimepicker').daterangepicker({
locale: {format: 'YYYY-MM-DD hh:mm'},
locale: {format: 'YYYY-MM-DD HH:mm'},
singleDatePicker: true,
timePicker: true,
timePicker24Hour: true,
Expand Down

0 comments on commit c3b6477

Please sign in to comment.