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

Merge branch 'doublerebel-master'

Browse source
This commit is contained in:
Trent 2010-11-27 14:17:02 -05:00
parent 3abd96f50b ee83b6ffb7
commit 05b4937942
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
jquery-ui-timepicker-addon.js vendored
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;