Skip to content

Commit b29af0e

Browse files
Mohammad DayyanMohammad Dayyan
authored andcommitted
Fix bug
1 parent c12ed54 commit b29af0e

6 files changed

Lines changed: 18 additions & 11 deletions

dist/jquery.md.bootstrap.datetimepicker.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.md.bootstrap.datetimepicker.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.md.bootstrap.datetimepicker.style.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "md.bootstrappersiandatetimepicker",
3-
"version": "3.6.2",
3+
"version": "3.6.3",
44
"description": "Persian Date Time Picker with jQuery 3+ & Bootstrap 4+",
55
"license": "MIT",
66
"moduleResolution": "node",

src/jquery.md.bootstrap.datetimepicker.js

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Bootstrap 4+ Persian Date Time Picker jQuery Plugin
3-
* version : 3.6.2
3+
* version : 3.6.3
44
* https://github.com/Mds92/MD.BootstrapPersianDateTimePicker
55
*
66
*
@@ -458,6 +458,11 @@
458458
return $('#' + $popoverDescriber.attr('aria-describedby'));
459459
}
460460

461+
function isCalendarOpen($element) {
462+
// آیا تقویم باز شده است یا خیر
463+
return $element.attr('aria-describedby') != null;
464+
}
465+
461466
function isPopoverDescriber($element) {
462467
return $element.attr('aria-describedby') != undefined;
463468
}
@@ -1793,8 +1798,7 @@
17931798
setting.selectedDateToShow = getClonedDate(selectedDateToShow);
17941799
setSetting1($this, setting);
17951800
updateCalendarHtml1($this, setting);
1796-
if(setting.calendarViewOnChange != undefined)
1797-
{
1801+
if (setting.calendarViewOnChange != undefined) {
17981802
// $this.trigger('md.calendarViewOnChange', setting.selectedDateToShow);
17991803
setting.calendarViewOnChange(setting.selectedDateToShow);
18001804
}
@@ -1892,7 +1896,7 @@
18921896
if (triggerStart) return;
18931897
var $target = $(e.target),
18941898
$popoverDescriber = getPopoverDescriber($target);
1895-
if ($popoverDescriber.length >= 1) return;
1899+
if ($popoverDescriber.length >= 1 || isCalendarOpen($target)) return;
18961900
hidePopover($(mdDatePickerPopoverSelector));
18971901
});
18981902

@@ -1987,7 +1991,10 @@
19871991
triggerStart = true;
19881992
$this = $(this);
19891993
setting = $this.data(mdPluginName);
1990-
if (setting.disabled) return;
1994+
if (setting.disabled || isCalendarOpen($this)) {
1995+
triggerStart = false;
1996+
return;
1997+
}
19911998
hideOthers($this);
19921999
showPopover($this);
19932000
setTimeout(function () {

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ module.exports = {
7676
banner: `
7777
Bootstrap 4+ Persian Date Time Picker jQuery Plugin
7878
https://github.com/Mds92/MD.BootstrapPersianDateTimePicker
79-
version : 3.6.2
79+
version : 3.6.3
8080
Written By Mohammad Dayyan, Mordad 1397
8181
mds.soft@gmail.com - @mdssoft
8282

0 commit comments

Comments
 (0)