Skip to content

Commit ae180b7

Browse files
Mds92Mds92
committed
Fix a bug
1 parent 386a405 commit ae180b7

7 files changed

Lines changed: 53 additions & 28 deletions

‎demo/SamplesToDebug.html‎

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,54 @@
1919
</head>
2020

2121
<body>
22-
<div class="container">
23-
<h2>Simple</h2>
22+
<section>
2423
<div class="row">
25-
<div class="col-sm-6">
24+
25+
<div class="col-md-4 form-group">
26+
<label for="enter_date_1"> تاریخ شروع </label>
27+
<div class="input-group">
28+
<div class="input-group-prepend">
29+
<span class="input-group-text cursor-pointer" id="enter_date">انتخاب تاریخ</span>
30+
</div>
31+
<input type="text" name="enter_date_1" id="enter_date_1" class="form-control form-group"
32+
aria-label="enter_date" aria-describedby="enter_date" />
33+
<input type="hidden" name="enter_date_2" id="enter_date_2" class="form-control form-group"
34+
aria-label="enter_date" aria-describedby="enter_date" />
35+
</div>
36+
</div>
37+
<div class="col-md-4 form-group">
38+
<label for="exit_date_1"> تاریخ پایان </label>
2639
<div class="input-group">
2740
<div class="input-group-prepend">
28-
<span class="input-group-text cursor-pointer" id="dt_class">Icon</span>
41+
<span class="input-group-text cursor-pointer" id="exit_date">انتخاب تاریخ</span>
2942
</div>
30-
<input type="text" id="inputDate3" class="form-control">
43+
<input type="text" name="exit_date_1" id="exit_date_1" class="form-control form-group" aria-label="exit_date"
44+
aria-describedby="exit_date" />
45+
<input type="hidden" name="exit_date_2" id="exit_date_2" class="form-control form-group"
46+
aria-label="exit_date" aria-describedby="exit_date" />
3147
</div>
32-
<label id="showDate_class"> </label>
33-
<input type="hidden" id="targetDateSelector_id" value="2009-12-15T00:00:00Z">
3448
</div>
3549
</div>
36-
</div>
50+
</section>
3751

38-
<script src="../dist/jquery.md.bootstrap.datetimepicker.js" type="text/javascript"></script>
39-
<!-- <script src="../src/jquery.md.bootstrap.datetimepicker.js" type="text/javascript"></script> -->
52+
<!-- <script src="../dist/jquery.md.bootstrap.datetimepicker.js" type="text/javascript"></script> -->
53+
<script src="../src/jquery.md.bootstrap.datetimepicker.js" type="text/javascript"></script>
4054

4155
<script type="text/javascript">
42-
$("#dt_class").MdPersianDateTimePicker({
43-
targetDateSelector: "#targetDateSelector_id",
44-
targetTextSelector: "#inputDate3",
45-
textFormat: " dddd dd MMMM yyyy ",
46-
calendarViewOnChange: function (param1) {
47-
console.log('calendarViewOnChange', param1);
48-
},
49-
onDayClick: function (param1) {
50-
console.log('onDayClick', param1);
51-
}
56+
$('#enter_date').MdPersianDateTimePicker({
57+
targetTextSelector: '#enter_date_1',
58+
targetDateSelector: '#enter_date_2',
59+
fromDate: true,
60+
groupId: 'enter_date',
61+
modalMode: true
62+
});
63+
64+
$('#exit_date').MdPersianDateTimePicker({
65+
targetTextSelector: '#exit_date_1',
66+
targetDateSelector: '#exit_date_2',
67+
toDate: true,
68+
groupId: 'enter_date',
69+
modalMode: true
5270
});
5371
</script>
5472

‎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.11.4",
3+
"version": "3.11.5",
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: 9 additions & 2 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.11.4
3+
* version : 3.11.5
44
* https://github.com/Mds92/MD.BootstrapPersianDateTimePicker
55
*
66
*
@@ -452,6 +452,13 @@
452452

453453
// #region Functions
454454

455+
function newGuid(){
456+
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
457+
var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
458+
return v.toString(16);
459+
});
460+
}
461+
455462
function isWithinMdModal($element) {
456463
return $element.parents('.modal' + mdDatePickerElementSelector + ':first').length > 0;
457464
}
@@ -2053,7 +2060,7 @@
20532060
else if (!setting.enableTimePicker && !setting.textFormat) setting.textFormat = 'yyyy/MM/dd';
20542061
if (setting.enableTimePicker && !setting.dateFormat) setting.dateFormat = 'yyyy/MM/dd HH:mm:ss';
20552062
else if (!setting.enableTimePicker && !setting.dateFormat) setting.dateFormat = 'yyyy/MM/dd';
2056-
var uniqueId = new Date().getTime();
2063+
var uniqueId = newGuid();
20572064
$this.data(mdPluginName, setting);
20582065
$this.attr('data-uniqueid', uniqueId);
20592066
if (setting.rangeSelector && setting.selectedRangeDate != undefined) {

‎webpack.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ module.exports = {
6464
banner: `
6565
Bootstrap 4+ Persian Date Time Picker jQuery Plugin
6666
https://github.com/Mds92/MD.BootstrapPersianDateTimePicker
67-
version : 3.11.4
67+
version : 3.11.5
6868
Written By Mohammad Dayyan, Mordad 1397 - 1400
6969
mds.soft@gmail.com - @mdssoft
7070

0 commit comments

Comments
 (0)