Fix to apply regional settings from global defaults to new instance

This commit is contained in:
doublerebel 2010-11-27 10:33:53 -08:00
parent e5ab6d1886
commit ee83b6ffb7

View file

@ -96,7 +96,7 @@ $.extend(Timepicker.prototype, {
var tp_inst = new Timepicker(), var tp_inst = new Timepicker(),
inlineSettings = {}; inlineSettings = {};
for (var attrName in tp_inst._defaults) { for (var attrName in this._defaults) {
var attrValue = $input.attr('time:' + attrName); var attrValue = $input.attr('time:' + attrName);
if (attrValue) { if (attrValue) {
try { try {
@ -106,7 +106,7 @@ $.extend(Timepicker.prototype, {
} }
} }
} }
tp_inst._defaults = $.extend({}, tp_inst._defaults, inlineSettings, o, { tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, {
beforeShow: function(input, dp_inst) { beforeShow: function(input, dp_inst) {
tp_inst.hour = tp_inst._defaults.hour; tp_inst.hour = tp_inst._defaults.hour;
tp_inst.minute = tp_inst._defaults.minute; tp_inst.minute = tp_inst._defaults.minute;