summaryrefslogtreecommitdiffstats
path: root/dist/jquery-ui-timepicker-addon.js
diff options
context:
space:
mode:
Diffstat (limited to 'dist/jquery-ui-timepicker-addon.js')
-rw-r--r--dist/jquery-ui-timepicker-addon.js16
1 files changed, 10 insertions, 6 deletions
diff --git a/dist/jquery-ui-timepicker-addon.js b/dist/jquery-ui-timepicker-addon.js
index b34bf55..d71db90 100644
--- a/dist/jquery-ui-timepicker-addon.js
+++ b/dist/jquery-ui-timepicker-addon.js
@@ -93,6 +93,7 @@
altTimeFormat: null,
altSeparator: null,
altTimeSuffix: null,
+ altRedirectFocus: true,
pickerTimeFormat: null,
pickerTimeSuffix: null,
showTimepicker: true,
@@ -265,11 +266,14 @@
tp_inst.$input = $input;
if (tp_inst._defaults.altField) {
- tp_inst.$altInput = $(tp_inst._defaults.altField).css({
- cursor: 'pointer'
- }).focus(function () {
- $input.trigger("focus");
- });
+ tp_inst.$altInput = $(tp_inst._defaults.altField);
+ if (tp_inst._defaults.altRedirectFocus === true) {
+ tp_inst.$altInput.css({
+ cursor: 'pointer'
+ }).focus(function () {
+ $input.trigger("focus");
+ });
+ }
}
if (tp_inst._defaults.minDate === 0 || tp_inst._defaults.minDateTime === 0) {
@@ -1102,7 +1106,7 @@
var tmp_args = arguments;
if (typeof(o) === 'string') {
- if (o === 'getDate') {
+ if (o === 'getDate' || (o === 'option' && tmp_args.length === 2 && typeof (tmp_args[1]) === 'string')) {
return $.fn.datepicker.apply($(this[0]), tmp_args);
} else {
return this.each(function () {