1 files changed, 5 insertions, 8 deletions
diff --git a/app/assets/javascripts/due_date_select.js.es6 b/app/assets/javascripts/due_date_select.js.es6
index 5397b0aa345..ebf89c2d59b 100644
--- a/app/assets/javascripts/due_date_select.js.es6
+++ b/app/assets/javascripts/due_date_select.js.es6
@@ -27,7 +27,6 @@
       this.initGlDropdown();
       this.initRemoveDueDate();
       this.initDatePicker();
-      this.initStopPropagation();
     }
 
     initGlDropdown() {
@@ -48,8 +47,8 @@
 
       const calendar = new Pikaday({
         field: $dueDateInput.get(0),
+        theme: 'gitlab-theme',
         format: 'yyyy-mm-dd',
-        defaultDate: new Date($dueDateInput.val()),
         onSelect: (dateText) => {
           const formattedDate = dateFormat(new Date(dateText), 'yyyy-mm-dd');
 
@@ -64,6 +63,8 @@
         }
       });
 
+      calendar.setDate(new Date($dueDateInput.val()));
+
       this.$datePicker.append(calendar.el);
       this.$datePicker.data('pikaday', calendar);
     }
@@ -85,11 +86,6 @@
       });
     }
 
-    initStopPropagation() {
-      $(document).off('click', '.ui-datepicker-header a').on('click', '.ui-datepicker-header a', (e) => {
-        return e.stopImmediatePropagation();
-      });
-    }
 
     saveDueDate(isDropdown) {
       this.parseSelectedDate();
@@ -175,12 +171,13 @@
         const $datePicker = $(this);
         const calendar = new Pikaday({
           field: $datePicker.get(0),
+          theme: 'gitlab-theme',
           format: 'yyyy-mm-dd',
-          defaultDate: new Date($datePicker.val()),
           onSelect(dateText) {
             $datePicker.val(dateFormat(new Date(dateText), 'yyyy-mm-dd'));
           }
         });
+        calendar.setDate(new Date($datePicker.val()));
 
         $datePicker.data('pikaday', calendar);
       });