Skip to content

Commit 7c9031e

Browse files
committed
fix bugs
1 parent 084732a commit 7c9031e

File tree

4 files changed

+9
-43
lines changed

4 files changed

+9
-43
lines changed

daterangepicker.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
{
6868
width:190px;
6969
float:left;
70-
table-layout:fixed;
7170
}
7271
.date-picker-wrapper .month-wrapper table.month2
7372
{

demo.js

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,6 @@ $(function()
190190
}
191191
});
192192

193-
$('#date-range104').dateRangePicker(
194-
{
195-
showShortcuts:false
196-
});
197-
198193
$('#date-range103').dateRangePicker(
199194
{
200195
autoClose: true
@@ -261,17 +256,6 @@ $(function()
261256
format: 'dddd MMM Do, YYYY' //more formats at http://momentjs.com/docs/#/displaying/format/
262257
});
263258

264-
$('#date-range11').dateRangePicker(
265-
{
266-
separator : ' ~ '
267-
}).bind('datepicker-change',function(e,r)
268-
{
269-
try
270-
{
271-
console.log(r);
272-
}catch(e){}
273-
});
274-
275259
$('#date-range12').dateRangePicker(
276260
{
277261
inline:true,

index.html

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -291,15 +291,6 @@ <h2>Demonstrations</h2>
291291
</div>
292292

293293

294-
<div class="demo">
295-
Hide shortcuts: <input id="date-range104" size="60" value="">
296-
<a href="#" class="show-option">Show Config</a>
297-
<pre class="options">
298-
{
299-
showShortcuts:false
300-
} </pre>
301-
</div>
302-
303294
<div class="demo">
304295
Auto-close after selection: <input id="date-range103" size="60" value="">
305296
<a href="#" class="show-option">Show Config</a>
@@ -309,15 +300,6 @@ <h2>Demonstrations</h2>
309300
} </pre>
310301
</div>
311302

312-
<div class="demo">
313-
Change the separator between date strings: <input id="date-range11" size="40" value="">
314-
<a href="#" class="show-option">Show Config</a>
315-
<pre class="options">
316-
{
317-
separator : ' ~ '
318-
} </pre>
319-
</div>
320-
321303
<div class="demo">
322304
In-line mode: <input id="date-range12" size="40" value="">
323305
<a href="#" class="show-option">Show Config</a>
@@ -597,13 +579,13 @@ <h2>Configuration</h2>
597579
},
598580
minDays: 0,
599581
maxDays: 0,
600-
showShortcuts: true,
582+
showShortcuts: false,
601583
shortcuts:
602584
{
603585
//'prev-days': [1,3,5,7],
604-
'next-days': [3,5,7],
586+
//'next-days': [3,5,7],
605587
//'prev' : ['week','month','year'],
606-
'next' : ['week','month','year']
588+
//'next' : ['week','month','year']
607589
},
608590
customShortcuts : [],
609591
inline:false,
@@ -623,6 +605,7 @@ <h2>Configuration</h2>
623605
return days > 1 ? days + ' ' + lang('days') : '';
624606
},
625607
showTopbar: true,
608+
swapTime: false,
626609
selectForward: false,
627610
selectBackward: false,
628611
showWeekNumbers: false,

jquery.daterangepicker.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -623,11 +623,11 @@
623623
$(window).bind('resize.datepicker',calcPosition);
624624

625625
return this;
626-
627-
function IsOwnDatePickerClicked(evt, selfObj)
628-
{
629-
return ( evt.target == selfObj || (selfObj.childNodes != undefined && $.inArray(evt.target, selfObj.childNodes)>=0))
630-
}
626+
627+
function IsOwnDatePickerClicked(evt, selfObj)
628+
{
629+
return ( evt.target == selfObj || (selfObj.childNodes != undefined && $.inArray(evt.target, selfObj.childNodes)>=0))
630+
}
631631

632632
function init_datepicker()
633633
{

0 commit comments

Comments
 (0)