Skip to content

Commit 73a44de

Browse files
m.dayyan@mobinnet.netm.dayyan@mobinnet.net
authored andcommitted
Fix bug
1 parent b6e46d6 commit 73a44de

2 files changed

Lines changed: 13 additions & 15 deletions

File tree

demo/Samples1.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</script>
1919

2020
<link rel="stylesheet" href="demo.css" />
21-
<!-- <link rel="stylesheet" href="../src/jquery.md.bootstrap.datetimepicker.style.css" /> -->
22-
<link rel="stylesheet" href="../dist/jquery.md.bootstrap.datetimepicker.style.css" />
21+
<link rel="stylesheet" href="../src/jquery.md.bootstrap.datetimepicker.style.css" />
22+
<!-- <link rel="stylesheet" href="../dist/jquery.md.bootstrap.datetimepicker.style.css" /> -->
2323
</head>
2424

2525
<body>

src/jquery.md.bootstrap.datetimepicker.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -489,10 +489,6 @@
489489
return getPopoverDescriber($element).data(mdPluginName, setting);
490490
}
491491

492-
function setSetting2($popoverDescriber, setting) {
493-
return $popoverDescriber.data(mdPluginName, setting);
494-
}
495-
496492
function updateCalendarHtml1($element, setting) {
497493
var calendarHtml = getDateTimePickerHtml(setting),
498494
$container = setting.inLine ?
@@ -2065,7 +2061,7 @@
20652061
var $this = $(this),
20662062
setting = getSetting2($this);
20672063
setting.selectedDate = getClonedDate(dateTimeObject);
2068-
setSetting2($this, setting);
2064+
setSetting1($this, setting);
20692065
setSelectedData(setting);
20702066
});
20712067
},
@@ -2075,7 +2071,7 @@
20752071
var $this = $(this),
20762072
setting = getSetting2($this);
20772073
setting[name] = value;
2078-
setSetting2($this, setting);
2074+
setSetting1($this, setting);
20792075
});
20802076
},
20812077
setDateRange: function (startDateTimeObject, endDateTimeObject) {
@@ -2088,21 +2084,21 @@
20882084
setting.selectedDate = startDateTimeObject;
20892085
setting.rangeSelectorStartDate = startDateTimeObject;
20902086
setting.rangeSelectorEndDate = endDateTimeObject;
2091-
setSetting2($this, setting);
2087+
setSetting1($this, setting);
20922088
setSelectedData(setting);
20932089
} else if ((setting.fromDate || setting.toDate) && setting.groupId) {
20942090
var $toDateElement = $('[' + mdDatePickerGroupIdAttribute + '="' + setting.groupId + '"][data-toDate]'),
20952091
$fromDateElement = $('[' + mdDatePickerGroupIdAttribute + '="' + setting.groupId + '"][data-fromDate]');
20962092
if ($fromDateElement.length > 0) {
20972093
var fromDateSetting = getSetting2($fromDateElement);
20982094
fromDateSetting.selectedDate = startDateTimeObject;
2099-
setSetting2($fromDateElement, fromDateSetting);
2095+
setSetting1($fromDateElement, fromDateSetting);
21002096
setSelectedData(fromDateSetting);
21012097
}
21022098
if ($toDateElement.length > 0) {
21032099
var toDateSetting = getSetting2($toDateElement);
21042100
toDateSetting.selectedDate = endDateTimeObject;
2105-
setSetting2($toDateElement, toDateSetting);
2101+
setSetting1($toDateElement, toDateSetting);
21062102
setSelectedData(toDateSetting);
21072103
}
21082104
}
@@ -2113,7 +2109,9 @@
21132109
var $this = $(this),
21142110
setting = getSetting2($this);
21152111
setting.selectedDate = undefined;
2116-
setSetting2($this, setting);
2112+
setting.rangeSelectorStartDate = undefined;
2113+
setting.rangeSelectorEndDate = undefined;
2114+
setSetting1($this, setting);
21172115
setSelectedData(setting);
21182116
});
21192117
},
@@ -2126,7 +2124,7 @@
21262124
var $this = $(this),
21272125
setting = getSetting2($this);
21282126
setting.selectedDate = getDateTime2(dateTimeObjectJson);
2129-
setSetting2($this, setting);
2127+
setSetting1($this, setting);
21302128
setSelectedData(setting);
21312129
});
21322130
},
@@ -2147,7 +2145,7 @@
21472145
var $this = $(this),
21482146
setting = getSetting2($this);
21492147
setting.disabled = isDisable;
2150-
setSetting2($this, setting);
2148+
setSetting1($this, setting);
21512149
if (isDisable) $this.attr('disabled', '');
21522150
else $this.removeAttr('disabled');
21532151
});
@@ -2181,7 +2179,7 @@
21812179
setting.isGregorian = isGregorian;
21822180
setting.englishNumber = englishNumber;
21832181
if (setting.isGregorian) setting.englishNumber = true;
2184-
setSetting2($this, setting);
2182+
setSetting1($this, setting);
21852183
setSelectedData(setting);
21862184
});
21872185
}

0 commit comments

Comments
 (0)