deac/jQuery-Timepicker-Addon
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove unused variables, fix validation warnings

Browse source
This commit is contained in:
Bartosz Firyn 2012-02-15 12:54:09 +01:00
parent 9b57a88e8c
commit e795b3e7a6
1 changed files with 51 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
jquery-ui-timepicker-addon.js vendored
View file

@ -163,8 +163,8 @@ $.extend(Timepicker.prototype, {
}, },
timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker'); timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
}); });
tp_inst.amNames = $.map(tp_inst._defaults.amNames, function(val) { return val.toUpperCase() }); tp_inst.amNames = $.map(tp_inst._defaults.amNames, function(val) { return val.toUpperCase(); });
tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function(val) { return val.toUpperCase() }); tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function(val) { return val.toUpperCase(); });
if (tp_inst._defaults.timezoneList === null) { if (tp_inst._defaults.timezoneList === null) {
var timezoneList = []; var timezoneList = [];
@ -314,7 +314,7 @@ $.extend(Timepicker.prototype, {
$.merge(markers, o.amNames); $.merge(markers, o.amNames);
if (o.pmNames) if (o.pmNames)
$.merge(markers, o.pmNames); $.merge(markers, o.pmNames);
markers = $.map(markers, function(val) { return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&') }); markers = $.map(markers, function(val) { return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&'); });
return '(' + markers.join('|') + ')?'; return '(' + markers.join('|') + ')?';
}, },
@ -364,7 +364,7 @@ $.extend(Timepicker.prototype, {
minuteGridSize = 0, minuteGridSize = 0,
secondGridSize = 0, secondGridSize = 0,
millisecGridSize = 0, millisecGridSize = 0,
size; size = null;
// Hours // Hours
html += '<dd class="ui_tpicker_hour"><div id="ui_tpicker_hour_' + dp_id + '"' + html += '<dd class="ui_tpicker_hour"><div id="ui_tpicker_hour_' + dp_id + '"' +
@ -909,7 +909,6 @@ $.fn.extend({
//######################################################################## //########################################################################
datetimepicker: function(o) { datetimepicker: function(o) {
o = o || {}; o = o || {};
var $input = this,
tmp_args = arguments; tmp_args = arguments;
if (typeof(o) == 'string'){ if (typeof(o) == 'string'){
@ -975,7 +974,7 @@ $.datepicker.formatTime = function(format, time, options) {
tmptime = $.trim(tmptime); tmptime = $.trim(tmptime);
return tmptime; return tmptime;
} };
//######################################################################## //########################################################################
// the bad hack :/ override datepicker so it doesnt close on select // the bad hack :/ override datepicker so it doesnt close on select
@ -1245,13 +1244,10 @@ $.datepicker.parseDate = function(format, value, settings) {
//####################################################################################### //#######################################################################################
// override formatDate to set date with time to the input // override formatDate to set date with time to the input
//####################################################################################### //#######################################################################################
$.datepicker._base_formatDate=$.datepicker._formatDate; $.datepicker._base_formatDate = $.datepicker._formatDate;
$.datepicker._formatDate = function(inst, day, month, year){ $.datepicker._formatDate = function(inst, day, month, year){
var tp_inst = this._get(inst, 'timepicker'); var tp_inst = this._get(inst, 'timepicker');
if(tp_inst) if(tp_inst) {
{
if(day)
var b = this._base_formatDate(inst, day, month, year);
tp_inst._updateDateTime(inst); tp_inst._updateDateTime(inst);
return tp_inst.$input.val(); return tp_inst.$input.val();
} }
@ -1266,16 +1262,16 @@ $.datepicker._optionDatepicker = function(target, name, value) {
var inst = this._getInst(target), var inst = this._getInst(target),
tp_inst = this._get(inst, 'timepicker'); tp_inst = this._get(inst, 'timepicker');
if (tp_inst) { if (tp_inst) {
var min,max,onselect; var min = null, max = null, onselect = null;
if (typeof name == 'string') { // if min/max was set with the string if (typeof name == 'string') { // if min/max was set with the string
if (name==='minDate' || name==='minDateTime' ) if (name === 'minDate' || name === 'minDateTime' )
min = value; min = value;
else if (name==='maxDate' || name==='maxDateTime') else if (name === 'maxDate' || name === 'maxDateTime')
max = value; max = value;
else if (name==='onSelect') else if (name === 'onSelect')
onselect=value; onselect = value;
} else if (typeof name == 'object') { //if min/max was set with the JSON } else if (typeof name == 'object') { //if min/max was set with the JSON
if(name.minDate) if (name.minDate)
min = name.minDate; min = name.minDate;
else if (name.minDateTime) else if (name.minDateTime)
min = name.minDateTime; min = name.minDateTime;
@ -1284,24 +1280,23 @@ $.datepicker._optionDatepicker = function(target, name, value) {
else if (name.maxDateTime) else if (name.maxDateTime)
max = name.maxDateTime; max = name.maxDateTime;
} }
if(min){ //if min was set if(min) { //if min was set
if(min==0) if (min == 0)
min=new Date(); min = new Date();
else else
min= new Date(min); min = new Date(min);
tp_inst._defaults.minDate = min; tp_inst._defaults.minDate = min;
tp_inst._defaults.minDateTime = min; tp_inst._defaults.minDateTime = min;
} else if (max){ //if max was set } else if (max) { //if max was set
if(max==0) if(max==0)
max=new Date(); max=new Date();
else else
max= new Date(max); max= new Date(max);
tp_inst._defaults.maxDate = max; tp_inst._defaults.maxDate = max;
tp_inst._defaults.maxDateTime = max; tp_inst._defaults.maxDateTime = max;
} } else if (onselect)
else if (onselect) tp_inst._defaults.onSelect = onselect;
tp_inst._defaults.onSelect=onselect;
} }
if (value === undefined) if (value === undefined)
return this._base_optionDatepicker(target, name); return this._base_optionDatepicker(target, name);
@ -1323,4 +1318,3 @@ $.timepicker = new Timepicker(); // singleton instance
$.timepicker.version = "1.0.0"; $.timepicker.version = "1.0.0";
})(jQuery); })(jQuery);