Skip to content

Commit 4ef18f2

Browse files
committed
Merge branch 'gh-pages'
2 parents 0430ab3 + 980bd77 commit 4ef18f2

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

index.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,8 @@ <h2>Demonstrations</h2>
219219
Use future date shortcuts: <input id="date-range101" size="60" value="">
220220
<a href="#" class="show-option">Show Config</a>
221221
<pre class="options">
222-
{
222+
{
223+
showShortcuts: true,
223224
shortcuts :
224225
{
225226
'next-days': [3,5,7],
@@ -233,6 +234,7 @@ <h2>Demonstrations</h2>
233234
<a href="#" class="show-option">Show Config</a>
234235
<pre class="options">
235236
{
237+
showShortcuts: true,
236238
shortcuts :
237239
{
238240
'prev-days': [3,5,7],
@@ -248,6 +250,7 @@ <h2>Demonstrations</h2>
248250
<a href="#" class="show-option">Show Config</a>
249251
<pre class="options">
250252
{
253+
showShortcuts: true,
251254
shortcuts : null,
252255
startOfWeek: 'sunday',
253256
language:'en',

jquery.daterangepicker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@
625625

626626
function IsOwnDatePickerClicked(evt, selfObj)
627627
{
628-
return ( evt.target == selfObj || (selfObj.childNodes != undefined && $.inArray(evt.target, selfObj.childNodes)>=0))
628+
return ( selfObj.contains(evt.target) || evt.target == selfObj || (selfObj.childNodes != undefined && $.inArray(evt.target, selfObj.childNodes)>=0))
629629
}
630630

631631
function init_datepicker()

0 commit comments

Comments
 (0)