jquery / jquery-ui

Source
Commits
Network (27)
Graphs
Tree: 0604e11

The official jQuery user interface library. — Read more

This URL has Read+Write access

Slider: fixed change event to be triggered by keyup and value and values 
option setters. Fixes #5367 - slider change event not triggered by 
keypress

rdworth (author)

Wed Mar 17 10:39:29 -0700 2010

commit 0604e110524c77a4430666c9719942772b8caa86
tree ec7e19cb566f7e6b8dc3538167d5ae6bafbaeb45
parent e84a318e4670bed0d8690b0a7625df31d39aaf92

M	tests/unit/slider/slider_events.js	4 ••••
M	ui/jquery.ui.slider.js	12 ••••

tests/unit/slider/slider_events.js

View file @ 0604e11

@@ -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

ui/jquery.ui.slider.js

View file @ 0604e11

@@ -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 notes on commit `0604e11` Show line notes below

Please log in to comment.

...	...	@@ -193,9 +193,9 @@ $.widget("ui.slider", $.ui.mouse, {
193	193	var index = $(this).data("index.ui-slider-handle");
194	194
195	195	if (self._keySliding) {
	196	+ self._keySliding = false;
196	197	self._stop(event, index);
197	198	self._change(event, index);
198		- self._keySliding = false;
199	199	$(this).removeClass("ui-state-active");
200	200	}
201	201
...	...	@@ -479,6 +479,12 @@ $.widget("ui.slider", $.ui.mouse, {
479	479	},
480	480
481	481	_setOption: function(key, value) {
	482	+
	483	+ var i,
	484	+ valsLength = 0;
	485	+ if ( jQuery.isArray(this.options.values) ) {
	486	+ valsLength = this.options.values.length;
	487	+ };
482	488
483	489	$.Widget.prototype._setOption.apply(this, arguments);
484	490
...	...	@@ -505,11 +511,15 @@ $.widget("ui.slider", $.ui.mouse, {
505	511	case 'value':
506	512	this._animateOff = true;
507	513	this._refreshValue();
	514	+ this._change(null, 0);
508	515	this._animateOff = false;
509	516	break;
510	517	case 'values':
511	518	this._animateOff = true;
512	519	this._refreshValue();
	520	+ for (i = 0; i < valsLength; i++) {
	521	+ this._change(null, i);
	522	+ }
513	523	this._animateOff = false;
514	524	break;
515	525	}

...	...	@@ -20,7 +20,7 @@ test( "slide", function() {
20	20	// value (even if same as previous value), via mouse(mouseup) or keyboard(keyup)
21	21	// or value method/option"
22	22	test( "change", function() {
23		- expect(7);
	23	+ expect(8);
24	24
25	25	var handle;
26	26	// Test mouseup at end of handle slide (mouse)
...	...	@@ -48,7 +48,7 @@ test( "change", function() {
48	48	el.find( ".ui-slider-handle" ).eq( 0 )
49	49	.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } )
50	50	.simulate( "keypress", { keyCode: $.ui.keyCode.LEFT } )
51		- .simulate( "keyup", { charCode: $.ui.keyCode.LEFT } );
	51	+ .simulate( "keyup", { keyCode: $.ui.keyCode.LEFT } );
52	52
53	53	reset();
54	54	// Test value method

jquery / jquery-ui

0 notes on commit 0604e11 Show line notes below

0 notes on commit `0604e11` Show line notes below