|
1 | 1 | /** |
2 | | - * @preserve jQuery DateTimePicker plugin v2.3.5 |
| 2 | + * @preserve jQuery DateTimePicker plugin v2.3.6 |
3 | 3 | * @homepage http://xdsoft.net/jqplugins/datetimepicker/ |
4 | 4 | * (c) 2014, Chupurnov Valeriy. |
5 | 5 | */ |
|
288 | 288 | timeHeightInTimePicker:25, |
289 | 289 | timepickerScrollbar:true, |
290 | 290 |
|
291 | | - todayButton:true, // 2.1.0 |
292 | | - defaultSelect:true, // 2.1.0 |
| 291 | + todayButton:true, |
| 292 | + defaultSelect:true, |
293 | 293 |
|
294 | 294 | scrollMonth:true, |
295 | 295 | scrollTime:true, |
|
495 | 495 | scroller = $('<div class="xdsoft_scroller"></div>'), |
496 | 496 | monthselect =$('<div class="xdsoft_select xdsoft_monthselect"><div></div></div>'), |
497 | 497 | yearselect =$('<div class="xdsoft_select xdsoft_yearselect"><div></div></div>'); |
498 | | - |
499 | | - //constructor lego |
| 498 | + |
500 | 499 | mounth_picker |
501 | 500 | .find('.xdsoft_month span') |
502 | 501 | .after(monthselect); |
|
558 | 557 | } |
559 | 558 | }); |
560 | 559 |
|
561 | | - |
562 | | - // set options |
563 | 560 | datetimepicker.setOptions = function( _options ) { |
564 | 561 | options = $.extend(true,{},options,_options); |
565 | 562 |
|
|
839 | 836 |
|
840 | 837 | _this.currentTime.setDate( |
841 | 838 | Math.min( |
842 | | - // Day 0 is the last day in the previous month, but we want to know the number of days in the current month, so we need to evaluate the subsequent month (month+1) |
843 | 839 | new Date(_this.currentTime.getFullYear(), month+1, 0).getDate(), |
844 | 840 | _this.currentTime.getDate() |
845 | 841 | ) |
|
863 | 859 | } |
864 | 860 | _this.currentTime.setDate( |
865 | 861 | Math.min( |
866 | | - // Day 0 is the last day in the previous month, but we want to know the number of days in the current month, so we need to evaluate the subsequent month (month+1) |
867 | 862 | new Date(_this.currentTime.getFullYear(), month+1, 0).getDate(), |
868 | 863 | _this.currentTime.getDate() |
869 | 864 | ) |
|
1003 | 998 | while( start.getDay()!=options.dayOfWeekStart ) |
1004 | 999 | start.setDate(start.getDate()-1); |
1005 | 1000 |
|
1006 | | - //generate calendar |
1007 | 1001 | table+='<table><thead><tr>'; |
1008 | 1002 |
|
1009 | 1003 | if(options.weeks) { |
1010 | 1004 | table+='<th></th>'; |
1011 | 1005 | } |
1012 | 1006 |
|
1013 | | - // days |
1014 | 1007 | for(var j = 0; j<7; j++) { |
1015 | 1008 | table+='<th>'+options.i18n[options.lang].dayOfWeek[(j+options.dayOfWeekStart)%7]+'</th>'; |
1016 | 1009 | } |
|
1228 | 1221 |
|
1229 | 1222 | timebox |
1230 | 1223 | .on('click.xdsoft', 'div', function (xdevent) { |
1231 | | - xdevent.stopPropagation(); // NAJ: Prevents closing of Pop-ups, Modals and Flyouts |
| 1224 | + xdevent.stopPropagation(); |
1232 | 1225 | var $this = $(this), |
1233 | 1226 | currentTime = _xdsoft_datetime.currentTime; |
1234 | 1227 |
|
|
1303 | 1296 | } |
1304 | 1297 | }) |
1305 | 1298 | .on( 'click.xdsoft', function( xdevent ) { |
1306 | | - xdevent.stopPropagation(); // Prevents closing of Pop-ups, Modals and Flyouts in Bootstrap |
| 1299 | + xdevent.stopPropagation(); |
1307 | 1300 | }); |
1308 | 1301 |
|
1309 | 1302 | var current_time_index = 0; |
|
1416 | 1409 |
|
1417 | 1410 | return ct?ct:0; |
1418 | 1411 | } |
1419 | | - //debugger |
| 1412 | + |
1420 | 1413 | _xdsoft_datetime.setCurrentTime( getCurrentValue() ); |
1421 | 1414 |
|
1422 | 1415 | input |
|
0 commit comments