diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2011-03-28 17:34:04 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-03-28 17:34:04 -0400 |
| commit | 2197c61f1f91a7b5046fb994d370f38ded602ee6 (patch) | |
| tree | bb114c9669bcb816f35a509331b92a549b8c72f0 | |
| parent | d236c0d6e1ecf9755624ce1f033ba648124c219e (diff) | |
| download | jquery-ui-2197c61f1f91a7b5046fb994d370f38ded602ee6.tar.gz jquery-ui-2197c61f1f91a7b5046fb994d370f38ded602ee6.zip | |
Slider: Properly handle value and value methods as setters. Fixes #4881 - Slider: value and values methods as setters aren't chainable.
| -rw-r--r-- | tests/unit/slider/slider_methods.js | 6 | ||||
| -rw-r--r-- | ui/jquery.ui.slider.js | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/unit/slider/slider_methods.js b/tests/unit/slider/slider_methods.js index 77ae65148..4b2b0311d 100644 --- a/tests/unit/slider/slider_methods.js +++ b/tests/unit/slider/slider_methods.js @@ -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(); }); @@ -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'); }); diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js index 38c5996d0..eb6545f62 100644 --- a/ui/jquery.ui.slider.js +++ b/ui/jquery.ui.slider.js @@ -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(); @@ -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 ) { |