diff options
| author | Trent <trsserver@trsserver.(none)> | 2010-11-27 14:17:02 -0500 |
|---|---|---|
| committer | Trent <trsserver@trsserver.(none)> | 2010-11-27 14:17:02 -0500 |
| commit | 05b49379427b3f32713b9718893e3cda538f2f91 (patch) | |
| tree | caeed66bd41bce6953df3dae62e4b851a480f78e /jquery-ui-timepicker-addon.js | |
| parent | 3abd96f50b7095bbc55b1dbe945c45d7cbcf8cf8 (diff) | |
| parent | ee83b6ffb7d5e01ace8244a00e40b20557a68474 (diff) | |
| download | jQuery-Timepicker-Addon-05b49379427b3f32713b9718893e3cda538f2f91.zip jQuery-Timepicker-Addon-05b49379427b3f32713b9718893e3cda538f2f91.tar.gz jQuery-Timepicker-Addon-05b49379427b3f32713b9718893e3cda538f2f91.tar.bz2 | |
Merge branch 'doublerebel-master'
Diffstat (limited to 'jquery-ui-timepicker-addon.js')
| -rw-r--r-- | jquery-ui-timepicker-addon.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index 81901ad..2fec615 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -96,7 +96,7 @@ $.extend(Timepicker.prototype, { var tp_inst = new Timepicker(), inlineSettings = {}; - for (var attrName in tp_inst._defaults) { + for (var attrName in this._defaults) { var attrValue = $input.attr('time:' + attrName); if (attrValue) { 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) { tp_inst.hour = tp_inst._defaults.hour; tp_inst.minute = tp_inst._defaults.minute; |