Skip to content
Closed
Changes from all commits
Commits
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
19 changes: 17 additions & 2 deletions jquery-ui-timepicker-addon.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
secondText: 'Second'
};
this.defaults = { // Global defaults for all the datetime picker instances
holdDatepickerOpen: true,
showButtonPanel: true,
timeOnly: false,
showHour: true,
Expand Down Expand Up @@ -341,7 +340,21 @@
//########################################################################
jQuery.fn.datetimepicker = function(o) {
var opts = (o === undefined ? {} : o);
var input = $(this);
var tp = new Timepicker();
var inlineSettings = {};

for (var attrName in tp.defaults) {
var attrValue = input.attr('time:' + attrName);
if (attrValue) {
try {
inlineSettings[attrName] = eval(attrValue);
} catch (err) {
inlineSettings[attrName] = attrValue;
}
}
}
tp.defaults = $.extend(tp.defaults, inlineSettings);

var beforeShowFunc = function(input, inst) {
tp.hour = tp.defaults.hour;
Expand All @@ -365,7 +378,9 @@
};

var onCloseFunc = function(dateText, inst) {
tp.updateDateTime(inst, tp);
if(tp.timeDefined === true) {
tp.updateDateTime(inst, tp);
}
if ($.isFunction(opts.onClose)) {
opts.onClose(dateText, inst);
}
Expand Down