library-mirrors/datetimepicker
1
0
Fork 0
mirror of https://github.com/xdan/datetimepicker.git synced 2024-11-18 06:24:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

new major version 2.0.0

Browse Source 
Added fast month and year select
Added touch handler for scroller element
Update screens
Creation of a custom scrollbars allocated into a plugin xdsoftScroller
This commit is contained in:
Valeriy 2013-12-04 20:16:19 +06:00
parent 20861527bb
commit 5aa18c624f
6 changed files with 223 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
datetimepicker.jquery.json
View File

@ -16,9 +16,10 @@
"scroller", "scroller",
"picker", "picker",
"i18n", "i18n",
"input" "input",
"touch"
], ],
"version": "1.1.1", "version": "2.0.0",
"author": { "author": {
"name": "Chupurnov Valeriy", "name": "Chupurnov Valeriy",
"url": "http://xdsoft.net/contacts.html" "url": "http://xdsoft.net/contacts.html"

1
index.html
View File

@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<link rel="stylesheet" type="text/css" href="./jquery.datetimepicker.css"/> <link rel="stylesheet" type="text/css" href="./jquery.datetimepicker.css"/>
</head> </head>
<body> <body>

46
jquery.datetimepicker.css
View File

@ -12,7 +12,7 @@
padding-left: 0px; padding-left: 0px;
padding-top: 2px; padding-top: 2px;
position: absolute; position: absolute;
z-index: 9999; z-index: 99;
box-sizing: border-box; box-sizing: border-box;
display:none; display:none;
-webkit-touch-callout: none; -webkit-touch-callout: none;
@ -22,6 +22,7 @@
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
} }
.xdsoft_noselect{ .xdsoft_noselect{
-webkit-touch-callout: none; -webkit-touch-callout: none;
-webkit-user-select: none; -webkit-user-select: none;
@ -143,8 +144,7 @@
.xdsoft_datetimepicker .xdsoft_label{ .xdsoft_datetimepicker .xdsoft_label{
display: inline; display: inline;
position: relative; position: relative;
z-index: 9999; z-index: 99;
overflow: hidden;
margin: 0; margin: 0;
padding: 5px 3px; padding: 5px 3px;
font-size: 14px; font-size: 14px;
@ -154,6 +154,37 @@
float:left; float:left;
width:182px; width:182px;
text-align:center; text-align:center;
cursor:pointer;
}
.xdsoft_datetimepicker .xdsoft_label:hover{
text-decoration:underline;
}
.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select{
border:1px solid #ccc;
position:absolute;
display:block;
right:0px;
top:30px;
z-index:101;
display:none;
background:#fff;
max-height:160px;
overflow-y:hidden;
}
.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select.xdsoft_monthselect{right:-7px;}
.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select.xdsoft_yearselect{right:2px;}
.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select > div > .xdsoft_option:hover{
color: #fff;
background: #ff8000;
}
.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select > div > .xdsoft_option{
padding:2px 10px 2px 5px;
}
.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select > div > .xdsoft_option.xdsoft_current{
background: #33AAFF;
box-shadow: #178FE5 0px 1px 3px 0px inset;
color:#fff;
font-weight: 700;
} }
.xdsoft_datetimepicker .xdsoft_month{ .xdsoft_datetimepicker .xdsoft_month{
width:114px; width:114px;
@ -219,7 +250,7 @@
.xdsoft_datetimepicker .xdsoft_calendar th{ .xdsoft_datetimepicker .xdsoft_calendar th{
font-weight: 700; font-weight: 700;
text-align: center; text-align: center;
color: #999999; color: #9999;
cursor:default; cursor:default;
} }
.xdsoft_datetimepicker .xdsoft_copyright{ color:#ccc !important; font-size:10px;clear:both;float:none;margin-left:8px;} .xdsoft_datetimepicker .xdsoft_copyright{ color:#ccc !important; font-size:10px;clear:both;float:none;margin-left:8px;}
@ -231,12 +262,12 @@
position:relative; position:relative;
border:1px solid #ccc; border:1px solid #ccc;
} }
.xdsoft_time_box > .xdsoft_scrollbar >.xdsoft_scroller{ .xdsoft_scrollbar >.xdsoft_scroller{
background:#ccc !important; background:#ccc !important;
height:20px; height:20px;
border-radius:3px; border-radius:3px;
} }
.xdsoft_time_box > .xdsoft_scrollbar{ .xdsoft_scrollbar{
position:absolute; position:absolute;
width:7px; width:7px;
width:7px; width:7px;
@ -245,3 +276,6 @@
bottom:0px; bottom:0px;
cursor:pointer; cursor:pointer;
} }
.xdsoft_scroller_box{
position:relative;
}

202
jquery.datetimepicker.js
View File

@ -1,9 +1,98 @@
/** /**
* @preserve jQuery DateTimePicker plugin v1.1.1 * @preserve jQuery DateTimePicker plugin v2.0.0
* @homepage http://xdsoft.net/jqplugins/datetimepicker/ * @homepage http://xdsoft.net/jqplugins/datetimepicker/
* (c) 2013, Chupurnov Valeriy. * (c) 2013, Chupurnov Valeriy.
*/ */
(function( $ ){ (function( $ ){
$.fn.xdsoftScroller = function( _percent ){
return this.each(function(){
var timeboxparent = $(this);
if( !$(this).hasClass('xdsoft_scroller_box') ){
var pointerEventToXY = function( e ){
var out = {x:0, y:0};
if(e.type == 'touchstart' || e.type == 'touchmove' || e.type == 'touchend' || e.type == 'touchcancel'){
var touch = e.originalEvent.touches[0] || e.originalEvent.changedTouches[0];
out.x = touch.pageX;
out.y = touch.pageY;
}else if (e.type == 'mousedown' || e.type == 'mouseup' || e.type == 'mousemove' || e.type == 'mouseover'|| e.type=='mouseout' || e.type=='mouseenter' || e.type=='mouseleave') {
out.x = e.pageX;
out.y = e.pageY;
}
return out;
};
var move = 0,
timebox = timeboxparent.children().eq(0),
parentHeight = timeboxparent[0].offsetHeight-2,
height = timebox[0].offsetHeight,
scrollbar = $('<div class="xdsoft_scrollbar"></div>'),
scroller = $('<div class="xdsoft_scroller"></div>'),
maximumOffset = 100,
start = false;
scrollbar.append(scroller);
timeboxparent.addClass('xdsoft_scroller_box').append(scrollbar);
scroller.on('mousedown.xdsoft_scroller',function( event ){
var pageY = event.pageY,
top = parseInt(scroller.css('margin-top')),
h1 = scrollbar[0].offsetHeight;
$(document.body).addClass('xdsoft_noselect');
$([document.body,window]).on('mouseup.xdsoft_scroller',function(){
$([document.body,window]).off('mouseup.xdsoft_scroller',arguments.callee)
.off('mousemove.xdsoft_scroller',move)
.removeClass('xdsoft_noselect');
});
$(document.body).on('mousemove.xdsoft_scroller',move = function(event){
var offset = event.pageY-pageY+top;
if( offset<0 )
offset = 0;
if( offset+scroller[0].offsetHeight>h1 )
offset = h1-scroller[0].offsetHeight;
timeboxparent.trigger('scroll_element.xdsoft_scroller',[maximumOffset?offset/maximumOffset:0]);
});
});
timeboxparent
.on('scroll_element.xdsoft_scroller',function( event,percent ){
percent = percent>1?1:(percent<0||isNaN(percent))?0:percent;
scroller.css('margin-top',maximumOffset*percent);
timebox.css('marginTop',-parseInt((height-parentHeight)*percent))
})
.on('resize_scroll.xdsoft_scroller',function( event,_percent ){
parentHeight = timeboxparent[0].offsetHeight-2;
height = timebox[0].offsetHeight;
var percent = parentHeight/height,
sh = percent*scrollbar[0].offsetHeight;
if( percent>1 )
scroller.hide();
else{
scroller.show();
scroller.css('height',parseInt(sh>10?sh:10));
maximumOffset = scrollbar[0].offsetHeight-scroller[0].offsetHeight;
timeboxparent.trigger('scroll_element.xdsoft_scroller',[_percent?_percent:Math.abs(parseInt(timebox.css('marginTop')))/(height-parentHeight)]);
}
})
timeboxparent.mousewheel&&timeboxparent.mousewheel(function(event, delta, deltaX, deltaY) {
var top = Math.abs(parseInt(timebox.css('marginTop')));
timeboxparent.trigger('scroll_element.xdsoft_scroller',[(top-delta*20)/(height-parentHeight)]);
event.stopPropagation();
return false;
});
timeboxparent.on('touchstart',function( event ){
start = pointerEventToXY(event);
});
timeboxparent.on('touchmove',function( event ){
if( start ){
var coord = pointerEventToXY(event), top = Math.abs(parseInt(timebox.css('marginTop')));
timeboxparent.trigger('scroll_element.xdsoft_scroller',[(top+(coord.y-start.y)/10)/(height-parentHeight)]);
event.stopPropagation();
event.preventDefault();
};
});
timeboxparent.on('touchend touchcancel',function( event ){
start = false;
});
}
timeboxparent.trigger('resize_scroll.xdsoft_scroller',[_percent]);
});
};
$.fn.datetimepicker = function( opt ){ $.fn.datetimepicker = function( opt ){
var var
CTRLKEY = 17, CTRLKEY = 17,
@ -92,29 +181,73 @@
scrollTime:true, scrollTime:true,
scrollInput:true, scrollInput:true,
mask:false, mask:false,
validateOnBlur:true validateOnBlur:true,
yearStart:1950,
yearEnd:2050
}; };
var options = ($.isPlainObject(opt)||!opt)?$.extend({},default_options,opt):$.extend({},default_options); var options = ($.isPlainObject(opt)||!opt)?$.extend({},default_options,opt):$.extend({},default_options);
var createDateTimePicker = function( input ){ var createDateTimePicker = function( input ){
var datetimepicker = $('<div class="xdsoft_datetimepicker"></div>'), var datetimepicker = $('<div class="xdsoft_datetimepicker"></div>'),
xdsoft_copyright = $('<div class="xdsoft_copyright"><a target="_blank" href="http://xdsoft.net/jqplugins/datetimepicker/">xdsoft.net</a></div>'), xdsoft_copyright = $('<div class="xdsoft_copyright"><a target="_blank" href="http://xdsoft.net/jqplugins/datetimepicker/">xdsoft.net</a></div>'),
datepicker = $('<div class="xdsoft_datepicker active"></div>'), datepicker = $('<div class="xdsoft_datepicker active"></div>'),
mounth_picker = $('<div class="xdsoft_mounthpicker"><button type="button" class="xdsoft_prev"></button><div class="xdsoft_label xdsoft_month"></div><div class="xdsoft_label xdsoft_year"></div><button type="button" class="xdsoft_next"></button></div>'), mounth_picker = $('<div class="xdsoft_mounthpicker"><button type="button" class="xdsoft_prev"></button><div class="xdsoft_label xdsoft_month"><span></span></div><div class="xdsoft_label xdsoft_year"><span></span></div><button type="button" class="xdsoft_next"></button></div>'),
calendar = $('<div class="xdsoft_calendar"></div>'), calendar = $('<div class="xdsoft_calendar"></div>'),
timepicker = $('<div class="xdsoft_timepicker active"><button type="button" class="xdsoft_prev"></button><div class="xdsoft_time_box"></div><button type="button" class="xdsoft_next"></button></div>'), timepicker = $('<div class="xdsoft_timepicker active"><button type="button" class="xdsoft_prev"></button><div class="xdsoft_time_box"></div><button type="button" class="xdsoft_next"></button></div>'),
timeboxparent = timepicker.find('.xdsoft_time_box').eq(0), timeboxparent = timepicker.find('.xdsoft_time_box').eq(0),
timebox = $('<div class="xdsoft_time_variant"></div>'), timebox = $('<div class="xdsoft_time_variant"></div>'),
scrollbar = $('<div class="xdsoft_scrollbar"></div>'), scrollbar = $('<div class="xdsoft_scrollbar"></div>'),
scroller = $('<div class="xdsoft_scroller"></div>'); scroller = $('<div class="xdsoft_scroller"></div>'),
monthselect =$('<div class="xdsoft_select xdsoft_monthselect"><div></div></div>'),
yearselect =$('<div class="xdsoft_select xdsoft_yearselect"><div></div></div>');
mounth_picker.find('.xdsoft_month span').after(monthselect);
mounth_picker.find('.xdsoft_year span').after(yearselect);
mounth_picker.find('.xdsoft_month,.xdsoft_year').on('mousedown.xdsoft',function(){
mounth_picker.find('.xdsoft_select').hide();
var select = $(this).find('.xdsoft_select').eq(0),xd = datetimepicker.data('xdsoft_datetime'),val = 0,top = 0;
if( xd&&xd.currentTime )
val = xd.currentTime[$(this).hasClass('xdsoft_month')?'getMonth':'getFullYear']();
select.show();
for(var items = select.find('div.xdsoft_option'),i = 0;i<items.length;i++)
if( items.eq(i).data('value')==val )
break;
else top+=items[0].offsetHeight;
select.xdsoftScroller(top/(select.children()[0].offsetHeight-(select[0].offsetHeight-2)));
//select.val(val);
event.stopPropagation();
return false;
});
var selects = mounth_picker.find('.xdsoft_select');
selects
.xdsoftScroller()
.on('mousedown.xdsoft',function( event ){
event.stopPropagation();
event.preventDefault();
})
.on('mousedown.xdsoft','.xdsoft_option',function( event ){
var xd = datetimepicker.data('xdsoft_datetime');
if( xd&&xd.currentTime )
xd.currentTime[$(this).parent().parent().hasClass('xdsoft_monthselect')?'setMonth':'setFullYear']($(this).data('value'));
$(this).parent().parent().hide();
datetimepicker.trigger('xchange.xdsoft');
});
datetimepicker.setOptions = function( _options ){ datetimepicker.setOptions = function( _options ){
options = $.extend({},options,_options); options = $.extend({},options,_options);
if( (options.open||options.opened)&&(!options.inline) ){
input.trigger('open.xdsoft');
}
if( options.inline ){ if( options.inline ){
datetimepicker.addClass('xdsoft_inline'); datetimepicker.addClass('xdsoft_inline');
input.after(datetimepicker).hide(); input.after(datetimepicker).hide();
} datetimepicker.trigger('afterOpen.xdsoft');
if( options.open||options.opened||options.inline ){
input.trigger('open.xdsoft');
} }
if( options.inverseButton ){ if( options.inverseButton ){
options.next = 'xdsoft_prev'; options.next = 'xdsoft_prev';
@ -253,10 +386,12 @@
datetimepicker.on('mousedown.xdsoft',function( event ){ datetimepicker.on('mousedown.xdsoft',function( event ){
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
yearselect.hide();
monthselect.hide();
return false; return false;
}); });
// scrollbar for timepicker // scrollbar for timepicker
scrollbar.append(scroller); /*scrollbar.append(scroller);
timepicker.find('.xdsoft_time_box').append(scrollbar); timepicker.find('.xdsoft_time_box').append(scrollbar);
(function(){ (function(){
var move = 0; var move = 0;
@ -314,7 +449,14 @@
height = timebox[0].offsetHeight; height = timebox[0].offsetHeight;
timebox.css('marginTop',-parseInt((height-pheight)*percent)) timebox.css('marginTop',-parseInt((height-pheight)*percent))
}); });
timepicker.find('.xdsoft_time_box').append(timebox); */
var scroll_element = timepicker.find('.xdsoft_time_box');
scroll_element.append(timebox);
scroll_element.xdsoftScroller();
datetimepicker.on('afterOpen.xdsoft',function(){
scroll_element.xdsoftScroller();
});
datetimepicker.append(datepicker).append(timepicker); datetimepicker.append(datepicker).append(timepicker);
if( options.withoutCopyright!==true ) if( options.withoutCopyright!==true )
datetimepicker.append(xdsoft_copyright); datetimepicker.append(xdsoft_copyright);
@ -333,7 +475,7 @@
}; };
self.setCurrentTime = function( dTime){ self.setCurrentTime = function( dTime){
self.currentTime = (typeof dTime == 'string')? self.strtodatetime(dTime) : self.isValidDate(dTime) ? dTime: self.now(); self.currentTime = (typeof dTime == 'string')? self.strtodatetime(dTime) : self.isValidDate(dTime) ? dTime: self.now();
datetimepicker.trigger('change.xdsoft'); datetimepicker.trigger('xchange.xdsoft');
}; };
self.getCurrentTime = function( dTime){ self.getCurrentTime = function( dTime){
return self.currentTime; return self.currentTime;
@ -346,7 +488,7 @@
} }
self.currentTime.setMonth(month); self.currentTime.setMonth(month);
options.onChangeMonth&&options.onChangeMonth.call&&options.onChangeMonth.call(datetimepicker,datetimepicker.data('xdsoft_datetime').currentTime,datetimepicker.data('input')); options.onChangeMonth&&options.onChangeMonth.call&&options.onChangeMonth.call(datetimepicker,datetimepicker.data('xdsoft_datetime').currentTime,datetimepicker.data('input'));
datetimepicker.trigger('change.xdsoft'); datetimepicker.trigger('xchange.xdsoft');
return month; return month;
}; };
self.prevMonth = function(){ self.prevMonth = function(){
@ -357,7 +499,7 @@
} }
self.currentTime.setMonth(month); self.currentTime.setMonth(month);
options.onChangeMonth&&options.onChangeMonth.call&&options.onChangeMonth.call(datetimepicker,datetimepicker.data('xdsoft_datetime').currentTime,datetimepicker.data('input')); options.onChangeMonth&&options.onChangeMonth.call&&options.onChangeMonth.call(datetimepicker,datetimepicker.data('xdsoft_datetime').currentTime,datetimepicker.data('input'));
datetimepicker.trigger('change.xdsoft'); datetimepicker.trigger('xchange.xdsoft');
return month; return month;
}; };
@ -411,7 +553,7 @@
}else if( $this.hasClass(options.prev) && top-options.timeHeightInTimePicker>=0 ){ }else if( $this.hasClass(options.prev) && top-options.timeHeightInTimePicker>=0 ){
timebox.css('marginTop','-'+(top-options.timeHeightInTimePicker)+'px') timebox.css('marginTop','-'+(top-options.timeHeightInTimePicker)+'px')
} }
datetimepicker.trigger('scroll.timebox',[Math.abs(parseInt(timebox.css('marginTop')))]); timeboxparent.trigger('scroll_element.xdsoft_scroller',[Math.abs(parseInt(timebox.css('marginTop'))/(height-pheight))]);
period= ( period>10 )?10:period-10; period= ( period>10 )?10:period-10;
!stop&&(timer = setTimeout(arguments.callee,v?v:period)); !stop&&(timer = setTimeout(arguments.callee,v?v:period));
})(500); })(500);
@ -421,9 +563,8 @@
$([document.body,window]).off('mouseup.xdsoft',arguments.callee); $([document.body,window]).off('mouseup.xdsoft',arguments.callee);
}); });
}); });
// base handler - generating a calendar and timepicker
// generating a calendar and timepicker datetimepicker.on('xchange.xdsoft',function(event){
datetimepicker.on('change.xdsoft',function(){
var xd = $(this).data('xdsoft_datetime'), var xd = $(this).data('xdsoft_datetime'),
table = ''; table = '';
var start = new Date(xd.currentTime.getFullYear(),xd.currentTime.getMonth(),1); var start = new Date(xd.currentTime.getFullYear(),xd.currentTime.getMonth(),1);
@ -453,8 +594,8 @@
} }
table+='</tbody></table>'; table+='</tbody></table>';
calendar.html(table); calendar.html(table);
mounth_picker.find('.xdsoft_label').eq(0).text(options.i18n[options.lang].months[xd.currentTime.getMonth()]); mounth_picker.find('.xdsoft_label span').eq(0).text(options.i18n[options.lang].months[xd.currentTime.getMonth()]);
mounth_picker.find('.xdsoft_label').eq(1).text(xd.currentTime.getFullYear()); mounth_picker.find('.xdsoft_label span').eq(1).text(xd.currentTime.getFullYear());
var time = '',h = '',m =''; var time = '',h = '',m ='';
var line_time = function (h,m){ var line_time = function (h,m){
var now = new Date(); var now = new Date();
@ -491,6 +632,16 @@
} }
} }
timebox.html(time); timebox.html(time);
var opt = '',i = 0;
for( i = parseInt(options.yearStart);i<= parseInt(options.yearEnd);i++ ){
opt+='<div class="xdsoft_option '+(xd.currentTime.getFullYear()==i?'xdsoft_current':'')+'" data-value="'+i+'">'+i+'</div>';
}
yearselect.children().eq(0).html(opt);
for( i = 0,opt = '';i<= 11;i++ ){
opt+='<div class="xdsoft_option '+(xd.currentTime.getMonth()==i?'xdsoft_current':'')+'" data-value="'+i+'">'+options.i18n[options.lang].months[i]+'</div>';
}
monthselect.children().eq(0).html(opt);
event.stopPropagation();
//timebox.find('.xdsoft_current').length&&timebox.css('marginTop','-'+parseInt(timebox.find('.xdsoft_current').index()*options.timeHeightInTimePicker)+'px'); //timebox.find('.xdsoft_current').length&&timebox.css('marginTop','-'+parseInt(timebox.find('.xdsoft_current').index()*options.timeHeightInTimePicker)+'px');
}); });
datetimepicker.on('afterOpen.xdsoft',function(){ datetimepicker.on('afterOpen.xdsoft',function(){
@ -501,7 +652,7 @@
if( (height-pheight)<top ) if( (height-pheight)<top )
top = height-pheight; top = height-pheight;
timebox.css('marginTop','-'+parseInt(top)+'px'); timebox.css('marginTop','-'+parseInt(top)+'px');
datetimepicker.trigger('scroll.timebox',[parseInt(top)]); timeboxparent.trigger('scroll_element.xdsoft_scroller',[parseInt(top)/(height-pheight)]);
} }
}); });
calendar.on('mousedown.xdsoft','td',function(){ calendar.on('mousedown.xdsoft','td',function(){
@ -516,7 +667,7 @@
if( (options.closeOnDateSelect===true||( options.closeOnDateSelect===0&&!options.timepicker ))&&!options.inline ) if( (options.closeOnDateSelect===true||( options.closeOnDateSelect===0&&!options.timepicker ))&&!options.inline )
datetimepicker.trigger('close.xdsoft'); datetimepicker.trigger('close.xdsoft');
options.onSelectDate&&options.onSelectDate.call&&options.onSelectDate.call(datetimepicker,datetimepicker.data('xdsoft_datetime').currentTime,datetimepicker.data('input')); options.onSelectDate&&options.onSelectDate.call&&options.onSelectDate.call(datetimepicker,datetimepicker.data('xdsoft_datetime').currentTime,datetimepicker.data('input'));
datetimepicker.trigger('change.xdsoft'); datetimepicker.trigger('xchange.xdsoft');
datetimepicker.trigger('changedatetime.xdsoft'); datetimepicker.trigger('changedatetime.xdsoft');
}); });
timebox.on('mousedown.xdsoft','div',function(){ timebox.on('mousedown.xdsoft','div',function(){
@ -529,7 +680,7 @@
datetimepicker.data('input').val( datetimepicker.data('xdsoft_datetime').str() ); datetimepicker.data('input').val( datetimepicker.data('xdsoft_datetime').str() );
!options.inline&&datetimepicker.trigger('close.xdsoft'); !options.inline&&datetimepicker.trigger('close.xdsoft');
options.onSelectTime&&options.onSelectTime.call&&options.onSelectTime.call(datetimepicker,datetimepicker.data('xdsoft_datetime').currentTime,datetimepicker.data('input')); options.onSelectTime&&options.onSelectTime.call&&options.onSelectTime.call(datetimepicker,datetimepicker.data('xdsoft_datetime').currentTime,datetimepicker.data('input'));
datetimepicker.trigger('change.xdsoft'); datetimepicker.trigger('xchange.xdsoft');
datetimepicker.trigger('changedatetime.xdsoft'); datetimepicker.trigger('changedatetime.xdsoft');
}); });
datetimepicker.mousewheel&&datepicker.mousewheel(function(event, delta, deltaX, deltaY) { datetimepicker.mousewheel&&datepicker.mousewheel(function(event, delta, deltaX, deltaY) {
@ -541,7 +692,7 @@
datetimepicker.data('xdsoft_datetime').prevMonth(); datetimepicker.data('xdsoft_datetime').prevMonth();
return false; return false;
}); });
datetimepicker.mousewheel&&timepicker.mousewheel(function(event, delta, deltaX, deltaY) { datetimepicker.mousewheel&&timeboxparent.unmousewheel().mousewheel(function(event, delta, deltaX, deltaY) {
if( !options.scrollTime ) if( !options.scrollTime )
return true; return true;
var pheight = timeboxparent[0].offsetHeight-2, var pheight = timeboxparent[0].offsetHeight-2,
@ -555,7 +706,8 @@
timebox.css('marginTop','-'+(top-options.timeHeightInTimePicker)+'px'); timebox.css('marginTop','-'+(top-options.timeHeightInTimePicker)+'px');
fl = false; fl = false;
} }
datetimepicker.trigger('scroll.timebox',[Math.abs(parseInt(timebox.css('marginTop')))]); timeboxparent.trigger('scroll_element.xdsoft_scroller',[Math.abs(parseInt(timebox.css('marginTop'))/(height-pheight))]);
event.stopPropagation();
return fl; return fl;
}); });
datetimepicker.on('changedatetime.xdsoft',function(){ datetimepicker.on('changedatetime.xdsoft',function(){
@ -604,12 +756,13 @@
} }
} }
}); });
datetimepicker.on( 'close.xdsoft',function(){ datetimepicker.on( 'close.xdsoft',function( event ){
var onClose = true; var onClose = true;
options.onClose&&options.onClose.call&&(onClose=options.onClose.call(datetimepicker,datetimepicker.data('xdsoft_datetime').currentTime,datetimepicker.data('input'))); options.onClose&&options.onClose.call&&(onClose=options.onClose.call(datetimepicker,datetimepicker.data('xdsoft_datetime').currentTime,datetimepicker.data('input')));
if( onClose!==false&&!options.opened&&!options.inline ){ if( onClose!==false&&!options.opened&&!options.inline ){
datetimepicker.hide(); datetimepicker.hide();
} }
event.stopPropagation();
} ); } );
datetimepicker.data('input',input); datetimepicker.data('input',input);
@ -617,6 +770,7 @@
datetimepicker.data('xdsoft_datetime',_xdsoft_datetime); datetimepicker.data('xdsoft_datetime',_xdsoft_datetime);
datetimepicker.setOptions(options); datetimepicker.setOptions(options);
_xdsoft_datetime.setCurrentTime( options.value?options.value:(input&&input.val&&input.val())?input.val():new Date ); _xdsoft_datetime.setCurrentTime( options.value?options.value:(input&&input.val&&input.val())?input.val():new Date );
datetimepicker.trigger('afterOpen.xdsoft');
input.data( 'xdsoft_datetimepicker',datetimepicker ) input.data( 'xdsoft_datetimepicker',datetimepicker )
.on('open.xdsoft focusin.xdsoft mousedown.xdsoft',function(event){ .on('open.xdsoft focusin.xdsoft mousedown.xdsoft',function(event){
if( input.is(':disabled')||input.is(':hidden')||!input.is(':visible') ) if( input.is(':disabled')||input.is(':hidden')||!input.is(':visible') )

BIN
screen/1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
screen/3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB