r3482 committed - Datepicker - Fixed #4787 - Datepicker: fix animation control
Revision: 3482
Author: kbwood.au@gmail.com
Date: Sun Nov 29 14:56:30 2009
Log: Datepicker - Fixed #4787 - Datepicker: fix animation control
http://code.google.com/p/jquery-ui/source/detail?r=3482
Modified:
/trunk/ui/jquery.ui.datepicker.js
=======================================
--- /trunk/ui/jquery.ui.datepicker.js Thu Nov 26 22:17:41 2009
+++ /trunk/ui/jquery.ui.datepicker.js Sun Nov 29 14:56:30 2009
@@ -607,7 +607,7 @@
'static' : (isFixed ? 'fixed' : 'absolute')), display: 'none',
left: offset.left + 'px', top: offset.top + 'px'});
if (!inst.inline) {
- var showAnim = $.datepicker._get(inst, 'showAnim') || 'show';
+ var showAnim = $.datepicker._get(inst, 'showAnim');
var duration = $.datepicker._get(inst, 'duration');
var postProcess = function() {
$.datepicker._datepickerShowing = true;
@@ -619,8 +619,8 @@
if ($.effects && $.effects[showAnim])
inst.dpDiv.show(showAnim, $.datepicker._get(inst, 'showOptions'),
duration, postProcess);
else
- inst.dpDiv[showAnim](duration, postProcess);
- if (duration == '')
+ inst.dpDiv[showAnim || 'show']((showAnim ? duration : ''),
postProcess);
+ if (!showAnim)
postProcess();
if (inst.input[0].type != 'hidden')
inst.input[0].focus();
@@ -720,19 +720,18 @@
if (!inst || (input && inst != $.data(input, PROP_NAME)))
return;
if (this._datepickerShowing) {
- duration = (duration != null ? duration : this._get(inst, 'duration'));
+ duration = duration || this._get(inst, 'duration');
var showAnim = this._get(inst, 'showAnim');
var postProcess = function() {
$.datepicker._tidyDialog(inst);
};
- if (duration != '' && $.effects && $.effects[showAnim])
- inst.dpDiv.hide(showAnim, $.datepicker._get(inst, 'showOptions'),
- duration, postProcess);
+ if ($.effects && $.effects[showAnim])
+ inst.dpDiv.hide(showAnim, $.datepicker._get(inst, 'showOptions'),
duration, postProcess);
else
- inst.dpDiv[(duration == '' ? 'hide' : (showAnim
== 'slideDown' ? 'slideUp' :
- (showAnim == 'fadeIn' ? 'fadeOut' : 'hide')))](duration, postProcess);
- if (duration == '')
- this._tidyDialog(inst);
+ inst.dpDiv[(showAnim == 'slideDown' ? 'slideUp' :
+ (showAnim == 'fadeIn' ? 'fadeOut' : 'hide'))]((showAnim ?
duration : ''), postProcess);
+ if (!showAnim)
+ postProcess();
var onClose = this._get(inst, 'onClose');
if (onClose)
onClose.apply((inst.input ? inst.input[0] : null),
--