From 9994bb9b9dd13e50af462853f563f14d28e41691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yi=C4=9Fit=20FINDIKLI?= Date: Fri, 17 Jan 2020 15:18:45 +0300 Subject: [PATCH 1/5] Fixed #141 Calendar giving focus to today when disabled --- src/components/calendar/Calendar.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/calendar/Calendar.vue b/src/components/calendar/Calendar.vue index d980f4be2..0ade4b6a4 100644 --- a/src/components/calendar/Calendar.vue +++ b/src/components/calendar/Calendar.vue @@ -1809,9 +1809,9 @@ export default { else { cell = DomHandler.findSingle(this.$refs.overlay, 'span.p-highlight'); if (!cell) { - let todayCell = DomHandler.findSingle(this.$refs.overlay, 'td.p-datepicker-today'); + let todayCell = DomHandler.findSingle(this.$refs.overlay, 'td.p-datepicker-today span:not(.p-disabled)'); if (todayCell) - cell = todayCell.children[0]; + cell = todayCell; else cell = DomHandler.findSingle(this.$refs.overlay, '.p-datepicker-calendar td span:not(.p-disabled)'); } From 1c7b1aa4063a381a06fea993594d786282dacabc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merve=20=C3=96z=C3=A7if=C3=A7i?= Date: Fri, 17 Jan 2020 15:45:10 +0300 Subject: [PATCH 2/5] Fixed #145 --- src/components/dialog/Dialog.vue | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/components/dialog/Dialog.vue b/src/components/dialog/Dialog.vue index 81e821795..1acb4df60 100644 --- a/src/components/dialog/Dialog.vue +++ b/src/components/dialog/Dialog.vue @@ -1,7 +1,7 @@