Skip to content

Commit

Permalink
Slider: Remove range div when changing range option to false. Fixes #…
Browse files Browse the repository at this point in the history
…9355 - Slider: Changing range option to false does not remove range div.
  • Loading branch information
scottgonzalez committed Jun 3, 2013
1 parent 3ec371b commit 2ba75e2
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
17 changes: 16 additions & 1 deletion tests/unit/slider/slider_options.js
Expand Up @@ -200,7 +200,7 @@ test( "values", function() {
});

test( "range", function() {
expect( 27 );
expect( 33 );
var range;

// min
Expand Down Expand Up @@ -300,6 +300,21 @@ test( "range", function() {
equal( element.slider( "option", "values" ), null, "values" );
deepEqual( element.slider( "values" ), [] , "values" );
element.slider( "destroy" );

// Change range from true to false
element = $( "<div></div>" ).slider({
range: true,
min: 1,
max: 10,
step: 1
}).slider( "option", "range", false );
equal( element.find( ".ui-slider-handle" ).length, 2, "range switch from true to false, both handles remain" );
equal( element.find( ".ui-slider-range" ).length, 0, "range switch from true to false" );
equal( element.slider( "option", "value" ), 0 , "option value" );
equal( element.slider( "value" ), 1 , "value" );
deepEqual( element.slider( "option", "values" ), [1, 1], "option values" );
deepEqual( element.slider( "values" ), [1, 1], "values" );
element.slider( "destroy" );
});

})( jQuery );
9 changes: 7 additions & 2 deletions ui/jquery.ui.slider.js
Expand Up @@ -131,7 +131,10 @@ $.widget( "ui.slider", $.ui.mouse, {
this.range.addClass( classes +
( ( options.range === "min" || options.range === "max" ) ? " ui-slider-range-" + options.range : "" ) );
} else {
this.range = $([]);
if ( this.range ) {
this.range.remove();
}
this.range = null;
}
},

Expand All @@ -145,7 +148,9 @@ $.widget( "ui.slider", $.ui.mouse, {

_destroy: function() {
this.handles.remove();
this.range.remove();
if ( this.range ) {
this.range.remove();
}

this.element
.removeClass( "ui-slider" +
Expand Down

0 comments on commit 2ba75e2

Please sign in to comment.