mirror of
https://github.com/jquery/jquery-ui.git
synced 2026-04-20 03:02:41 -04:00
slider: animate option was ignored if only one handle (fixes #4167 slider:animation for single handles broken)
This commit is contained in:
@@ -317,7 +317,7 @@ $.widget("ui.slider", $.extend({}, $.ui.mouse, {
|
||||
});
|
||||
var otherVal = this.values(index ? 0 : 1);
|
||||
if (allowed !== false) {
|
||||
this.values(index, newVal, !( event.type == 'mousedown' && this.options.animate ));
|
||||
this.values(index, newVal, ( event.type == 'mousedown' && this.options.animate ));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -362,13 +362,11 @@ $.widget("ui.slider", $.extend({}, $.ui.mouse, {
|
||||
|
||||
},
|
||||
|
||||
values: function(index, newValue, noAnimation) {
|
||||
|
||||
if(!this.options.animate) noAnimation = true;
|
||||
values: function(index, newValue, animated) {
|
||||
|
||||
if (arguments.length > 1) {
|
||||
this.options.values[index] = newValue;
|
||||
this._refreshValue(!noAnimation);
|
||||
this._refreshValue(animated);
|
||||
this._change();
|
||||
}
|
||||
|
||||
@@ -384,7 +382,7 @@ $.widget("ui.slider", $.extend({}, $.ui.mouse, {
|
||||
|
||||
},
|
||||
|
||||
_setData: function(key, value) {
|
||||
_setData: function(key, value, animated) {
|
||||
|
||||
$.widget.prototype._setData.apply(this, arguments);
|
||||
|
||||
@@ -396,10 +394,10 @@ $.widget("ui.slider", $.extend({}, $.ui.mouse, {
|
||||
this.element
|
||||
.removeClass("ui-slider-horizontal ui-slider-vertical")
|
||||
.addClass("ui-slider-" + this.orientation);
|
||||
this._refreshValue();
|
||||
this._refreshValue(animated);
|
||||
break;
|
||||
case 'value':
|
||||
this._refreshValue();
|
||||
this._refreshValue(animated);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user