Skip to content
Permalink
Browse files

Slider: fixed change event to be triggered by keyup and value and val…

…ues option setters. Fixes #5367 - slider change event not triggered by keypress
  • Loading branch information...
rdworth committed Mar 17, 2010
1 parent e84a318 commit 0604e110524c77a4430666c9719942772b8caa86
Showing with 13 additions and 3 deletions.
  1. +2 −2 tests/unit/slider/slider_events.js
  2. +11 −1 ui/jquery.ui.slider.js
@@ -20,7 +20,7 @@ test( "slide", function() {
// value (even if same as previous value), via mouse(mouseup) or keyboard(keyup)
// or value method/option"
test( "change", function() {
expect(7);
expect(8);

var handle;
// Test mouseup at end of handle slide (mouse)
@@ -48,7 +48,7 @@ test( "change", function() {
el.find( ".ui-slider-handle" ).eq( 0 )
.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } )
.simulate( "keypress", { keyCode: $.ui.keyCode.LEFT } )
.simulate( "keyup", { charCode: $.ui.keyCode.LEFT } );
.simulate( "keyup", { keyCode: $.ui.keyCode.LEFT } );

reset();
// Test value method
@@ -193,9 +193,9 @@ $.widget("ui.slider", $.ui.mouse, {
var index = $(this).data("index.ui-slider-handle");

if (self._keySliding) {
self._keySliding = false;
self._stop(event, index);
self._change(event, index);
self._keySliding = false;
$(this).removeClass("ui-state-active");
}

@@ -479,6 +479,12 @@ $.widget("ui.slider", $.ui.mouse, {
},

_setOption: function(key, value) {

var i,
valsLength = 0;
if ( jQuery.isArray(this.options.values) ) {
valsLength = this.options.values.length;
};

$.Widget.prototype._setOption.apply(this, arguments);

@@ -505,11 +511,15 @@ $.widget("ui.slider", $.ui.mouse, {
case 'value':
this._animateOff = true;
this._refreshValue();
this._change(null, 0);
this._animateOff = false;
break;
case 'values':
this._animateOff = true;
this._refreshValue();
for (i = 0; i < valsLength; i++) {
this._change(null, i);
}
this._animateOff = false;
break;
}

0 comments on commit 0604e11

Please sign in to comment.
You can’t perform that action at this time.