Skip to content

Commit 9a9b468

Browse files
committed
رفع مشکل
1 parent 9efc495 commit 9a9b468

5 files changed

Lines changed: 26 additions & 23 deletions

File tree

dist/mds.bs.datetimepicker.js

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/mds.bs.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.

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": "4.2.3",
3+
"version": "4.2.4",
44
"description": "Persian Date Time Picker with Bootstrap 5+",
55
"license": "MIT",
66
"moduleResolution": "node",

src/mds.bs.datetimepicker.ts

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -182,18 +182,19 @@ export class MdsPersianDateTimePicker {
182182

183183
// #region Template
184184

185-
private static modalHtmlTemplate = `<div data-mds-dtp data-mds-dtp-guid="{{guid}}" class="modal fade mds-bs-persian-datetime-picker-modal" tabindex="-1" role="dialog" aria-hidden="true">
186-
<div class="modal-dialog">
187-
<div class="modal-content">
188-
<div class="modal-header" data-mds-dtp-title="true">
189-
<h5 class="modal-title">Modal title</h5>
190-
</div>
191-
<div class="modal-body">
192-
<div class="select-year-box w-0" data-mds-dtp-year-list-box="true"></div>
193-
<div data-name="mds-dtp-body"></div>
194-
</div>
195-
</div>
196-
</div>
185+
private static modalHtmlTemplate =
186+
`<div data-mds-dtp data-mds-dtp-guid="{{guid}}" class="modal fade mds-bs-persian-datetime-picker-modal" tabindex="-1" role="dialog" aria-hidden="true">
187+
<div class="modal-dialog">
188+
<div class="modal-content">
189+
<div class="modal-header" data-mds-dtp-title="true">
190+
<h5 class="modal-title">Modal title</h5>
191+
</div>
192+
<div class="modal-body">
193+
<div class="select-year-box w-0" data-mds-dtp-year-list-box="true"></div>
194+
<div data-name="mds-dtp-body"></div>
195+
</div>
196+
</div>
197+
</div>
197198
</div>`;
198199
private static popoverHtmlTemplate = `<div class="popover mds-bs-persian-datetime-picker-popover" role="tooltip" data-mds-dtp>
199200
<div class="popover-arrow"></div>
@@ -1749,16 +1750,18 @@ data-bs-toggle="dropdown" aria-expanded="false">
17491750
const calendarHtml = this.getDateTimePickerBodyHtml(setting);
17501751
const dtpInlineHeader = calendarHtml.match(/<th mds-dtp-inline-header\b[^>]*>(.*?)<\/th>/img)![0];
17511752
this.tempTitleString = dtpInlineHeader;
1752-
if (!setting.inLine && updatePopoverContent) {
1753+
if (!setting.inLine && updatePopoverContent && !setting.modalMode) {
17531754
const popover = this.getBsPopoverInstance();
17541755
if (!popover) {
17551756
console.error("mds.bs.datetimepicker: `BsPopoverInstance` is null!");
17561757
return;
17571758
}
1758-
popover.setContent({
1759-
'.popover-header': dtpInlineHeader,
1760-
'.popover-body': calendarHtml
1761-
});
1759+
setTimeout(() => {
1760+
popover.setContent({
1761+
'.popover-header': dtpInlineHeader,
1762+
'.popover-body': calendarHtml
1763+
});
1764+
}, 100);
17621765
return;
17631766
}
17641767
let containerElement = element.closest('[data-name="mds-dtp-body"]');
@@ -1849,9 +1852,9 @@ data-bs-toggle="dropdown" aria-expanded="false">
18491852
MdsPersianDateTimePickerData.set(instance.guid, instance);
18501853
if (setting.rangeSelectorStartDate != undefined && setting.rangeSelectorEndDate != undefined) {
18511854
setting.selectedRangeDate = [MdsPersianDateTimePicker.getClonedDate(setting.rangeSelectorStartDate), MdsPersianDateTimePicker.getClonedDate(setting.rangeSelectorEndDate)];
1852-
if (!setting.inLine) {
1855+
if (!setting.inLine)
18531856
instance.hide();
1854-
} else
1857+
else
18551858
this.updateCalendarBodyHtml(element, setting);
18561859
}
18571860
return;

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ module.exports = {
8181
banner: `
8282
Bootstrap 5+ Persian Date Time Picker
8383
https://github.com/Mds92/MD.BootstrapPersianDateTimePicker
84-
version : 4.2.3
84+
version : 4.2.4
8585
Written By Mohammad Dayyan, Mordad 1397 - 1402
8686
mds.soft@gmail.com - @mdssoft
8787
`

0 commit comments

Comments
 (0)