Skip to content

Commit 536a87d

Browse files
committed
Merge branch 'pr/195'
2 parents 4ef18f2 + 852aa8d commit 536a87d

File tree

3 files changed

+31
-2
lines changed

3 files changed

+31
-2
lines changed

demo.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,18 @@ $(function()
102102
enabled: true
103103
}
104104
});
105-
105+
$('#date-range1-1').dateRangePicker(
106+
{
107+
startOfWeek: 'monday',
108+
separator : ' ~ ',
109+
format: 'DD.MM.YYYY HH:mm',
110+
autoClose: false,
111+
time: {
112+
enabled: true
113+
},
114+
defaultTime: moment().startOf('day').toDate(),
115+
defaultEndTime: moment().endOf('day').toDate()
116+
});
106117
$('#date-range2').dateRangePicker();
107118

108119
$('#date-range3').dateRangePicker(

index.html

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,23 @@ <h2>Demonstrations</h2>
8787
}</pre>
8888
</div>
8989

90+
<div class="demo">
91+
Default settings with default start/end time value: <input id="date-range1-1" size="60" value="">
92+
<a href="#" class="show-option">Show Config</a>
93+
<pre class="options">
94+
{
95+
startOfWeek: 'monday',
96+
separator : ' ~ ',
97+
format: 'DD.MM.YYYY HH:mm',
98+
autoClose: false,
99+
time: {
100+
enabled: true
101+
},
102+
defaultTime: moment().startOf('day').toDate(),
103+
defaultEndTime: moment().endOf('day').toDate()
104+
}</pre>
105+
</div>
106+
90107
<div class="demo">
91108
Default settings with default value: <input id="date-range2" size="40" value="2013-10-01 to 2013-11-04">
92109
<a href="#" class="show-option">Show Config</a>

jquery.daterangepicker.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,8 +696,9 @@
696696
showTime(moment(opt.start || opt.startDate).toDate(),'time1');
697697
showTime(moment(opt.end || opt.endDate).toDate(),'time2');
698698
} else {
699+
var defaultEndTime = opt.defaultEndTime ? opt.defaultEndTime : defaultTime;
699700
showTime(defaultTime,'time1');
700-
showTime(defaultTime,'time2');
701+
showTime(defaultEndTime,'time2');
701702
}
702703
}
703704

0 commit comments

Comments
 (0)