Skip to content

Commit 3c8cd10

Browse files
committed
fix a bug
1 parent 0da2550 commit 3c8cd10

4 files changed

Lines changed: 23 additions & 14 deletions

File tree

demo/Samples1.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ <h3>Multiple Months</h3>
9090
</div>
9191
<input type="text" id="inputDate3" class="form-control" placeholder="DateTimePicker With Multiple Month"
9292
aria-label="date3" aria-describedby="date3" value="1397/02/01">
93+
<input type="hidden" id="inputDate3-11">
9394
</div>
9495
</div>
9596
<div class="col-sm-6">
@@ -253,6 +254,7 @@ <h3>InLine</h3>
253254

254255
$('#date3').MdPersianDateTimePicker({
255256
targetTextSelector: '#inputDate3',
257+
targetDateSelector: '#inputDate3-11',
256258
monthsToShow: [1, 1],
257259
});
258260
$('#date3-1').MdPersianDateTimePicker({

demo/SamplesToDebug.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ <h2>Simple</h2>
4646
targetTextSelector: "#showDate_class",
4747
textFormat: " dddd dd MMMM yyyy ",
4848
isGregorian: false,
49-
modalMode: true
49+
modalMode: false,
50+
englishNumber: false
5051
});
5152
});
5253
</script>

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
"homepage": "https://github.com/Mds92/MD.BootstrapPersianDateTimePicker",
1818
"dependencies": {
1919
"@popperjs/core": "^2.4.4",
20-
"bootstrap": "^4.5.0",
20+
"bootstrap": "^4.5.2",
2121
"jquery": "^3.4.1",
22-
"npm": "^6.14.6"
22+
"npm": "^6.14.8"
2323
},
2424
"devDependencies": {
25-
"@types/jquery": "^3.5.0",
25+
"@types/jquery": "^3.5.1",
2626
"css-loader": "^1.0.1",
2727
"extract-text-webpack-plugin": "^4.0.0-beta.0",
28-
"jshint": "^2.11.1",
28+
"jshint": "^2.12.0",
2929
"jshint-loader": "^0.8.4",
3030
"mini-css-extract-plugin": "^0.4.5",
3131
"style-loader": "^0.23.1",
3232
"uglifyjs-webpack-plugin": "^1.3.0",
33-
"webpack": "^4.40.2",
33+
"webpack": "^4.44.1",
3434
"webpack-cli": "^3.3.12",
3535
"webpack-dev-server": "^3.11.0",
3636
"webpack-fix-style-only-entries": "0.0.4",

src/jquery.md.bootstrap.datetimepicker.js

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -527,17 +527,23 @@
527527
function getSelectedDateTimeTextFormatted(setting) {
528528
if (setting.selectedDate == undefined) return '';
529529
if (setting.rangeSelector && setting.rangeSelectorStartDate != undefined && setting.rangeSelectorEndDate != undefined)
530-
return getDateTimeString(!setting.isGregorian ? getDateTimeJsonPersian1(setting.rangeSelectorStartDate) : getDateTimeJson1(setting.rangeSelectorStartDate), setting.textFormat, setting.isGregorian, setting.englishNumber) + ' - ' +
531-
getDateTimeString(!setting.isGregorian ? getDateTimeJsonPersian1(setting.rangeSelectorEndDate) : getDateTimeJson1(setting.rangeSelectorEndDate), setting.textFormat, setting.isGregorian, setting.englishNumber);
532-
return getDateTimeString(!setting.isGregorian ? getDateTimeJsonPersian1(setting.selectedDate) : getDateTimeJson1(setting.selectedDate), setting.textFormat, setting.isGregorian, setting.englishNumber);
530+
return getDateTimeString(!setting.isGregorian
531+
? getDateTimeJsonPersian1(setting.rangeSelectorStartDate)
532+
: getDateTimeJson1(setting.rangeSelectorStartDate), setting.textFormat, setting.isGregorian, setting.englishNumber) + ' - ' +
533+
getDateTimeString(!setting.isGregorian
534+
? getDateTimeJsonPersian1(setting.rangeSelectorEndDate)
535+
: getDateTimeJson1(setting.rangeSelectorEndDate), setting.textFormat, setting.isGregorian, setting.englishNumber);
536+
return getDateTimeString(!setting.isGregorian
537+
? getDateTimeJsonPersian1(setting.selectedDate)
538+
: getDateTimeJson1(setting.selectedDate), setting.textFormat, setting.isGregorian, setting.englishNumber);
533539
}
534540

535541
function getSelectedDateTimeFormatted(setting) {
536542
if (setting.selectedDate == undefined) return '';
537543
if (setting.rangeSelector && setting.rangeSelectorStartDate != undefined && setting.rangeSelectorEndDate != undefined)
538-
return getDateTimeString(getDateTimeJson1(setting.rangeSelectorStartDate), setting.dateFormat, setting.isGregorian, true) + ' - ' +
539-
getDateTimeString(getDateTimeJson1(setting.rangeSelectorEndDate), setting.dateFormat, setting.isGregorian, true);
540-
return getDateTimeString(getDateTimeJson1(setting.selectedDate), setting.dateFormat, setting.isGregorian, true);
544+
return getDateTimeString(getDateTimeJson1(setting.rangeSelectorStartDate), setting.dateFormat, setting.isGregorian, setting.englishNumber) + ' - ' +
545+
getDateTimeString(getDateTimeJson1(setting.rangeSelectorEndDate), setting.dateFormat, setting.isGregorian, setting.englishNumber);
546+
return getDateTimeString(getDateTimeJson1(setting.selectedDate), setting.dateFormat, setting.isGregorian, setting.englishNumber);
541547
}
542548

543549
function setSelectedData(setting) {
@@ -560,12 +566,12 @@
560566
if ($targetDate.length > 0) {
561567
switch ($targetDate[0].tagName.toLowerCase()) {
562568
case 'input':
563-
$targetDate.val(getSelectedDateTimeFormatted(setting));
569+
$targetDate.val(toEnglishNumber(getSelectedDateTimeFormatted(setting)));
564570
triggerChangeCalling = true;
565571
$targetDate.trigger('change');
566572
break;
567573
default:
568-
$targetDate.text(getSelectedDateTimeFormatted(setting));
574+
$targetDate.text(toEnglishNumber(getSelectedDateTimeFormatted(setting)));
569575
triggerChangeCalling = true;
570576
$targetDate.trigger('change');
571577
break;

0 commit comments

Comments
 (0)