Skip to content

Commit

Permalink
Slider: Properly handle value and value methods as setters. Fixes #48…
Browse files Browse the repository at this point in the history
…81 - Slider: value and values methods as setters aren't chainable.

(cherry picked from commit 2197c61)
  • Loading branch information
scottgonzalez committed Mar 28, 2011
1 parent eb3d955 commit 8310d18
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tests/unit/slider/slider_methods.js
Expand Up @@ -74,7 +74,7 @@ test("value", function() {
value: 5
});
equals(el.slider('value'), 5, 'range: ' + this + ' slider method get');
el.slider('value', 10);
equals(el.slider('value', 10), el, 'value method is chainable');
equals(el.slider('value'), 10, 'range: ' + this + ' slider method set');
el.remove();
});
Expand All @@ -85,13 +85,13 @@ test("value", function() {
el.slider('option', 'value', -2);
equals(el.slider('option', 'value'), -2, 'value option does not respect min');
equals(el.slider('value'), -1, 'value method get respects min');
el.slider('value', -2);
equals(el.slider('value', -2), el, 'value method is chainable');
equals(el.slider('option', 'value'), -1, 'value method set respects min');
// max with value option vs value method
el.slider('option', 'value', 2);
equals(el.slider('option', 'value'), 2, 'value option does not respect max');
equals(el.slider('value'), 1, 'value method get respects max');
el.slider('value', 2);
equals(el.slider('value', 2), el, 'value method is chainable');
equals(el.slider('option', 'value'), 1, 'value method set respects max');
});

Expand Down
2 changes: 2 additions & 0 deletions ui/jquery.ui.slider.js
Expand Up @@ -466,6 +466,7 @@ $.widget( "ui.slider", $.ui.mouse, {
this.options.value = this._trimAlignValue( newValue );
this._refreshValue();
this._change( null, 0 );
return;
}

return this._value();
Expand All @@ -480,6 +481,7 @@ $.widget( "ui.slider", $.ui.mouse, {
this.options.values[ index ] = this._trimAlignValue( newValue );
this._refreshValue();
this._change( null, index );
return;
}

if ( arguments.length ) {
Expand Down

0 comments on commit 8310d18

Please sign in to comment.