Skip to content
Permalink
Browse files

Menu tests: Whitespace and general cleanup

  • Loading branch information...
kborchers committed Jul 16, 2013
1 parent a74ac17 commit 86eaa30994657b650b26388e87ecff679cf93a50
Showing with 21 additions and 21 deletions.
  1. +18 −18 tests/unit/menu/menu_events.js
  2. +2 −2 tests/unit/menu/menu_methods.js
  3. +1 −1 tests/unit/menu/menu_options.js
@@ -18,10 +18,10 @@ test( "handle click on menu", function() {
}
});
log( "click", true );
click( $( "#menu1" ), "1" );
click( element, "1" );
log( "afterclick" );
click( element, "2" );
click( $( "#menu1" ), "3" );
click( element, "3" );
click( element, "1" );
equal( logOutput(), "click,1,afterclick,2,3,1", "Click order not valid." );
});
@@ -35,10 +35,10 @@ test( "handle click on custom item menu", function() {
menus: "div"
});
log( "click", true );
click( $( "#menu5" ), "1" );
click( element, "1" );
log( "afterclick" );
click( element, "2" );
click( $( "#menu5" ), "3" );
click( element, "3" );
click( element, "1" );
equal( logOutput(), "click,1,afterclick,2,3,1", "Click order not valid." );
});
@@ -96,13 +96,13 @@ asyncTest( "handle focus of menu with active item", function() {
});

log( "focus", true );
element[0].focus();
element[ 0 ].focus();
setTimeout(function() {
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
element[0].blur();
element[ 0 ].blur();
setTimeout(function() {
element[0].focus();
element[ 0 ].focus();
setTimeout(function() {
equal( logOutput(), "focus,0,1,2,2", "current active item remains active" );
start();
@@ -174,15 +174,15 @@ asyncTest( "handle keyboard navigation on menu without scroll and without submen
expect( 12 );
var element = $( "#menu1" ).menu({
select: function( event, ui ) {
log( $( ui.item[0] ).text() );
log( $( ui.item[ 0 ] ).text() );
},
focus: function( event ) {
log( $( event.target ).find( ".ui-state-focus" ).parent().index() );
}
});

log( "keydown", true );
element[0].focus();
element[ 0 ].focus();
setTimeout(function() {
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
@@ -360,15 +360,15 @@ asyncTest( "handle keyboard navigation on menu with scroll and without submenus"
expect( 14 );
var element = $( "#menu3" ).menu({
select: function( event, ui ) {
log( $( ui.item[0] ).text() );
log( $( ui.item[ 0 ] ).text() );
},
focus: function( event ) {
log( $( event.target ).find( ".ui-state-focus" ).parent().index());
}
});

log( "keydown", true );
element[0].focus();
element[ 0 ].focus();
setTimeout(function() {
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
@@ -435,7 +435,7 @@ asyncTest( "handle keyboard navigation on menu with scroll and with submenus", f
expect( 14 );
var element = $( "#menu4" ).menu({
select: function( event, ui ) {
log( $( ui.item[0] ).text() );
log( $( ui.item[ 0 ] ).text() );
},
focus: function( event ) {
log( $( event.target ).find( ".ui-state-focus" ).parent().index());
@@ -595,26 +595,26 @@ asyncTest( "handle keyboard navigation with spelling of menu items", function()
equal( logOutput(), "keydown,0,1,3,4", "Keydown focus Delphi by repeating the 'd' again" );
start();
});
element[0].focus();
element[ 0 ].focus();
});

test( "ensure default is prevented when clicking on anchors in disabled menus ", function() {
expect( 1 );
var element = $( "#menu1" ).menu();
element.bind("click.menu", function(event) {
element.bind( "click.menu", function(event) {
if ( !event.isDefaultPrevented() ) {
log();
}
});
log( "click", true );
click( $( "#menu1" ), "1" );
click( element, "1" );
log( "afterclick,disable" );
element.menu("option", "disabled", true);
element.menu( "option", "disabled", true );
click( element, "2" );
click( $( "#menu1" ), "3" );
click( element, "3" );
click( element, "1" );
log( "enable" );
element.menu("option", "disabled", false);
element.menu( "option", "disabled", false );
click( element, "3" );
equal( logOutput(), "click,1,afterclick,disable,enable,3", "Click order not valid." );
});
@@ -65,7 +65,7 @@ test( "refresh submenu", function() {
var element = $( "#menu2" ).menu();
equal( element.find( "ul:first .ui-menu-item" ).length, 3 );
element.find( "ul" ).addBack().append( "<li><a href=\"#\">New Item</a></li>" );
element.menu("refresh");
element.menu( "refresh" );
equal( element.find( "ul:first .ui-menu-item" ).length, 4 );
});

@@ -79,7 +79,7 @@ test( "refresh icons (see #9377)", function() {
ok( element.hasClass( "ui-menu-icons" ) );
element.find( "li:first a" ).html( "Save" );
element.menu( "refresh" );
ok( !element.hasClass( "ui-menu-icons") );
ok( !element.hasClass( "ui-menu-icons" ) );
});

test( "widget", function() {
@@ -45,7 +45,7 @@ test( "{ icons: default }", function() {
var element = $( "#menu2" ).menu();
equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-carat-1-e" );

element.menu("option", "icons.submenu", "ui-icon-triangle-1-e");
element.menu( "option", "icons.submenu", "ui-icon-triangle-1-e" );
equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-triangle-1-e" );
});

0 comments on commit 86eaa30

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