diff options
author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2012-03-01 13:35:04 +0100 |
---|---|---|
committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2012-03-01 13:35:04 +0100 |
commit | 6d20d1463b7f5bd858a50247d6424af934c1ccee (patch) | |
tree | 09da127cc2288327bb874ed7367ab3221b42b8e8 /tests/unit/slider/slider_events.js | |
parent | 59f2e88c58f0018f22b1c3be4bb5e9549a944381 (diff) | |
parent | 09732dace8156a10065e29d9cb0e4007fa079d8f (diff) | |
download | jquery-ui-6d20d1463b7f5bd858a50247d6424af934c1ccee.tar.gz jquery-ui-6d20d1463b7f5bd858a50247d6424af934c1ccee.zip |
Merge branch 'master' into data-naming
Diffstat (limited to 'tests/unit/slider/slider_events.js')
-rw-r--r-- | tests/unit/slider/slider_events.js | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/unit/slider/slider_events.js b/tests/unit/slider/slider_events.js index 0b7b250f2..9e39d2a3e 100644 --- a/tests/unit/slider/slider_events.js +++ b/tests/unit/slider/slider_events.js @@ -2,7 +2,7 @@ * slider_events.js */ (function($) { - + module( "slider: events" ); //Specs from http://wiki.jqueryui.com/Slider#specs @@ -11,21 +11,21 @@ module( "slider: events" ); // or value method/option" test( "mouse based interaction", function() { expect(4); - + var el = $( "<div></div>" ) .appendTo( "body" ) .slider({ start: function(event, ui) { - equals( event.originalEvent.type, "mousedown", "start triggered by mousedown" ); + equal( event.originalEvent.type, "mousedown", "start triggered by mousedown" ); }, slide: function(event, ui) { - equals( event.originalEvent.type, "mousemove", "slider triggered by mousemove" ); + equal( event.originalEvent.type, "mousemove", "slider triggered by mousemove" ); }, stop: function(event, ui) { - equals( event.originalEvent.type, "mouseup", "stop triggered by mouseup" ); + equal( event.originalEvent.type, "mouseup", "stop triggered by mouseup" ); }, change: function(event, ui) { - equals( event.originalEvent.type, "mouseup", "change triggered by mouseup" ); + equal( event.originalEvent.type, "mouseup", "change triggered by mouseup" ); } }); @@ -35,22 +35,22 @@ test( "mouse based interaction", function() { }); test( "keyboard based interaction", function() { expect(3); - + // Test keyup at end of handle slide (keyboard) var el = $( "<div></div>" ) .appendTo( "body" ) .slider({ start: function(event, ui) { - equals( event.originalEvent.type, "keydown", "start triggered by keydown" ); + equal( event.originalEvent.type, "keydown", "start triggered by keydown" ); }, slide: function(event, ui) { ok( false, "Slider never triggered by keys" ); }, stop: function(event, ui) { - equals( event.originalEvent.type, "keyup", "stop triggered by keyup" ); + equal( event.originalEvent.type, "keyup", "stop triggered by keyup" ); }, change: function(event, ui) { - equals( event.originalEvent.type, "keyup", "change triggered by keyup" ); + equal( event.originalEvent.type, "keyup", "change triggered by keyup" ); } }); @@ -62,7 +62,7 @@ test( "keyboard based interaction", function() { }); test( "programmatic event triggers", function() { expect(6); - + // Test value method var el = $( "<div></div>" ) .slider({ |