Skip to content

Hi i've made some changes #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Hi i've made some changes #207

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa9a5ca
Override _optionDatepicker to set time with "option" and adjust sliders
kuzemchik Jul 19, 2011
520fb81
pull 0.9.6 from trentrichardson
kuzemchik Jul 21, 2011
f225d33
Prevent time dissapearing on event subscription
kuzemchik Jul 21, 2011
a7dcb30
Options rewrited. onSelect event for sliders is working now.
kuzemchik Jul 21, 2011
6f24e93
Zero and null min/max values doesn't give error now
kuzemchik Jul 22, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Zero and null min/max values doesn't give error now
  • Loading branch information
@kuzemchik
kuzemchik committed Jul 22, 2011
commit 6f24e93ed85bb90965f7d10d939a47cc97eb2530
27 changes: 21 additions & 6 deletions jquery-ui-timepicker-addon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,16 @@ $.extend(Timepicker.prototype, {
tp_inst.$altInput = $(o.altField)
.css({ cursor: 'pointer' })
.focus(function(){ $input.trigger("focus"); });


if(tp_inst._defaults.minDate==0 || tp_inst._defaults.minDateTime==0)
{
tp_inst._defaults.minDate=new Date();
}
if(tp_inst._defaults.maxDate==0 || tp_inst._defaults.maxDateTime==0)
{
tp_inst._defaults.maxDate=new Date();
}

// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date)
tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
Expand All @@ -173,7 +182,6 @@ $.extend(Timepicker.prototype, {
tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
if(tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date)
tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());

return tp_inst;
},

Expand Down Expand Up @@ -520,7 +528,7 @@ $.extend(Timepicker.prototype, {

if(!this._defaults.showTimepicker) return; // No time so nothing to check here

if($.datepicker._get(dp_inst, 'minDateTime') !== null && dp_date){
if($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date){
var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);

Expand Down Expand Up @@ -553,7 +561,7 @@ $.extend(Timepicker.prototype, {
}
}

if($.datepicker._get(dp_inst, 'maxDateTime') !== null && dp_date){
if($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date){
var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);

Expand Down Expand Up @@ -1060,11 +1068,18 @@ $.datepicker._optionDatepicker = function(target, name, value) {
max = name.maxDateTime;
}
if(min){ //if min was set
min= new Date(min);
if(min==0)
min=new Date();
else
min= new Date(min);

tp_inst._defaults.minDate = min;
tp_inst._defaults.minDateTime = min;
} else if (max){ //if max was set
max= new Date(max);
if(max==0)
max=new Date();
else
max= new Date(max);
tp_inst._defaults.maxDate = max;
tp_inst._defaults.maxDateTime = max;
}
Expand Down