From 2da2ae5070e976c23ea4e19ff705dcba822838d8 Mon Sep 17 00:00:00 2001
From: kborchers <kris.borchers@gmail.com>
Date: Fri, 1 Jun 2012 00:03:16 -0500
Subject: Menu: Properly remove submenu carat icons and menu dividers during
 destroy and add a test for this functionality

---
 tests/unit/menu/menu_methods.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tests')

diff --git a/tests/unit/menu/menu_methods.js b/tests/unit/menu/menu_methods.js
index c17986816..3a7b2d8fe 100644
--- a/tests/unit/menu/menu_methods.js
+++ b/tests/unit/menu/menu_methods.js
@@ -46,6 +46,9 @@ test("destroy", function() {
 	domEqual("#menu1", function() {
 		$("#menu1").menu().menu("destroy");
 	});
+	domEqual("#menu2", function() {
+		$("#menu2").menu().menu("destroy");
+	});
 	domEqual("#menu5", function() {
 		$("#menu5").menu().menu("destroy");
 	});
-- 
cgit v1.2.3


From 47a427e5a78e0a00026f93983945f9cdb7853f5f Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 8 Jun 2012 10:45:10 -0400
Subject: Tabs: ARIA tests.

---
 tests/unit/tabs/tabs_core.js | 59 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/tabs/tabs_core.js b/tests/unit/tabs/tabs_core.js
index fb3c306e6..111ee082a 100644
--- a/tests/unit/tabs/tabs_core.js
+++ b/tests/unit/tabs/tabs_core.js
@@ -63,8 +63,63 @@ test( "aria-controls", function() {
 });
 
 test( "accessibility", function() {
-	// TODO: add tests
-	expect( 0 );
+	expect( 49 );
+	var element = $( "#tabs1" ).tabs({
+			active: 1,
+			disabled: [ 2 ]
+		}),
+		tabs = element.find( ".ui-tabs-nav li" ),
+		anchors = tabs.find( ".ui-tabs-anchor" ),
+		panels = element.find( ".ui-tabs-panel" );
+
+	equal( element.find( ".ui-tabs-nav" ).attr( "role" ), "tablist", "tablist role" );
+	tabs.each(function( index ) {
+		var tab = tabs.eq( index ),
+			anchor = anchors.eq( index ),
+			anchorId = anchor.attr( "id" ),
+			panel = panels.eq( index );
+		equal( tab.attr( "role" ), "tab", "tab " + index + " role" );
+		equal( tab.attr( "aria-labelledby" ), anchorId, "tab " + index + " aria-labelledby" );
+		equal( anchor.attr( "role" ), "presentation", "anchor " + index + " role" );
+		equal( anchor.attr( "tabindex" ), -1, "anchor " + index + " tabindex" );
+		equal( panel.attr( "role" ), "tabpanel", "panel " + index + " role" );
+		equal( panel.attr( "aria-labelledby" ), anchorId, "panel " + index + " aria-labelledby" );
+	});
+
+	equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "active tab has aria-selected=true" );
+	equal( tabs.eq( 1 ).attr( "tabindex" ), 0, "active tab has tabindex=0" );
+	equal( tabs.eq( 1 ).attr( "aria-disabled" ), null, "enabled tab does not have aria-disabled" );
+	equal( panels.eq( 1 ).attr( "aria-expanded" ), "true", "active panel has aria-expanded=true" );
+	equal( panels.eq( 1 ).attr( "aria-hidden" ), "false", "active panel has aria-hidden=false" );
+	equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
+	equal( tabs.eq( 0 ).attr( "tabindex" ), -1, "inactive tab has tabindex=-1" );
+	equal( tabs.eq( 0 ).attr( "aria-disabled" ), null, "enabled tab does not have aria-disabled" );
+	equal( panels.eq( 0 ).attr( "aria-expanded" ), "false", "inactive panel has aria-expanded=false" );
+	equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "inactive panel has aria-hidden=true" );
+	equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
+	equal( tabs.eq( 2 ).attr( "tabindex" ), -1, "inactive tab has tabindex=-1" );
+	equal( tabs.eq( 2 ).attr( "aria-disabled" ), "true", "disabled tab has aria-disabled=true" );
+	equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "inactive panel has aria-expanded=false" );
+	equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "inactive panel has aria-hidden=true" );
+
+	element.tabs( "option", "active", 0 );
+	equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "active tab has aria-selected=true" );
+	equal( tabs.eq( 0 ).attr( "tabindex" ), 0, "active tab has tabindex=0" );
+	equal( tabs.eq( 0 ).attr( "aria-disabled" ), null, "enabled tab does not have aria-disabled" );
+	equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "active panel has aria-expanded=true" );
+	equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "active panel has aria-hidden=false" );
+	equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
+	equal( tabs.eq( 1 ).attr( "tabindex" ), -1, "inactive tab has tabindex=-1" );
+	equal( tabs.eq( 1 ).attr( "aria-disabled" ), null, "enabled tab does not have aria-disabled" );
+	equal( panels.eq( 1 ).attr( "aria-expanded" ), "false", "inactive panel has aria-expanded=false" );
+	equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "inactive panel has aria-hidden=true" );
+	equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
+	equal( tabs.eq( 2 ).attr( "tabindex" ), -1, "inactive tab has tabindex=-1" );
+	equal( tabs.eq( 2 ).attr( "aria-disabled" ), "true", "disabled tab has aria-disabled=true" );
+	equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "inactive panel has aria-expanded=false" );
+	equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "inactive panel has aria-hidden=true" );
+
+	// TODO: aria-live and aria-busy tests for ajax tabs
 });
 
 test( "#3627 - Ajax tab with url containing a fragment identifier fails to load", function() {
-- 
cgit v1.2.3


From 4cacb4bbcea9e2332f5ef6fd7fd6ad01d822d998 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 8 Jun 2012 20:58:19 -0400
Subject: Tabs: Basic keyboard support tests.

---
 tests/unit/tabs/tabs_core.js | 153 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 153 insertions(+)

(limited to 'tests')

diff --git a/tests/unit/tabs/tabs_core.js b/tests/unit/tabs/tabs_core.js
index 111ee082a..55f96573e 100644
--- a/tests/unit/tabs/tabs_core.js
+++ b/tests/unit/tabs/tabs_core.js
@@ -122,6 +122,159 @@ test( "accessibility", function() {
 	// TODO: aria-live and aria-busy tests for ajax tabs
 });
 
+asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER", function() {
+	expect( 90 );
+	var element = $( "#tabs1" ).tabs({
+			active: 0,
+			collapsible: true
+		}),
+		tabs = element.find( ".ui-tabs-nav li" ),
+		anchors = tabs.find( ".ui-tabs-anchor" ),
+		panels = element.find( ".ui-tabs-panel" ),
+		keyCode = $.ui.keyCode;
+
+	element.data( "tabs" ).delay = 50;
+
+	equal( tabs.filter( ".ui-state-focus" ).length, 0, "no tabs focused on init" );
+	tabs.eq( 0 ).simulate( "focus" );
+
+	// down, right, down (wrap), up (wrap)
+	function step1() {
+		ok( tabs.eq( 0 ).is( ".ui-state-focus" ), "first tab has focus" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+
+		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.DOWN } );
+		ok( tabs.eq( 1 ).is( ".ui-state-focus" ), "DOWN moves focus to next tab" );
+		ok( !tabs.eq( 0 ).is( ".ui-state-focus" ), "first tab is no longer focused" );
+		equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "second tab has aria-selected=true" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "first tab has aria-selected=false" );
+		ok( panels.eq( 1 ).is( ":hidden" ), "second panel is still hidden" );
+		equal( panels.eq( 1 ).attr( "aria-expanded" ), "false", "second panel has aria-expanded=false" );
+		equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		tabs.eq( 1 ).simulate( "keydown", { keyCode: keyCode.RIGHT } );
+		ok( tabs.eq( 2 ).is( ".ui-state-focus" ), "RIGHT moves focus to next tab" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "second tab has aria-selected=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "third panel has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.DOWN } );
+		ok( tabs.eq( 0 ).is( ".ui-state-focus" ), "DOWN wraps focus to first tab" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.UP } );
+		ok( tabs.eq( 2 ).is( ".ui-state-focus" ), "UP wraps focus to last tab" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "first tab has aria-selected=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "third panel has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		setTimeout( step2, 100 );
+	}
+
+	// left, home, space
+	function step2() {
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "true", "third panel has aria-expanded=true" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
+		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is hidden" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "false", "first panel has aria-expanded=false" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
+
+		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.LEFT } );
+		ok( tabs.eq( 1 ).is( ".ui-state-focus" ), "LEFT moves focus to previous tab" );
+		equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "second tab has aria-selected=true" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
+		ok( panels.eq( 1 ).is( ":hidden" ), "second panel is still hidden" );
+		equal( panels.eq( 1 ).attr( "aria-expanded" ), "false", "second panel has aria-expanded=false" );
+		equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+		ok( panels.eq( 2 ).is( ":visible" ), "third panel is still visible" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "true", "third panel has aria-expanded=true" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
+
+		tabs.eq( 1 ).simulate( "keydown", { keyCode: keyCode.HOME } );
+		ok( tabs.eq( 0 ).is( ".ui-state-focus" ), "HOME moves focus to first tab" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "second tab has aria-selected=false" );
+		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is still hidden" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "false", "first panel has aria-expanded=false" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
+		ok( panels.eq( 2 ).is( ":visible" ), "third panel is still visible" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "true", "third panel has aria-expanded=true" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
+
+		// SPACE activates, cancels delay
+		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.SPACE } );
+		setTimeout( step3, 1 );
+	}
+
+	// end, enter
+	function step3() {
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "third panel has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+
+		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.END } );
+		ok( tabs.eq( 2 ).is( ".ui-state-focus" ), "END moves focus to last tab" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "first tab has aria-selected=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "third panel has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		// ENTER activates, cancels delay
+		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.ENTER } );
+		setTimeout( step4, 1 );
+	}
+
+	// enter (collapse)
+	function step4() {
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "true", "third panel has aria-expanded=true" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
+		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is hidden" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "false", "first panel has aria-expanded=false" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
+
+		// ENTER collapses if active
+		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.ENTER } );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "third panel has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+
+		start();
+	}
+
+	setTimeout( step1, 1 );
+});
+
 test( "#3627 - Ajax tab with url containing a fragment identifier fails to load", function() {
 	expect( 1 );
 
-- 
cgit v1.2.3


From e1eeed6b4f8503632ae9afb4b5e07216e7518318 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 8 Jun 2012 21:36:23 -0400
Subject: Tabs: CTRL navigation tests.

---
 tests/unit/tabs/tabs_core.js | 203 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 200 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/tabs/tabs_core.js b/tests/unit/tabs/tabs_core.js
index 55f96573e..25ee9c031 100644
--- a/tests/unit/tabs/tabs_core.js
+++ b/tests/unit/tabs/tabs_core.js
@@ -123,13 +123,12 @@ test( "accessibility", function() {
 });
 
 asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER", function() {
-	expect( 90 );
+	expect( 92 );
 	var element = $( "#tabs1" ).tabs({
 			active: 0,
 			collapsible: true
 		}),
 		tabs = element.find( ".ui-tabs-nav li" ),
-		anchors = tabs.find( ".ui-tabs-anchor" ),
 		panels = element.find( ".ui-tabs-panel" ),
 		keyCode = $.ui.keyCode;
 
@@ -192,6 +191,7 @@ asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER",
 	// left, home, space
 	function step2() {
 		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "first tab has aria-selected=false" );
 		ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
 		equal( panels.eq( 2 ).attr( "aria-expanded" ), "true", "third panel has aria-expanded=true" );
 		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
@@ -229,6 +229,7 @@ asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER",
 	// end, enter
 	function step3() {
 		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
 		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
 		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
 		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
@@ -269,7 +270,203 @@ asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER",
 		equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "third panel has aria-expanded=false" );
 		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
 
-		start();
+		setTimeout( start, 1 );
+	}
+
+	setTimeout( step1, 1 );
+});
+
+asyncTest( "keyboard support - CTRL navigation", function() {
+	expect( 115 );
+	var element = $( "#tabs1" ).tabs({
+			active: 0,
+			collapsible: true
+		}),
+		tabs = element.find( ".ui-tabs-nav li" ),
+		panels = element.find( ".ui-tabs-panel" ),
+		keyCode = $.ui.keyCode;
+
+	element.data( "tabs" ).delay = 50;
+
+	equal( tabs.filter( ".ui-state-focus" ).length, 0, "no tabs focused on init" );
+	tabs.eq( 0 ).simulate( "focus" );
+
+	// down
+	function step1() {
+		ok( tabs.eq( 0 ).is( ".ui-state-focus" ), "first tab has focus" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+
+		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.DOWN, ctrlKey: true } );
+		ok( tabs.eq( 1 ).is( ".ui-state-focus" ), "DOWN moves focus to next tab" );
+		ok( !tabs.eq( 0 ).is( ".ui-state-focus" ), "first tab is no longer focused" );
+		equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "second tab has aria-selected=false" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 1 ).is( ":hidden" ), "second panel is still hidden" );
+		equal( panels.eq( 1 ).attr( "aria-expanded" ), "false", "second panel has aria-expanded=false" );
+		equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		setTimeout( step2, 100 );
+	}
+
+	// right
+	function step2() {
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+		ok( panels.eq( 1 ).is( ":hidden" ), "second panel is hidden" );
+		equal( panels.eq( 1 ).attr( "aria-expanded" ), "false", "second panel has aria-expanded=false" );
+		equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+
+		tabs.eq( 1 ).simulate( "keydown", { keyCode: keyCode.RIGHT, ctrlKey: true } );
+		ok( tabs.eq( 2 ).is( ".ui-state-focus" ), "RIGHT moves focus to next tab" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "third panel has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		setTimeout( step3, 100 );
+	}
+
+	// down (wrap)
+	function step3() {
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "third panel has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+
+		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.DOWN, ctrlKey: true } );
+		ok( tabs.eq( 0 ).is( ".ui-state-focus" ), "DOWN wraps focus to first tab" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		setTimeout( step4, 100 );
+	}
+
+	// up (wrap)
+	function step4() {
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.UP, ctrlKey: true } );
+		ok( tabs.eq( 2 ).is( ".ui-state-focus" ), "UP wraps focus to last tab" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "third panel has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		setTimeout( step5, 100 );
+	}
+
+	// left
+	function step5() {
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "third panel has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+
+		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.LEFT, ctrlKey: true } );
+		ok( tabs.eq( 1 ).is( ".ui-state-focus" ), "LEFT moves focus to previous tab" );
+		equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "second tab has aria-selected=false" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 1 ).is( ":hidden" ), "second panel is still hidden" );
+		equal( panels.eq( 1 ).attr( "aria-expanded" ), "false", "second panel has aria-expanded=false" );
+		equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		setTimeout( step6, 100 );
+	}
+
+	// home
+	function step6() {
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+		ok( panels.eq( 1 ).is( ":hidden" ), "second panel is hidden" );
+		equal( panels.eq( 1 ).attr( "aria-expanded" ), "false", "second panel has aria-expanded=false" );
+		equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+
+		tabs.eq( 1 ).simulate( "keydown", { keyCode: keyCode.HOME, ctrlKey: true } );
+		ok( tabs.eq( 0 ).is( ".ui-state-focus" ), "HOME moves focus to first tab" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		equal( tabs.eq( 1 ).attr( "aria-selected" ), "false", "second tab has aria-selected=false" );
+		ok( panels.eq( 1 ).is( ":hidden" ), "second panel is still hidden" );
+		equal( panels.eq( 1 ).attr( "aria-expanded" ), "false", "second panel has aria-expanded=false" );
+		equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		setTimeout( step7, 100 );
+	}
+
+	// end
+	function step7() {
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		tabs.eq( 0 ).simulate( "keydown", { keyCode: keyCode.END, ctrlKey: true } );
+		ok( tabs.eq( 2 ).is( ".ui-state-focus" ), "END moves focus to last tab" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "false", "third tab has aria-selected=false" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is still hidden" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "third panel has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is still visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+
+		setTimeout( step8, 100 );
+	}
+
+	// space
+	function step8() {
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "third panel has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+
+		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.SPACE } );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "false", "first tab has aria-selected=false" );
+		ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "true", "third panel has aria-expanded=true" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
+		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is hidden" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "false", "first panel has aria-expanded=false" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
+
+		setTimeout( start, 1 );
 	}
 
 	setTimeout( step1, 1 );
-- 
cgit v1.2.3


From db5f95fcdf37dbf540bb7ac88a4e2229cceda049 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 8 Jun 2012 22:21:14 -0400
Subject: Tabs: Panel keyboard support tests.

---
 tests/unit/tabs/tabs_core.js | 98 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 93 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/tabs/tabs_core.js b/tests/unit/tabs/tabs_core.js
index 25ee9c031..b69ad406c 100644
--- a/tests/unit/tabs/tabs_core.js
+++ b/tests/unit/tabs/tabs_core.js
@@ -125,7 +125,6 @@ test( "accessibility", function() {
 asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER", function() {
 	expect( 92 );
 	var element = $( "#tabs1" ).tabs({
-			active: 0,
 			collapsible: true
 		}),
 		tabs = element.find( ".ui-tabs-nav li" ),
@@ -278,10 +277,7 @@ asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER",
 
 asyncTest( "keyboard support - CTRL navigation", function() {
 	expect( 115 );
-	var element = $( "#tabs1" ).tabs({
-			active: 0,
-			collapsible: true
-		}),
+	var element = $( "#tabs1" ).tabs(),
 		tabs = element.find( ".ui-tabs-nav li" ),
 		panels = element.find( ".ui-tabs-panel" ),
 		keyCode = $.ui.keyCode;
@@ -472,6 +468,98 @@ asyncTest( "keyboard support - CTRL navigation", function() {
 	setTimeout( step1, 1 );
 });
 
+asyncTest( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP", function() {
+	expect( 50 );
+	var element = $( "#tabs1" ).tabs(),
+		tabs = element.find( ".ui-tabs-nav li" ),
+		panels = element.find( ".ui-tabs-panel" ),
+		keyCode = $.ui.keyCode;
+
+	equal( tabs.filter( ".ui-state-focus" ).length, 0, "no tabs focused on init" );
+	panels.attr( "tabindex", -1 );
+	panels.eq( 0 ).simulate( "focus" );
+
+	function step1() {
+		strictEqual( document.activeElement, panels[ 0 ], "first panel is activeElement" );
+
+		panels.eq( 0 ).simulate( "keydown", { keyCode: keyCode.PAGE_DOWN, altKey: true } );
+		strictEqual( document.activeElement, tabs[ 1 ], "second tab is activeElement" );
+		ok( tabs.eq( 1 ).is( ".ui-state-focus" ), "ALT+PAGE_DOWN moves focus to next tab" );
+		equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "second tab has aria-selected=true" );
+		ok( panels.eq( 1 ).is( ":visible" ), "second panel is visible" );
+		equal( panels.eq( 1 ).attr( "aria-expanded" ), "true", "second panel has aria-expanded=true" );
+		equal( panels.eq( 1 ).attr( "aria-hidden" ), "false", "second panel has aria-hidden=false" );
+		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is hidden" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "false", "first panel has aria-expanded=false" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
+
+		tabs.eq( 1 ).simulate( "keydown", { keyCode: keyCode.PAGE_DOWN, altKey: true } );
+		strictEqual( document.activeElement, tabs[ 2 ], "third tab is activeElement" );
+		ok( tabs.eq( 2 ).is( ".ui-state-focus" ), "ALT+PAGE_DOWN moves focus to next tab" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "true", "third panel has aria-expanded=true" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
+		ok( panels.eq( 1 ).is( ":hidden" ), "second panel is hidden" );
+		equal( panels.eq( 1 ).attr( "aria-expanded" ), "false", "second panel has aria-expanded=false" );
+		equal( panels.eq( 1 ).attr( "aria-hidden" ), "true", "second panel has aria-hidden=true" );
+
+		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.PAGE_DOWN, altKey: true } );
+		strictEqual( document.activeElement, tabs[ 0 ], "first tab is activeElement" );
+		ok( tabs.eq( 0 ).is( ".ui-state-focus" ), "ALT+PAGE_DOWN wraps focus to first tab" );
+		equal( tabs.eq( 0 ).attr( "aria-selected" ), "true", "first tab has aria-selected=true" );
+		ok( panels.eq( 0 ).is( ":visible" ), "first panel is visible" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "true", "first panel has aria-expanded=true" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "false", "first panel has aria-hidden=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "third panel has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+
+		panels.eq( 0 ).simulate( "focus" );
+		setTimeout( step2, 1 );
+	}
+
+	function step2() {
+		strictEqual( document.activeElement, panels[ 0 ], "first panel is activeElement" );
+
+		panels.eq( 0 ).simulate( "keydown", { keyCode: keyCode.PAGE_UP, altKey: true } );
+		strictEqual( document.activeElement, tabs[ 2 ], "third tab is activeElement" );
+		ok( tabs.eq( 2 ).is( ".ui-state-focus" ), "ALT+PAGE_UP wraps focus to last tab" );
+		equal( tabs.eq( 2 ).attr( "aria-selected" ), "true", "third tab has aria-selected=true" );
+		ok( panels.eq( 2 ).is( ":visible" ), "third panel is visible" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "true", "third panel has aria-expanded=true" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "false", "third panel has aria-hidden=false" );
+		ok( panels.eq( 0 ).is( ":hidden" ), "first panel is hidden" );
+		equal( panels.eq( 0 ).attr( "aria-expanded" ), "false", "first panel has aria-expanded=false" );
+		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
+
+		tabs.eq( 2 ).simulate( "keydown", { keyCode: keyCode.PAGE_UP, altKey: true } );
+		strictEqual( document.activeElement, tabs[ 1 ], "second tab is activeElement" );
+		ok( tabs.eq( 1 ).is( ".ui-state-focus" ), "ALT+PAGE_UP moves focus to previous tab" );
+		equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "second tab has aria-selected=true" );
+		ok( panels.eq( 1 ).is( ":visible" ), "second panel is visible" );
+		equal( panels.eq( 1 ).attr( "aria-expanded" ), "true", "second panel has aria-expanded=true" );
+		equal( panels.eq( 1 ).attr( "aria-hidden" ), "false", "second panel has aria-hidden=false" );
+		ok( panels.eq( 2 ).is( ":hidden" ), "third panel is hidden" );
+		equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "third panel has aria-expanded=false" );
+		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
+
+		panels.eq( 1 ).simulate( "focus" );
+		setTimeout( step3, 1 );
+	}
+
+	function step3() {
+		strictEqual( document.activeElement, panels[ 1 ], "second panel is activeElement" );
+
+		panels.eq( 1 ).simulate( "keydown", { keyCode: keyCode.UP, ctrlKey: true } );
+		strictEqual( document.activeElement, tabs[ 1 ], "second tab is activeElement" );
+
+		setTimeout( start, 1 );
+	}
+
+	setTimeout( step1, 1 );
+});
+
 test( "#3627 - Ajax tab with url containing a fragment identifier fails to load", function() {
 	expect( 1 );
 
-- 
cgit v1.2.3


From aa1e8b5e6ce0b5012deb98dd30a93c89491dfa3f Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 9 Jun 2012 20:12:03 -0400
Subject: Tests: Check .data() and event bindings in domEqual().

---
 tests/unit/testsuite.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tests')

diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index 3c8ec04c4..59bda7df8 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -188,6 +188,9 @@ window.domEqual = function( selector, modifier, message ) {
 			var value = elem.attr( attr );
 			result[ attr ] = value !== undefined ? value : "";
 		});
+		result.events = $._data( elem[ 0 ], "events" );
+		result.data = $.extend( {}, elem.data() );
+		delete result.data[ $.expando ];
 		children = elem.children();
 		if ( children.length ) {
 			result.children = elem.children().map(function( ind ) {
-- 
cgit v1.2.3


From 8c82edb40ca946f160089191d5bbe564159c7593 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 11 Jun 2012 16:21:12 -0400
Subject: Tabs tests: Don't call start directly from setTimeout because Firefox
 <13 is dumb.

---
 tests/unit/tabs/tabs_core.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/tabs/tabs_core.js b/tests/unit/tabs/tabs_core.js
index b69ad406c..fd9cc7d63 100644
--- a/tests/unit/tabs/tabs_core.js
+++ b/tests/unit/tabs/tabs_core.js
@@ -269,7 +269,11 @@ asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER",
 		equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "third panel has aria-expanded=false" );
 		equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "third panel has aria-hidden=true" );
 
-		setTimeout( start, 1 );
+		// support: Firefox 12
+		// Firefox <13 passes arguments so we can't use setTimeout( start, 1 )
+		setTimeout(function() {
+			start();
+		}, 1 );
 	}
 
 	setTimeout( step1, 1 );
@@ -462,7 +466,11 @@ asyncTest( "keyboard support - CTRL navigation", function() {
 		equal( panels.eq( 0 ).attr( "aria-expanded" ), "false", "first panel has aria-expanded=false" );
 		equal( panels.eq( 0 ).attr( "aria-hidden" ), "true", "first panel has aria-hidden=true" );
 
-		setTimeout( start, 1 );
+		// support: Firefox 12
+		// Firefox <13 passes arguments so we can't use setTimeout( start, 1 )
+		setTimeout(function() {
+			start();
+		}, 1 );
 	}
 
 	setTimeout( step1, 1 );
@@ -554,7 +562,11 @@ asyncTest( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP", function()
 		panels.eq( 1 ).simulate( "keydown", { keyCode: keyCode.UP, ctrlKey: true } );
 		strictEqual( document.activeElement, tabs[ 1 ], "second tab is activeElement" );
 
-		setTimeout( start, 1 );
+		// support: Firefox 12
+		// Firefox <13 passes arguments so we can't use setTimeout( start, 1 )
+		setTimeout(function() {
+			start();
+		}, 1 );
 	}
 
 	setTimeout( step1, 1 );
-- 
cgit v1.2.3


From f1031b3f3a94698f62074c00b43a5ac36bb80a8c Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 11 Jun 2012 17:24:27 -0400
Subject: Accordion tests: Fixed typos.

---
 tests/unit/accordion/accordion_core.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/accordion/accordion_core.js b/tests/unit/accordion/accordion_core.js
index 7a1d56c18..101cb83b1 100644
--- a/tests/unit/accordion/accordion_core.js
+++ b/tests/unit/accordion/accordion_core.js
@@ -48,31 +48,31 @@ test( "accessibility", function () {
 	equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab has aria-selected=true" );
 	equal( headers.eq( 1 ).next().attr( "aria-expanded" ), "true", "active tabpanel has aria-expanded=true" );
 	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "false", "active tabpanel has aria-hidden=false" );
-	equal( headers.eq( 0 ).attr( "tabindex" ), -1, "active header has tabindex=-1" );
-	equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "active tab has aria-selected=false" );
-	equal( headers.eq( 0 ).next().attr( "aria-expanded" ), "false", "active tabpanel has aria-expanded=false" );
-	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "active tabpanel has aria-hidden=true" );
-	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "active header has tabindex=-1" );
-	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "active tab has aria-selected=false" );
-	equal( headers.eq( 2 ).next().attr( "aria-expanded" ), "false", "active tabpanel has aria-expanded=false" );
-	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "active tabpanel has aria-hidden=true" );
+	equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header has tabindex=-1" );
+	equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
+	equal( headers.eq( 0 ).next().attr( "aria-expanded" ), "false", "inactive tabpanel has aria-expanded=false" );
+	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel has aria-hidden=true" );
+	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header has tabindex=-1" );
+	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
+	equal( headers.eq( 2 ).next().attr( "aria-expanded" ), "false", "inactive tabpanel has aria-expanded=false" );
+	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel has aria-hidden=true" );
 
 	element.accordion( "option", "active", 0 );
 	equal( headers.eq( 0 ).attr( "tabindex" ), 0, "active header has tabindex=0" );
 	equal( headers.eq( 0 ).attr( "aria-selected" ), "true", "active tab has aria-selected=true" );
 	equal( headers.eq( 0 ).next().attr( "aria-expanded" ), "true", "active tabpanel has aria-expanded=true" );
 	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "false", "active tabpanel has aria-hidden=false" );
-	equal( headers.eq( 1 ).attr( "tabindex" ), -1, "active header has tabindex=-1" );
-	equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "active tab has aria-selected=false" );
-	equal( headers.eq( 1 ).next().attr( "aria-expanded" ), "false", "active tabpanel has aria-expanded=false" );
-	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "true", "active tabpanel has aria-hidden=true" );
-	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "active header has tabindex=-1" );
-	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "active tab has aria-selected=false" );
-	equal( headers.eq( 2 ).next().attr( "aria-expanded" ), "false", "active tabpanel has aria-expanded=false" );
-	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "active tabpanel has aria-hidden=true" );
+	equal( headers.eq( 1 ).attr( "tabindex" ), -1, "inactive header has tabindex=-1" );
+	equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
+	equal( headers.eq( 1 ).next().attr( "aria-expanded" ), "false", "inactive tabpanel has aria-expanded=false" );
+	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel has aria-hidden=true" );
+	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header has tabindex=-1" );
+	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
+	equal( headers.eq( 2 ).next().attr( "aria-expanded" ), "false", "inactive tabpanel has aria-expanded=false" );
+	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel has aria-hidden=true" );
 });
 
-asyncTest( "keybaord support", function() {
+asyncTest( "keyboard support", function() {
 	expect( 13 );
 	var element = $( "#list1" ).accordion(),
 		headers = element.find( ".ui-accordion-header" ),
-- 
cgit v1.2.3


From 9ebeb0616a5ca556e507aecbe360f5dcec238737 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Tue, 12 Jun 2012 10:07:16 -0400
Subject: Tabs: Walk previous tabs (and loop) in refresh() in case the tab
 we're trying to activate is disabled.

---
 tests/unit/tabs/tabs_methods.js | 20 ++++++++++++++++++++
 ui/jquery.ui.tabs.js            | 16 +++++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js
index ed3e73745..e48d353e7 100644
--- a/tests/unit/tabs/tabs_methods.js
+++ b/tests/unit/tabs/tabs_methods.js
@@ -148,6 +148,26 @@ test( "refresh", function() {
 	disabled( element, false );
 });
 
+test( "refresh - looping", function() {
+	expect( 6 );
+
+	var element = $( "#tabs1" ).tabs({
+		disabled: [ 0 ],
+		active: 1
+	});
+	state( element, 0, 1, 0 );
+	disabled( element, [ 0 ] );
+
+	// remove active, jump to previous
+	// previous is disabled, just back one more
+	// reached first tab, move to end
+	// activate last tab
+	element.find( ".ui-tabs-nav li" ).eq( 2 ).remove();
+	element.tabs( "refresh" );
+	state( element, 0, 1 );
+	disabled( element, [ 0 ] );
+});
+
 asyncTest( "load", function() {
 	expect( 30 );
 
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index 8c7bd207b..e71b2a244 100644
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -229,7 +229,7 @@ $.widget( "ui.tabs", {
 		}
 	},
 
-	_focusNextTab: function( index, goingForward ) {
+	_findNextTab: function( index, goingForward ) {
 		var lastTabIndex = this.tabs.length - 1;
 
 		function constrain() {
@@ -246,6 +246,11 @@ $.widget( "ui.tabs", {
 			index = goingForward ? index + 1 : index - 1;
 		}
 
+		return index;
+	},
+
+	_focusNextTab: function( index, goingForward ) {
+		index = this._findNextTab( index, goingForward );
 		this.tabs.eq( index ).focus();
 		return index;
 	},
@@ -309,9 +314,14 @@ $.widget( "ui.tabs", {
 			this.active = $();
 		// was active, but active tab is gone
 		} else if ( this.active.length && !$.contains( this.tablist[ 0 ], this.active[ 0 ] ) ) {
+			// all remaining tabs are disabled
+			if ( this.tabs.length === options.disabled.length ) {
+				options.active = false;
+				this.active = $();
 			// activate previous tab
-			next = options.active - 1;
-			this._activate( next >= 0 ? next : 0 );
+			} else {
+				this._activate( this._findNextTab( Math.max( 0, options.active - 1 ), false ) );
+			}
 		// was active, active tab still exists
 		} else {
 			// make sure active index is correct
-- 
cgit v1.2.3


From 9608e981498846b3727cc4dad723a7fa7252fd86 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 13 Jun 2012 08:00:45 -0400
Subject: Widget: Rename _bind() to _on(). Partial fix for #7795 - Widget: _on
 and _off.

---
 demos/widget/default.html        |  6 +++---
 tests/unit/widget/widget_core.js | 14 +++++++-------
 ui/jquery.ui.accordion.js        |  6 +++---
 ui/jquery.ui.autocomplete.js     |  6 +++---
 ui/jquery.ui.menu.js             |  7 +++----
 ui/jquery.ui.slider.js           |  2 +-
 ui/jquery.ui.spinner.js          |  4 ++--
 ui/jquery.ui.tabs.js             |  8 ++++----
 ui/jquery.ui.tooltip.js          |  4 ++--
 ui/jquery.ui.widget.js           | 10 +++++-----
 10 files changed, 33 insertions(+), 34 deletions(-)

(limited to 'tests')

diff --git a/demos/widget/default.html b/demos/widget/default.html
index f39825034..8d08256ce 100644
--- a/demos/widget/default.html
+++ b/demos/widget/default.html
@@ -56,8 +56,8 @@
 				.button();
 
 				// bind click events on the changer button to the random method
-				this._bind( this.changer, {
-					// _bind won't call random when widget is disabled
+				this._on( this.changer, {
+					// _on won't call random when widget is disabled
 					click: "random"
 				});
 				this._refresh();
@@ -90,7 +90,7 @@
 				}
 			},
 
-			// events bound via _bind are removed automatically
+			// events bound via _on are removed automatically
 			// revert other modifications here
 			_destroy: function() {
 				// remove generated elements
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index aa70e2425..3dfaf1918 100644
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -610,13 +610,13 @@ test( ".widget() - overriden", function() {
 	deepEqual( wrapper[0], $( "<div>" ).testWidget().testWidget( "widget" )[0] );
 });
 
-test( "._bind() to element (default)", function() {
+test( "._on() to element (default)", function() {
 	expect( 12 );
 	var that, widget;
 	$.widget( "ui.testWidget", {
 		_create: function() {
 			that = this;
-			this._bind({
+			this._on({
 				keyup: this.keyup,
 				keydown: "keydown"
 			});
@@ -650,13 +650,13 @@ test( "._bind() to element (default)", function() {
 		.trigger( "keydown" );
 });
 
-test( "._bind() to descendent", function() {
+test( "._on() to descendent", function() {
 	expect( 12 );
 	var that, widget, descendant;
 	$.widget( "ui.testWidget", {
 		_create: function() {
 			that = this;
-			this._bind( this.element.find( "strong" ), {
+			this._on( this.element.find( "strong" ), {
 				keyup: this.keyup,
 				keydown: "keydown"
 			});
@@ -707,7 +707,7 @@ test( "._bind() to descendent", function() {
 		.trigger( "keydown" );
 });
 
-test( "_bind() with delegate", function() {
+test( "_on() with delegate", function() {
 	expect( 8 );
 	$.widget( "ui.testWidget", {
 		_create: function() {
@@ -727,7 +727,7 @@ test( "_bind() with delegate", function() {
 					}
 				};
 			};
-			this._bind({
+			this._on({
 				"click": "handler",
 				"click a": "handler"
 			});
@@ -740,7 +740,7 @@ test( "_bind() with delegate", function() {
 					}
 				};
 			};
-			this._bind({
+			this._on({
 				"change form fieldset > input": "handler"
 			});
 		}
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index 856b3ba4b..4cfc265a3 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -137,8 +137,8 @@ $.widget( "ui.accordion", {
 				});
 		}
 
-		this._bind( this.headers, { keydown: "_keydown" });
-		this._bind( this.headers.next(), { keydown: "_panelKeyDown" });
+		this._on( this.headers, { keydown: "_keydown" });
+		this._on( this.headers.next(), { keydown: "_panelKeyDown" });
 		this._setupEvents( options.event );
 	},
 
@@ -376,7 +376,7 @@ $.widget( "ui.accordion", {
 		$.each( event.split(" "), function( index, eventName ) {
 			events[ eventName ] = "_eventHandler";
 		});
-		this._bind( this.headers, events );
+		this._on( this.headers, events );
 	},
 
 	_eventHandler: function( event ) {
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 2fb7e395c..f73fff96d 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -63,7 +63,7 @@ $.widget( "ui.autocomplete", {
 			.addClass( "ui-autocomplete-input" )
 			.attr( "autocomplete", "off" );
 
-		this._bind({
+		this._on({
 			keydown: function( event ) {
 				if ( this.element.prop( "readOnly" ) ) {
 					suppressKeyPress = true;
@@ -190,7 +190,7 @@ $.widget( "ui.autocomplete", {
 			.zIndex( this.element.zIndex() + 1 )
 			.hide()
 			.data( "menu" );
-		this._bind( this.menu.element, {
+		this._on( this.menu.element, {
 			mousedown: function( event ) {
 				// prevent moving focus out of the text field
 				event.preventDefault();
@@ -297,7 +297,7 @@ $.widget( "ui.autocomplete", {
 		// turning off autocomplete prevents the browser from remembering the
 		// value when navigating through history, so we re-enable autocomplete
 		// if the page is unloaded before the widget is destroyed. #7790
-		this._bind( this.window, {
+		this._on( this.window, {
 			beforeunload: function() {
 				this.element.removeAttr( "autocomplete" );
 			}
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 986cca168..eb0be494c 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -43,7 +43,7 @@ $.widget( "ui.menu", {
 				tabIndex: 0
 			})
 			// need to catch all clicks on disabled menu
-			// not possible through _bind
+			// not possible through _on
 			.bind( "click.menu", $.proxy(function( event ) {
 				if ( this.options.disabled ) {
 					event.preventDefault();
@@ -56,7 +56,7 @@ $.widget( "ui.menu", {
 				.attr( "aria-disabled", "true" );
 		}
 
-		this._bind({
+		this._on({
 			// Prevent focus from sticking to links inside menu after clicking
 			// them (focus should always stay on UL during navigation).
 			"mousedown .ui-menu-item > a": function( event ) {
@@ -122,8 +122,7 @@ $.widget( "ui.menu", {
 		this.refresh();
 
 		// TODO: We probably shouldn't bind to document for each menu.
-		// TODO: This isn't being cleaned up on destroy.
-		this._bind( this.document, {
+		this._on( this.document, {
 			click: function( event ) {
 				if ( !$( event.target ).closest( ".ui-menu" ).length ) {
 					this.collapseAll( event );
diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index c302bfe8b..e44d20f7c 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -114,7 +114,7 @@ $.widget( "ui.slider", $.ui.mouse, {
 			$( this ).data( "ui-slider-handle-index", i );
 		});
 
-		this._bind( this.handles, {
+		this._on( this.handles, {
 			keydown: function( event ) {
 				var allowed, curVal, newVal, step,
 					index = $( event.target ).data( "ui-slider-handle-index" );
diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js
index b01feec9a..d6ebc6d87 100644
--- a/ui/jquery.ui.spinner.js
+++ b/ui/jquery.ui.spinner.js
@@ -54,13 +54,13 @@ $.widget( "ui.spinner", {
 		this._value( this.element.val(), true );
 
 		this._draw();
-		this._bind( this._events );
+		this._on( this._events );
 		this._refresh();
 
 		// turning off autocomplete prevents the browser from remembering the
 		// value when navigating through history, so we re-enable autocomplete
 		// if the page is unloaded before the widget is destroyed. #7790
-		this._bind( this.window, {
+		this._on( this.window, {
 			beforeunload: function() {
 				this.element.removeAttr( "autocomplete" );
 			}
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index f3b27cf9d..5878a56a1 100644
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -481,9 +481,9 @@ $.widget( "ui.tabs", {
 		}
 
 		this.anchors.add( this.tabs ).add( this.panels ).unbind( ".tabs" );
-		this._bind( this.anchors, events );
-		this._bind( this.tabs, { keydown: "_tabKeydown" } );
-		this._bind( this.panels, { keydown: "_panelKeydown" } );
+		this._on( this.anchors, events );
+		this._on( this.tabs, { keydown: "_tabKeydown" } );
+		this._on( this.panels, { keydown: "_panelKeydown" } );
 
 		this._focusable( this.tabs );
 		this._hoverable( this.tabs );
@@ -943,7 +943,7 @@ if ( $.uiBackCompat !== false ) {
 		},
 		_create: function() {
 			this._super();
-			this._bind({
+			this._on({
 				tabsbeforeload: function( event, ui ) {
 					if ( !this.options.spinner ) {
 						return;
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 752c95687..6a7aab706 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -61,7 +61,7 @@ $.widget( "ui.tooltip", {
 	},
 
 	_create: function() {
-		this._bind({
+		this._on({
 			mouseover: "open",
 			focusin: "open"
 		});
@@ -185,7 +185,7 @@ $.widget( "ui.tooltip", {
 
 		this._trigger( "open", event, { tooltip: tooltip } );
 
-		this._bind( target, {
+		this._on( target, {
 			mouseleave: "close",
 			focusout: "close",
 			keyup: function( event ) {
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index e317d3841..410b7003a 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -224,7 +224,7 @@ $.Widget.prototype = {
 			// TODO remove dual storage
 			$.data( element, this.widgetName, this );
 			$.data( element, this.widgetFullName, this );
-			this._bind({ remove: "destroy" });
+			this._on({ remove: "destroy" });
 			this.document = $( element.style ?
 				// element within the document
 				element.ownerDocument :
@@ -245,7 +245,7 @@ $.Widget.prototype = {
 	destroy: function() {
 		this._destroy();
 		// we can probably remove the unbind calls in 2.0
-		// all event bindings should go through this._bind()
+		// all event bindings should go through this._on()
 		this.element
 			.unbind( "." + this.widgetName )
 			// 1.9 BC for #7810
@@ -342,7 +342,7 @@ $.Widget.prototype = {
 		return this._setOption( "disabled", true );
 	},
 
-	_bind: function( element, handlers ) {
+	_on: function( element, handlers ) {
 		// no element argument, shuffle and use this.element
 		if ( !handlers ) {
 			handlers = element;
@@ -395,7 +395,7 @@ $.Widget.prototype = {
 
 	_hoverable: function( element ) {
 		this.hoverable = this.hoverable.add( element );
-		this._bind( element, {
+		this._on( element, {
 			mouseenter: function( event ) {
 				$( event.currentTarget ).addClass( "ui-state-hover" );
 			},
@@ -407,7 +407,7 @@ $.Widget.prototype = {
 
 	_focusable: function( element ) {
 		this.focusable = this.focusable.add( element );
-		this._bind( element, {
+		this._on( element, {
 			focusin: function( event ) {
 				$( event.currentTarget ).addClass( "ui-state-focus" );
 			},
-- 
cgit v1.2.3


From 386bb7214b0d52a9e88c3c2158b4b9894dca6b1c Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Wed, 13 Jun 2012 23:06:34 +0200
Subject: Spinner: Fix ghost log call in events unit test, never shows up in
 browser for some reason

---
 tests/unit/spinner/spinner_events.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests')

diff --git a/tests/unit/spinner/spinner_events.js b/tests/unit/spinner/spinner_events.js
index 72b185528..64f510de0 100644
--- a/tests/unit/spinner/spinner_events.js
+++ b/tests/unit/spinner/spinner_events.js
@@ -220,6 +220,7 @@ asyncTest( "change", function() {
 
 				shouldChange( false, "min, value not changed" );
 				element.spinner( "option", "min", 200 );
+				shouldChange( true, "cleanup" );
 				start();
 			});
 		});
-- 
cgit v1.2.3


From 28b14ec47cfeb3c58e44f35170cdd8a9270aceae Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Sun, 10 Jun 2012 20:55:04 +0200
Subject: Generate a uuid for each widget for unique namespaces. Fixes #8385 -
 Widget: _bind() on elements such as document are dangerous

---
 tests/unit/widget/widget_core.js | 25 ++++++++++++++++++++++---
 ui/jquery.ui.widget.js           | 12 +++++++-----
 2 files changed, 29 insertions(+), 8 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index 3dfaf1918..1e40c4080 100644
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -711,9 +711,10 @@ test( "_on() with delegate", function() {
 	expect( 8 );
 	$.widget( "ui.testWidget", {
 		_create: function() {
+			var uuid = this.uuid;
 			this.element = {
 				bind: function( event, handler ) {
-					equal( event, "click.testWidget" );
+					equal( event, "click.testWidget" + uuid );
 					ok( $.isFunction(handler) );
 				},
 				trigger: $.noop
@@ -722,7 +723,7 @@ test( "_on() with delegate", function() {
 				return {
 					delegate: function( selector, event, handler ) {
 						equal( selector, "a" );
-						equal( event, "click.testWidget" );
+						equal( event, "click.testWidget" + uuid );
 						ok( $.isFunction(handler) );
 					}
 				};
@@ -735,7 +736,7 @@ test( "_on() with delegate", function() {
 				return {
 					delegate: function( selector, event, handler ) {
 						equal( selector, "form fieldset > input" );
-						equal( event, "change.testWidget" );
+						equal( event, "change.testWidget" + uuid );
 						ok( $.isFunction(handler) );
 					}
 				};
@@ -748,6 +749,24 @@ test( "_on() with delegate", function() {
 	$.ui.testWidget();
 });
 
+test( "_bind() to common element", function() {
+	expect( 1 );
+	$.widget( "ui.testWidget", {
+		_create: function() {
+			this._bind( this.document, {
+				"customevent": "_handler"
+			});
+		},
+		_handler: function() {
+			ok( true, "handler triggered" );
+		}
+	});
+	var widget = $( "#widget" ).testWidget().data( "testWidget" );
+	$( "#widget-wrapper" ).testWidget();
+	widget.destroy();
+	$( document ).trigger( "customevent" );
+});
+
 test( "._hoverable()", function() {
 	$.widget( "ui.testWidget", {
 		_create: function() {
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index 410b7003a..d5e68683e 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -9,7 +9,8 @@
  */
 (function( $, undefined ) {
 
-var slice = Array.prototype.slice,
+var uuid = 0,
+	slice = Array.prototype.slice,
 	_cleanData = $.cleanData;
 $.cleanData = function( elems ) {
 	for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
@@ -214,6 +215,7 @@ $.Widget.prototype = {
 			this.options,
 			this._getCreateOptions(),
 			options );
+		this.uuid = uuid++;
 
 		this.bindings = $();
 		this.hoverable = $();
@@ -247,7 +249,7 @@ $.Widget.prototype = {
 		// we can probably remove the unbind calls in 2.0
 		// all event bindings should go through this._on()
 		this.element
-			.unbind( "." + this.widgetName )
+			.unbind( "." + this.widgetName + this.uuid )
 			// 1.9 BC for #7810
 			// TODO remove dual storage
 			.removeData( this.widgetName )
@@ -256,14 +258,14 @@ $.Widget.prototype = {
 			// http://bugs.jquery.com/ticket/9413
 			.removeData( $.camelCase( this.widgetFullName ) );
 		this.widget()
-			.unbind( "." + this.widgetName )
+			.unbind( "." + this.widgetName + this.uuid )
 			.removeAttr( "aria-disabled" )
 			.removeClass(
 				this.widgetFullName + "-disabled " +
 				"ui-state-disabled" );
 
 		// clean up events and states
-		this.bindings.unbind( "." + this.widgetName );
+		this.bindings.unbind( "." + this.widgetName + this.uuid );
 		this.hoverable.removeClass( "ui-state-hover" );
 		this.focusable.removeClass( "ui-state-focus" );
 	},
@@ -374,7 +376,7 @@ $.Widget.prototype = {
 			}
 
 			var match = event.match( /^(\w+)\s*(.*)$/ ),
-				eventName = match[1] + "." + instance.widgetName,
+				eventName = match[1] + "." + instance.widgetName + instance.uuid,
 				selector = match[2];
 			if ( selector ) {
 				instance.widget().delegate( selector, eventName, handlerProxy );
-- 
cgit v1.2.3


From 00d4beb0ca4a99933bb7e786a1dd50618c180a0b Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 14 Jun 2012 10:51:29 -0400
Subject: Widget: Create eventNamespace property instead of constantly
 rebuilding it.

---
 tests/unit/widget/widget_core.js |  4 ++--
 ui/jquery.ui.widget.js           | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index 1e40c4080..24ae9c567 100644
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -749,11 +749,11 @@ test( "_on() with delegate", function() {
 	$.ui.testWidget();
 });
 
-test( "_bind() to common element", function() {
+test( "_on() to common element", function() {
 	expect( 1 );
 	$.widget( "ui.testWidget", {
 		_create: function() {
-			this._bind( this.document, {
+			this._on( this.document, {
 				"customevent": "_handler"
 			});
 		},
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index d5e68683e..22049cbb8 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -211,11 +211,12 @@ $.Widget.prototype = {
 	_createWidget: function( options, element ) {
 		element = $( element || this.defaultElement || this )[ 0 ];
 		this.element = $( element );
+		this.uuid = uuid++;
+		this.eventNamespace = "." + this.widgetName + this.uuid;
 		this.options = $.widget.extend( {},
 			this.options,
 			this._getCreateOptions(),
 			options );
-		this.uuid = uuid++;
 
 		this.bindings = $();
 		this.hoverable = $();
@@ -249,7 +250,7 @@ $.Widget.prototype = {
 		// we can probably remove the unbind calls in 2.0
 		// all event bindings should go through this._on()
 		this.element
-			.unbind( "." + this.widgetName + this.uuid )
+			.unbind( this.eventNamespace )
 			// 1.9 BC for #7810
 			// TODO remove dual storage
 			.removeData( this.widgetName )
@@ -258,14 +259,14 @@ $.Widget.prototype = {
 			// http://bugs.jquery.com/ticket/9413
 			.removeData( $.camelCase( this.widgetFullName ) );
 		this.widget()
-			.unbind( "." + this.widgetName + this.uuid )
+			.unbind( this.eventNamespace )
 			.removeAttr( "aria-disabled" )
 			.removeClass(
 				this.widgetFullName + "-disabled " +
 				"ui-state-disabled" );
 
 		// clean up events and states
-		this.bindings.unbind( "." + this.widgetName + this.uuid );
+		this.bindings.unbind( this.eventNamespace );
 		this.hoverable.removeClass( "ui-state-hover" );
 		this.focusable.removeClass( "ui-state-focus" );
 	},
@@ -376,7 +377,7 @@ $.Widget.prototype = {
 			}
 
 			var match = event.match( /^(\w+)\s*(.*)$/ ),
-				eventName = match[1] + "." + instance.widgetName + instance.uuid,
+				eventName = match[1] + instance.eventNamespace,
 				selector = match[2];
 			if ( selector ) {
 				instance.widget().delegate( selector, eventName, handlerProxy );
-- 
cgit v1.2.3


From ff39bed57a05ca060033187b8aecebafab357f78 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 14 Jun 2012 12:33:16 -0400
Subject: Widget: Added _off() for removing event handlers. Fixes #7795 -
 Widget: _on and _off.

---
 tests/unit/widget/widget_core.js | 77 ++++++++++++++++++++++++++++++++++++++++
 ui/jquery.ui.accordion.js        |  3 +-
 ui/jquery.ui.button.js           | 32 ++++++++---------
 ui/jquery.ui.dialog.js           |  6 ++--
 ui/jquery.ui.menu.js             |  4 +--
 ui/jquery.ui.tabs.js             |  6 ++--
 ui/jquery.ui.tooltip.js          |  2 +-
 ui/jquery.ui.widget.js           |  5 +++
 8 files changed, 108 insertions(+), 27 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index 24ae9c567..abfb0d9de 100644
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -767,6 +767,83 @@ test( "_on() to common element", function() {
 	$( document ).trigger( "customevent" );
 });
 
+test( "_off() - single event", function() {
+	expect( 3 );
+
+	$.widget( "ui.testWidget", {} );
+	var shouldTriggerWidget, shouldTriggerOther,
+		element = $( "#widget" ),
+		widget = element.testWidget().data( "testWidget" );
+	widget._on( element, { foo: function() {
+		ok( shouldTriggerWidget, "foo called from _on" );
+	}});
+	element.bind( "foo", function() {
+		ok( shouldTriggerOther, "foo called from bind" );
+	});
+	shouldTriggerWidget = true;
+	shouldTriggerOther = true;
+	element.trigger( "foo" );
+	shouldTriggerWidget = false;
+	widget._off( element, "foo" );
+	element.trigger( "foo" );
+});
+
+test( "_off() - multiple events", function() {
+	expect( 6 );
+
+	$.widget( "ui.testWidget", {} );
+	var shouldTriggerWidget, shouldTriggerOther,
+		element = $( "#widget" ),
+		widget = element.testWidget().data( "testWidget" );
+	widget._on( element, {
+		foo: function() {
+			ok( shouldTriggerWidget, "foo called from _on" );
+		},
+		bar: function() {
+			ok( shouldTriggerWidget, "bar called from _on" );
+		}
+	});
+	element.bind( "foo bar", function( event ) {
+		ok( shouldTriggerOther, event.type + " called from bind" );
+	});
+	shouldTriggerWidget = true;
+	shouldTriggerOther = true;
+	element.trigger( "foo" );
+	element.trigger( "bar" );
+	shouldTriggerWidget = false;
+	widget._off( element, "foo bar" );
+	element.trigger( "foo" );
+	element.trigger( "bar" );
+});
+
+test( "_off() - all events", function() {
+	expect( 6 );
+
+	$.widget( "ui.testWidget", {} );
+	var shouldTriggerWidget, shouldTriggerOther,
+		element = $( "#widget" ),
+		widget = element.testWidget().data( "testWidget" );
+	widget._on( element, {
+		foo: function() {
+			ok( shouldTriggerWidget, "foo called from _on" );
+		},
+		bar: function() {
+			ok( shouldTriggerWidget, "bar called from _on" );
+		}
+	});
+	element.bind( "foo bar", function( event ) {
+		ok( shouldTriggerOther, event.type + " called from bind" );
+	});
+	shouldTriggerWidget = true;
+	shouldTriggerOther = true;
+	element.trigger( "foo" );
+	element.trigger( "bar" );
+	shouldTriggerWidget = false;
+	widget._off( element );
+	element.trigger( "foo" );
+	element.trigger( "bar" );
+});
+
 test( "._hoverable()", function() {
 	$.widget( "ui.testWidget", {
 		_create: function() {
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index 4cfc265a3..e8a10b746 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -219,8 +219,7 @@ $.widget( "ui.accordion", {
 
 		if ( key === "event" ) {
 			if ( this.options.event ) {
-				this.headers.unbind(
-					this.options.event.split( " " ).join( ".accordion " ) + ".accordion" );
+				this._off( this.headers, this.options.event );
 			}
 			this._setupEvents( value );
 		}
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 810191775..0c72e9c4b 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -54,8 +54,8 @@ $.widget( "ui.button", {
 	},
 	_create: function() {
 		this.element.closest( "form" )
-			.unbind( "reset.button" )
-			.bind( "reset.button", formResetHandler );
+			.unbind( "reset" + this.eventNamespace )
+			.bind( "reset" + this.eventNamespace, formResetHandler );
 
 		if ( typeof this.options.disabled !== "boolean" ) {
 			this.options.disabled = !!this.element.prop( "disabled" );
@@ -79,7 +79,7 @@ $.widget( "ui.button", {
 		this.buttonElement
 			.addClass( baseClasses )
 			.attr( "role", "button" )
-			.bind( "mouseenter.button", function() {
+			.bind( "mouseenter" + this.eventNamespace, function() {
 				if ( options.disabled ) {
 					return;
 				}
@@ -88,13 +88,13 @@ $.widget( "ui.button", {
 					$( this ).addClass( "ui-state-active" );
 				}
 			})
-			.bind( "mouseleave.button", function() {
+			.bind( "mouseleave" + this.eventNamespace, function() {
 				if ( options.disabled ) {
 					return;
 				}
 				$( this ).removeClass( hoverClass );
 			})
-			.bind( "click.button", function( event ) {
+			.bind( "click" + this.eventNamespace, function( event ) {
 				if ( options.disabled ) {
 					event.preventDefault();
 					event.stopImmediatePropagation();
@@ -102,16 +102,16 @@ $.widget( "ui.button", {
 			});
 
 		this.element
-			.bind( "focus.button", function() {
+			.bind( "focus" + this.eventNamespace, function() {
 				// no need to check disabled, focus won't be triggered anyway
 				that.buttonElement.addClass( focusClass );
 			})
-			.bind( "blur.button", function() {
+			.bind( "blur" + this.eventNamespace, function() {
 				that.buttonElement.removeClass( focusClass );
 			});
 
 		if ( toggleButton ) {
-			this.element.bind( "change.button", function() {
+			this.element.bind( "change" + this.eventNamespace, function() {
 				if ( clickDragged ) {
 					return;
 				}
@@ -121,7 +121,7 @@ $.widget( "ui.button", {
 			// prevents issue where button state changes but checkbox/radio checked state
 			// does not in Firefox (see ticket #6970)
 			this.buttonElement
-				.bind( "mousedown.button", function( event ) {
+				.bind( "mousedown" + this.eventNamespace, function( event ) {
 					if ( options.disabled ) {
 						return;
 					}
@@ -129,7 +129,7 @@ $.widget( "ui.button", {
 					startXPos = event.pageX;
 					startYPos = event.pageY;
 				})
-				.bind( "mouseup.button", function( event ) {
+				.bind( "mouseup" + this.eventNamespace, function( event ) {
 					if ( options.disabled ) {
 						return;
 					}
@@ -140,7 +140,7 @@ $.widget( "ui.button", {
 		}
 
 		if ( this.type === "checkbox" ) {
-			this.buttonElement.bind( "click.button", function() {
+			this.buttonElement.bind( "click" + this.eventNamespace, function() {
 				if ( options.disabled || clickDragged ) {
 					return false;
 				}
@@ -148,7 +148,7 @@ $.widget( "ui.button", {
 				that.buttonElement.attr( "aria-pressed", that.element[0].checked );
 			});
 		} else if ( this.type === "radio" ) {
-			this.buttonElement.bind( "click.button", function() {
+			this.buttonElement.bind( "click" + this.eventNamespace, function() {
 				if ( options.disabled || clickDragged ) {
 					return false;
 				}
@@ -166,7 +166,7 @@ $.widget( "ui.button", {
 			});
 		} else {
 			this.buttonElement
-				.bind( "mousedown.button", function() {
+				.bind( "mousedown" + this.eventNamespace, function() {
 					if ( options.disabled ) {
 						return false;
 					}
@@ -176,13 +176,13 @@ $.widget( "ui.button", {
 						lastActive = null;
 					});
 				})
-				.bind( "mouseup.button", function() {
+				.bind( "mouseup" + this.eventNamespace, function() {
 					if ( options.disabled ) {
 						return false;
 					}
 					$( this ).removeClass( "ui-state-active" );
 				})
-				.bind( "keydown.button", function(event) {
+				.bind( "keydown" + this.eventNamespace, function(event) {
 					if ( options.disabled ) {
 						return false;
 					}
@@ -190,7 +190,7 @@ $.widget( "ui.button", {
 						$( this ).addClass( "ui-state-active" );
 					}
 				})
-				.bind( "keyup.button", function() {
+				.bind( "keyup" + this.eventNamespace, function() {
 					$( this ).removeClass( "ui-state-active" );
 				});
 
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 4ef8a20cb..a22eef806 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -224,7 +224,7 @@ $.widget("ui.dialog", {
 		if ( this.overlay ) {
 			this.overlay.destroy();
 		}
-		this.uiDialog.unbind( "keypress.ui-dialog" );
+		this._off( this.uiDialog, "keypress" );
 
 		if ( this.options.hide ) {
 			this.uiDialog.hide( this.options.hide, function() {
@@ -310,7 +310,7 @@ $.widget("ui.dialog", {
 
 		// prevent tabbing out of modal dialogs
 		if ( options.modal ) {
-			uiDialog.bind( "keydown.ui-dialog", function( event ) {
+			this._on( uiDialog, { keydown: function( event ) {
 				if ( event.keyCode !== $.ui.keyCode.TAB ) {
 					return;
 				}
@@ -326,7 +326,7 @@ $.widget("ui.dialog", {
 					last.focus( 1 );
 					return false;
 				}
-			});
+			}});
 		}
 
 		// set focus to the first tabbable element in the content area or the first button
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index eb0be494c..616389ba2 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -44,7 +44,7 @@ $.widget( "ui.menu", {
 			})
 			// need to catch all clicks on disabled menu
 			// not possible through _on
-			.bind( "click.menu", $.proxy(function( event ) {
+			.bind( "click" + this.eventNamespace, $.proxy(function( event ) {
 				if ( this.options.disabled ) {
 					event.preventDefault();
 				}
@@ -168,7 +168,7 @@ $.widget( "ui.menu", {
 		this.element.find( ".ui-menu-divider" ).removeClass( "ui-menu-divider ui-widget-content" );
 
 		// unbind currentEventTarget click event handler
-		$( currentEventTarget ).unbind( "click.menu" );
+		this._off( $( currentEventTarget ), "click" );
 	},
 
 	_keydown: function( event ) {
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index 21736641f..aed4ba8fb 100644
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -58,7 +58,7 @@ $.widget( "ui.tabs", {
 			.addClass( "ui-tabs ui-widget ui-widget-content ui-corner-all" )
 			.toggleClass( "ui-tabs-collapsible", options.collapsible )
 			// Prevent users from focusing disabled tabs via click
-			.delegate( ".ui-tabs-nav > li", "mousedown.tabs", function( event ) {
+			.delegate( ".ui-tabs-nav > li", "mousedown" + this.eventNamespace, function( event ) {
 				if ( $( this ).is( ".ui-state-disabled" ) ) {
 					event.preventDefault();
 				}
@@ -69,7 +69,7 @@ $.widget( "ui.tabs", {
 			// We don't have to worry about focusing the previously focused
 			// element since clicking on a non-focusable element should focus
 			// the body anyway.
-			.delegate( ".ui-tabs-anchor", "focus.tabs", function() {
+			.delegate( ".ui-tabs-anchor", "focus" + this.eventNamespace, function() {
 				if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) {
 					this.blur();
 				}
@@ -480,7 +480,7 @@ $.widget( "ui.tabs", {
 			});
 		}
 
-		this.anchors.add( this.tabs ).add( this.panels ).unbind( ".tabs" );
+		this._off( this.anchors.add( this.tabs ).add( this.panels ) );
 		this._on( this.anchors, events );
 		this._on( this.tabs, { keydown: "_tabKeydown" } );
 		this._on( this.panels, { keydown: "_panelKeydown" } );
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 6a7aab706..c4bdbb0d7 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -233,7 +233,7 @@ $.widget( "ui.tooltip", {
 		});
 
 		target.removeData( "tooltip-open" );
-		target.unbind( "mouseleave.tooltip focusout.tooltip keyup.tooltip" );
+		this._off( target, "mouseleave focusout keyup" );
 
 		this.closing = true;
 		this._trigger( "close", event, { tooltip: tooltip } );
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index 22049cbb8..5366beefe 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -387,6 +387,11 @@ $.Widget.prototype = {
 		});
 	},
 
+	_off: function( element, eventName ) {
+		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
+		element.unbind( eventName ).undelegate( eventName );
+	},
+
 	_delay: function( handler, delay ) {
 		function handlerProxy() {
 			return ( typeof handler === "string" ? instance[ handler ] : handler )
-- 
cgit v1.2.3


From 5c2cf39dff34b4598b214b1a2a1f3b48d15f0366 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Thu, 14 Jun 2012 01:02:11 +0200
Subject: Tooltip: Add track option

---
 demos/tooltip/tracking.html          | 22 +---------------------
 tests/unit/tooltip/tooltip_common.js |  1 +
 ui/jquery.ui.tooltip.js              | 29 ++++++++++++++++++++++++-----
 3 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'tests')

diff --git a/demos/tooltip/tracking.html b/demos/tooltip/tracking.html
index 033bc9766..ab0237da6 100644
--- a/demos/tooltip/tracking.html
+++ b/demos/tooltip/tracking.html
@@ -19,27 +19,7 @@
 	<script>
 	$(function() {
 		$( ".demo" ).tooltip({
-			position: {
-				my: "left+25 center",
-				at: "center"
-			},
-			open: function( event, ui ) {
-				if ( !( /^mouse/.test( event.originalEvent.type ) ) ) {
-					return;
-				}
-
-				var positionOption = $.extend( {}, $( this ).tooltip( "option", "position" ) );
-				function position( event ) {
-					positionOption.of = event;
-					ui.tooltip.position( positionOption );
-				}
-				$( document ).bind( "mousemove.tooltip-position", position );
-				// trigger once to override element-relative positioning
-				position( event );
-			},
-			close: function() {
-				$( document ).unbind( "mousemove.tooltip-position" );
-			}
+			track: true
 		});
 	});
 	</script>
diff --git a/tests/unit/tooltip/tooltip_common.js b/tests/unit/tooltip/tooltip_common.js
index d12ee9519..6d503aecd 100644
--- a/tests/unit/tooltip/tooltip_common.js
+++ b/tests/unit/tooltip/tooltip_common.js
@@ -11,6 +11,7 @@ TestHelpers.commonWidgetTests( "tooltip", {
 		},
 		show: true,
 		tooltipClass: null,
+		track: false,
 
 		// callbacks
 		close: null,
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index c4bdbb0d7..2c80f328c 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -54,6 +54,7 @@ $.widget( "ui.tooltip", {
 		},
 		show: true,
 		tooltipClass: null,
+		track: false,
 
 		// callbacks
 		close: null,
@@ -145,13 +146,14 @@ $.widget( "ui.tooltip", {
 	},
 
 	_open: function( event, target, content ) {
+		var tooltip, positionOption;
 		if ( !content ) {
 			return;
 		}
 
 		// Content can be updated multiple times. If the tooltip already
 		// exists, then just update the content and bail.
-		var tooltip = this._find( target );
+		tooltip = this._find( target );
 		if ( tooltip.length ) {
 			tooltip.find( ".ui-tooltip-content" ).html( content );
 			return;
@@ -175,11 +177,25 @@ $.widget( "ui.tooltip", {
 		tooltip = this._tooltip( target );
 		addDescribedBy( target, tooltip.attr( "id" ) );
 		tooltip.find( ".ui-tooltip-content" ).html( content );
-		tooltip
-			.position( $.extend({
+
+		function position( event ) {
+			positionOption.of = event;
+			tooltip.position( positionOption );
+		}
+		if ( this.options.track && /^mouse/.test( event.originalEvent.type ) ) {
+			positionOption = $.extend( {}, this.options.position );
+			this._on( this.document, {
+				mousemove: position
+			});
+			// trigger once to override element-relative positioning
+			position( event );
+		} else {
+			tooltip.position( $.extend({
 				of: target
-			}, this.options.position ) )
-			.hide();
+			}, this.options.position ) );
+		}
+
+		tooltip.hide();
 
 		this._show( tooltip, this.options.show );
 
@@ -235,6 +251,9 @@ $.widget( "ui.tooltip", {
 		target.removeData( "tooltip-open" );
 		this._off( target, "mouseleave focusout keyup" );
 
+		// TODO use _off
+		this.document.unbind( "mousemove.tooltip" );
+
 		this.closing = true;
 		this._trigger( "close", event, { tooltip: tooltip } );
 		this.closing = false;
-- 
cgit v1.2.3


From 92fb5567a25080f2064710fc24f0c6c073424cf3 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 15 Jun 2012 12:47:12 -0400
Subject: Effects: Renamed all files.

---
 demos/addClass/default.html          |   2 +-
 demos/animate/default.html           |   2 +-
 demos/datepicker/animation.html      |  14 +-
 demos/dialog/animated.html           |   6 +-
 demos/dialog/modal-form.html         |   2 +-
 demos/effect/default.html            |  28 +-
 demos/effect/easing.html             |   2 +-
 demos/hide/default.html              |  24 +-
 demos/index.html                     |  26 +-
 demos/removeClass/default.html       |   2 +-
 demos/show/default.html              |  24 +-
 demos/switchClass/default.html       |   2 +-
 demos/toggle/default.html            |  24 +-
 demos/toggleClass/default.html       |   2 +-
 demos/tooltip/custom-animation.html  |   4 +-
 demos/tooltip/video-player.html      |   4 +-
 grunt.js                             |   2 +-
 tests/unit/effects/effects.html      |  28 +-
 tests/visual/addClass/queue.html     |   2 +-
 tests/visual/effects/all.html        |  28 +-
 tests/visual/effects/scale.html      |   4 +-
 tests/visual/tooltip/animations.html |  10 +-
 ui/jquery.effects.blind.js           |  81 ----
 ui/jquery.effects.bounce.js          | 112 ------
 ui/jquery.effects.clip.js            |  66 ----
 ui/jquery.effects.core.js            | 739 -----------------------------------
 ui/jquery.effects.drop.js            |  64 ---
 ui/jquery.effects.explode.js         |  96 -----
 ui/jquery.effects.fade.js            |  29 --
 ui/jquery.effects.fold.js            |  75 ----
 ui/jquery.effects.highlight.js       |  49 ---
 ui/jquery.effects.pulsate.js         |  62 ---
 ui/jquery.effects.scale.js           | 290 --------------
 ui/jquery.effects.shake.js           |  73 ----
 ui/jquery.effects.slide.js           |  65 ---
 ui/jquery.effects.transfer.js        |  46 ---
 ui/jquery.ui.effect-blind.js         |  81 ++++
 ui/jquery.ui.effect-bounce.js        | 112 ++++++
 ui/jquery.ui.effect-clip.js          |  66 ++++
 ui/jquery.ui.effect-drop.js          |  64 +++
 ui/jquery.ui.effect-explode.js       |  96 +++++
 ui/jquery.ui.effect-fade.js          |  29 ++
 ui/jquery.ui.effect-fold.js          |  75 ++++
 ui/jquery.ui.effect-highlight.js     |  49 +++
 ui/jquery.ui.effect-pulsate.js       |  62 +++
 ui/jquery.ui.effect-scale.js         | 290 ++++++++++++++
 ui/jquery.ui.effect-shake.js         |  73 ++++
 ui/jquery.ui.effect-slide.js         |  65 +++
 ui/jquery.ui.effect-transfer.js      |  46 +++
 ui/jquery.ui.effect.js               | 739 +++++++++++++++++++++++++++++++++++
 50 files changed, 1968 insertions(+), 1968 deletions(-)
 delete mode 100644 ui/jquery.effects.blind.js
 delete mode 100644 ui/jquery.effects.bounce.js
 delete mode 100644 ui/jquery.effects.clip.js
 delete mode 100644 ui/jquery.effects.core.js
 delete mode 100644 ui/jquery.effects.drop.js
 delete mode 100644 ui/jquery.effects.explode.js
 delete mode 100644 ui/jquery.effects.fade.js
 delete mode 100644 ui/jquery.effects.fold.js
 delete mode 100644 ui/jquery.effects.highlight.js
 delete mode 100644 ui/jquery.effects.pulsate.js
 delete mode 100644 ui/jquery.effects.scale.js
 delete mode 100644 ui/jquery.effects.shake.js
 delete mode 100644 ui/jquery.effects.slide.js
 delete mode 100644 ui/jquery.effects.transfer.js
 create mode 100644 ui/jquery.ui.effect-blind.js
 create mode 100644 ui/jquery.ui.effect-bounce.js
 create mode 100644 ui/jquery.ui.effect-clip.js
 create mode 100644 ui/jquery.ui.effect-drop.js
 create mode 100644 ui/jquery.ui.effect-explode.js
 create mode 100644 ui/jquery.ui.effect-fade.js
 create mode 100644 ui/jquery.ui.effect-fold.js
 create mode 100644 ui/jquery.ui.effect-highlight.js
 create mode 100644 ui/jquery.ui.effect-pulsate.js
 create mode 100644 ui/jquery.ui.effect-scale.js
 create mode 100644 ui/jquery.ui.effect-shake.js
 create mode 100644 ui/jquery.ui.effect-slide.js
 create mode 100644 ui/jquery.ui.effect-transfer.js
 create mode 100644 ui/jquery.ui.effect.js

(limited to 'tests')

diff --git a/demos/addClass/default.html b/demos/addClass/default.html
index 98f7c8c50..9d4b71455 100644
--- a/demos/addClass/default.html
+++ b/demos/addClass/default.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Effects - addClass demo</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
 		.toggler { width: 500px; height: 200px; position: relative; }
diff --git a/demos/animate/default.html b/demos/animate/default.html
index 307d030a6..b4488bd17 100644
--- a/demos/animate/default.html
+++ b/demos/animate/default.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Effects - Animate demo</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
 		.toggler { width: 500px; height: 200px; position: relative; }
diff --git a/demos/datepicker/animation.html b/demos/datepicker/animation.html
index f2e6452f7..3185b6718 100644
--- a/demos/datepicker/animation.html
+++ b/demos/datepicker/animation.html
@@ -7,13 +7,13 @@
 	<script src="../../jquery-1.7.2.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>
 	<script src="../../ui/jquery.ui.widget.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
-	<script src="../../ui/jquery.effects.blind.js"></script>
-	<script src="../../ui/jquery.effects.bounce.js"></script>
-	<script src="../../ui/jquery.effects.clip.js"></script>
-	<script src="../../ui/jquery.effects.drop.js"></script>
-	<script src="../../ui/jquery.effects.fold.js"></script>
-	<script src="../../ui/jquery.effects.slide.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
+	<script src="../../ui/jquery.ui.effect-blind.js"></script>
+	<script src="../../ui/jquery.ui.effect-bounce.js"></script>
+	<script src="../../ui/jquery.ui.effect-clip.js"></script>
+	<script src="../../ui/jquery.ui.effect-drop.js"></script>
+	<script src="../../ui/jquery.ui.effect-fold.js"></script>
+	<script src="../../ui/jquery.ui.effect-slide.js"></script>
 	<script src="../../ui/jquery.ui.datepicker.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
diff --git a/demos/dialog/animated.html b/demos/dialog/animated.html
index 4124ae400..610d38d69 100644
--- a/demos/dialog/animated.html
+++ b/demos/dialog/animated.html
@@ -13,9 +13,9 @@
 	<script src="../../ui/jquery.ui.position.js"></script>
 	<script src="../../ui/jquery.ui.resizable.js"></script>
 	<script src="../../ui/jquery.ui.dialog.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
-	<script src="../../ui/jquery.effects.blind.js"></script>
-	<script src="../../ui/jquery.effects.explode.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
+	<script src="../../ui/jquery.ui.effect-blind.js"></script>
+	<script src="../../ui/jquery.ui.effect-explode.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
 	// increase the default animation speed to exaggerate the effect
diff --git a/demos/dialog/modal-form.html b/demos/dialog/modal-form.html
index 553335227..fc0b0e1ef 100644
--- a/demos/dialog/modal-form.html
+++ b/demos/dialog/modal-form.html
@@ -14,7 +14,7 @@
 	<script src="../../ui/jquery.ui.position.js"></script>
 	<script src="../../ui/jquery.ui.resizable.js"></script>
 	<script src="../../ui/jquery.ui.dialog.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
 		body { font-size: 62.5%; }
diff --git a/demos/effect/default.html b/demos/effect/default.html
index deffa6da2..b8251d5be 100644
--- a/demos/effect/default.html
+++ b/demos/effect/default.html
@@ -5,20 +5,20 @@
 	<title>jQuery UI Effects - Effect demo</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
-	<script src="../../ui/jquery.effects.blind.js"></script>
-	<script src="../../ui/jquery.effects.bounce.js"></script>
-	<script src="../../ui/jquery.effects.clip.js"></script>
-	<script src="../../ui/jquery.effects.drop.js"></script>
-	<script src="../../ui/jquery.effects.explode.js"></script>
-	<script src="../../ui/jquery.effects.fade.js"></script>
-	<script src="../../ui/jquery.effects.fold.js"></script>
-	<script src="../../ui/jquery.effects.highlight.js"></script>
-	<script src="../../ui/jquery.effects.pulsate.js"></script>
-	<script src="../../ui/jquery.effects.scale.js"></script>
-	<script src="../../ui/jquery.effects.shake.js"></script>
-	<script src="../../ui/jquery.effects.slide.js"></script>
-	<script src="../../ui/jquery.effects.transfer.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
+	<script src="../../ui/jquery.ui.effect-blind.js"></script>
+	<script src="../../ui/jquery.ui.effect-bounce.js"></script>
+	<script src="../../ui/jquery.ui.effect-clip.js"></script>
+	<script src="../../ui/jquery.ui.effect-drop.js"></script>
+	<script src="../../ui/jquery.ui.effect-explode.js"></script>
+	<script src="../../ui/jquery.ui.effect-fade.js"></script>
+	<script src="../../ui/jquery.ui.effect-fold.js"></script>
+	<script src="../../ui/jquery.ui.effect-highlight.js"></script>
+	<script src="../../ui/jquery.ui.effect-pulsate.js"></script>
+	<script src="../../ui/jquery.ui.effect-scale.js"></script>
+	<script src="../../ui/jquery.ui.effect-shake.js"></script>
+	<script src="../../ui/jquery.ui.effect-slide.js"></script>
+	<script src="../../ui/jquery.ui.effect-transfer.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
 		.toggler { width: 500px; height: 200px; position: relative; }
diff --git a/demos/effect/easing.html b/demos/effect/easing.html
index 610e30208..0d90cf0b6 100644
--- a/demos/effect/easing.html
+++ b/demos/effect/easing.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Effects - Easing demo</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
 	.graph {
diff --git a/demos/hide/default.html b/demos/hide/default.html
index 75ec1eb38..03bb75bc1 100644
--- a/demos/hide/default.html
+++ b/demos/hide/default.html
@@ -5,18 +5,18 @@
 	<title>jQuery UI Effects - Hide Demo</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
-	<script src="../../ui/jquery.effects.blind.js"></script>
-	<script src="../../ui/jquery.effects.bounce.js"></script>
-	<script src="../../ui/jquery.effects.clip.js"></script>
-	<script src="../../ui/jquery.effects.drop.js"></script>
-	<script src="../../ui/jquery.effects.explode.js"></script>
-	<script src="../../ui/jquery.effects.fold.js"></script>
-	<script src="../../ui/jquery.effects.highlight.js"></script>
-	<script src="../../ui/jquery.effects.pulsate.js"></script>
-	<script src="../../ui/jquery.effects.scale.js"></script>
-	<script src="../../ui/jquery.effects.shake.js"></script>
-	<script src="../../ui/jquery.effects.slide.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
+	<script src="../../ui/jquery.ui.effect-blind.js"></script>
+	<script src="../../ui/jquery.ui.effect-bounce.js"></script>
+	<script src="../../ui/jquery.ui.effect-clip.js"></script>
+	<script src="../../ui/jquery.ui.effect-drop.js"></script>
+	<script src="../../ui/jquery.ui.effect-explode.js"></script>
+	<script src="../../ui/jquery.ui.effect-fold.js"></script>
+	<script src="../../ui/jquery.ui.effect-highlight.js"></script>
+	<script src="../../ui/jquery.ui.effect-pulsate.js"></script>
+	<script src="../../ui/jquery.ui.effect-scale.js"></script>
+	<script src="../../ui/jquery.ui.effect-shake.js"></script>
+	<script src="../../ui/jquery.ui.effect-slide.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
 	.toggler { width: 500px; height: 200px; }
diff --git a/demos/index.html b/demos/index.html
index 059bf42cb..44cbefa39 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -29,19 +29,19 @@
 	<script src="../ui/jquery.ui.spinner.js"></script>
 	<script src="../ui/jquery.ui.tabs.js"></script>
 	<script src="../ui/jquery.ui.tooltip.js"></script>
-	<script src="../ui/jquery.effects.core.js"></script>
-	<script src="../ui/jquery.effects.blind.js"></script>
-	<script src="../ui/jquery.effects.bounce.js"></script>
-	<script src="../ui/jquery.effects.clip.js"></script>
-	<script src="../ui/jquery.effects.drop.js"></script>
-	<script src="../ui/jquery.effects.explode.js"></script>
-	<script src="../ui/jquery.effects.fold.js"></script>
-	<script src="../ui/jquery.effects.highlight.js"></script>
-	<script src="../ui/jquery.effects.pulsate.js"></script>
-	<script src="../ui/jquery.effects.scale.js"></script>
-	<script src="../ui/jquery.effects.shake.js"></script>
-	<script src="../ui/jquery.effects.slide.js"></script>
-	<script src="../ui/jquery.effects.transfer.js"></script>
+	<script src="../ui/jquery.ui.effect.js"></script>
+	<script src="../ui/jquery.ui.effect-blind.js"></script>
+	<script src="../ui/jquery.ui.effect-bounce.js"></script>
+	<script src="../ui/jquery.ui.effect-clip.js"></script>
+	<script src="../ui/jquery.ui.effect-drop.js"></script>
+	<script src="../ui/jquery.ui.effect-explode.js"></script>
+	<script src="../ui/jquery.ui.effect-fold.js"></script>
+	<script src="../ui/jquery.ui.effect-highlight.js"></script>
+	<script src="../ui/jquery.ui.effect-pulsate.js"></script>
+	<script src="../ui/jquery.ui.effect-scale.js"></script>
+	<script src="../ui/jquery.ui.effect-shake.js"></script>
+	<script src="../ui/jquery.ui.effect-slide.js"></script>
+	<script src="../ui/jquery.ui.effect-transfer.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-af.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-ar.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-ar-DZ.js"></script>
diff --git a/demos/removeClass/default.html b/demos/removeClass/default.html
index a9f7c047d..61d90363a 100644
--- a/demos/removeClass/default.html
+++ b/demos/removeClass/default.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Effects - removeClass Demo</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
 	.toggler { width: 500px; height: 200px; position: relative; }
diff --git a/demos/show/default.html b/demos/show/default.html
index 091a71167..c0d1eeea7 100644
--- a/demos/show/default.html
+++ b/demos/show/default.html
@@ -5,18 +5,18 @@
 	<title>jQuery UI Effects - Show Demo</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
-	<script src="../../ui/jquery.effects.blind.js"></script>
-	<script src="../../ui/jquery.effects.bounce.js"></script>
-	<script src="../../ui/jquery.effects.clip.js"></script>
-	<script src="../../ui/jquery.effects.drop.js"></script>
-	<script src="../../ui/jquery.effects.explode.js"></script>
-	<script src="../../ui/jquery.effects.fold.js"></script>
-	<script src="../../ui/jquery.effects.highlight.js"></script>
-	<script src="../../ui/jquery.effects.pulsate.js"></script>
-	<script src="../../ui/jquery.effects.scale.js"></script>
-	<script src="../../ui/jquery.effects.shake.js"></script>
-	<script src="../../ui/jquery.effects.slide.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
+	<script src="../../ui/jquery.ui.effect-blind.js"></script>
+	<script src="../../ui/jquery.ui.effect-bounce.js"></script>
+	<script src="../../ui/jquery.ui.effect-clip.js"></script>
+	<script src="../../ui/jquery.ui.effect-drop.js"></script>
+	<script src="../../ui/jquery.ui.effect-explode.js"></script>
+	<script src="../../ui/jquery.ui.effect-fold.js"></script>
+	<script src="../../ui/jquery.ui.effect-highlight.js"></script>
+	<script src="../../ui/jquery.ui.effect-pulsate.js"></script>
+	<script src="../../ui/jquery.ui.effect-scale.js"></script>
+	<script src="../../ui/jquery.ui.effect-shake.js"></script>
+	<script src="../../ui/jquery.ui.effect-slide.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
 	.toggler { width: 500px; height: 200px; }
diff --git a/demos/switchClass/default.html b/demos/switchClass/default.html
index 673a19d3b..8b8ecd79b 100644
--- a/demos/switchClass/default.html
+++ b/demos/switchClass/default.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Effects - switchClass Demo</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
 	.toggler { width: 500px; height: 200px; position: relative; }
diff --git a/demos/toggle/default.html b/demos/toggle/default.html
index 5dcd5eff8..2d1b708b0 100644
--- a/demos/toggle/default.html
+++ b/demos/toggle/default.html
@@ -5,18 +5,18 @@
 	<title>jQuery UI Effects - Toggle Demo</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
-	<script src="../../ui/jquery.effects.blind.js"></script>
-	<script src="../../ui/jquery.effects.bounce.js"></script>
-	<script src="../../ui/jquery.effects.clip.js"></script>
-	<script src="../../ui/jquery.effects.drop.js"></script>
-	<script src="../../ui/jquery.effects.explode.js"></script>
-	<script src="../../ui/jquery.effects.fold.js"></script>
-	<script src="../../ui/jquery.effects.highlight.js"></script>
-	<script src="../../ui/jquery.effects.pulsate.js"></script>
-	<script src="../../ui/jquery.effects.scale.js"></script>
-	<script src="../../ui/jquery.effects.shake.js"></script>
-	<script src="../../ui/jquery.effects.slide.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
+	<script src="../../ui/jquery.ui.effect-blind.js"></script>
+	<script src="../../ui/jquery.ui.effect-bounce.js"></script>
+	<script src="../../ui/jquery.ui.effect-clip.js"></script>
+	<script src="../../ui/jquery.ui.effect-drop.js"></script>
+	<script src="../../ui/jquery.ui.effect-explode.js"></script>
+	<script src="../../ui/jquery.ui.effect-fold.js"></script>
+	<script src="../../ui/jquery.ui.effect-highlight.js"></script>
+	<script src="../../ui/jquery.ui.effect-pulsate.js"></script>
+	<script src="../../ui/jquery.ui.effect-scale.js"></script>
+	<script src="../../ui/jquery.ui.effect-shake.js"></script>
+	<script src="../../ui/jquery.ui.effect-slide.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
 	.toggler {
diff --git a/demos/toggleClass/default.html b/demos/toggleClass/default.html
index a7c100fcc..544c0b95b 100644
--- a/demos/toggleClass/default.html
+++ b/demos/toggleClass/default.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Effects - toggleClass Demo</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
 	.toggler { width: 500px; height: 200px; position: relative; }
diff --git a/demos/tooltip/custom-animation.html b/demos/tooltip/custom-animation.html
index 4452a3002..8a55e455d 100644
--- a/demos/tooltip/custom-animation.html
+++ b/demos/tooltip/custom-animation.html
@@ -9,8 +9,8 @@
 	<script src="../../ui/jquery.ui.widget.js"></script>
 	<script src="../../ui/jquery.ui.position.js"></script>
 	<script src="../../ui/jquery.ui.tooltip.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
-	<script src="../../ui/jquery.effects.explode.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
+	<script src="../../ui/jquery.ui.effect-explode.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
 	$(function() {
diff --git a/demos/tooltip/video-player.html b/demos/tooltip/video-player.html
index 55a0f83af..1e17ae163 100644
--- a/demos/tooltip/video-player.html
+++ b/demos/tooltip/video-player.html
@@ -11,8 +11,8 @@
 	<script src="../../ui/jquery.ui.tooltip.js"></script>
 	<script src="../../ui/jquery.ui.button.js"></script>
 	<script src="../../ui/jquery.ui.menu.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
-	<script src="../../ui/jquery.effects.blind.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
+	<script src="../../ui/jquery.ui.effect-blind.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
 	.player {
diff --git a/grunt.js b/grunt.js
index 1fff77e24..5af87e7a3 100644
--- a/grunt.js
+++ b/grunt.js
@@ -16,7 +16,7 @@ var // modules
 		"jquery.ui.resizable.js",
 		"jquery.ui.selectable.js",
 		"jquery.ui.sortable.js",
-		"jquery.effects.core.js"
+		"jquery.ui.effect.js"
 	],
 
 	uiFiles = coreFiles.map(function( file ) {
diff --git a/tests/unit/effects/effects.html b/tests/unit/effects/effects.html
index 1fd94182d..9305fcd21 100644
--- a/tests/unit/effects/effects.html
+++ b/tests/unit/effects/effects.html
@@ -15,20 +15,20 @@
 	<script>
 	TestHelpers.loadResources({
 		js: [
-			"ui/jquery.effects.core.js",
-			"ui/jquery.effects.blind.js",
-			"ui/jquery.effects.bounce.js",
-			"ui/jquery.effects.clip.js",
-			"ui/jquery.effects.drop.js",
-			"ui/jquery.effects.explode.js",
-			"ui/jquery.effects.fade.js",
-			"ui/jquery.effects.fold.js",
-			"ui/jquery.effects.highlight.js",
-			"ui/jquery.effects.pulsate.js",
-			"ui/jquery.effects.scale.js",
-			"ui/jquery.effects.shake.js",
-			"ui/jquery.effects.slide.js",
-			"ui/jquery.effects.transfer.js"
+			"ui/jquery.ui.effect.js",
+			"ui/jquery.ui.effect-blind.js",
+			"ui/jquery.ui.effect-bounce.js",
+			"ui/jquery.ui.effect-clip.js",
+			"ui/jquery.ui.effect-drop.js",
+			"ui/jquery.ui.effect-explode.js",
+			"ui/jquery.ui.effect-fade.js",
+			"ui/jquery.ui.effect-fold.js",
+			"ui/jquery.ui.effect-highlight.js",
+			"ui/jquery.ui.effect-pulsate.js",
+			"ui/jquery.ui.effect-scale.js",
+			"ui/jquery.ui.effect-shake.js",
+			"ui/jquery.ui.effect-slide.js",
+			"ui/jquery.ui.effect-transfer.js"
 		]
 	});
 	</script>
diff --git a/tests/visual/addClass/queue.html b/tests/visual/addClass/queue.html
index 21f4cc1cb..0b7a43656 100644
--- a/tests/visual/addClass/queue.html
+++ b/tests/visual/addClass/queue.html
@@ -5,7 +5,7 @@
 	<title>addClass Visual Test : Queue</title>
 	<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css">
 	<script src="../../../jquery-1.7.2.js"></script>
-	<script src="../../../ui/jquery.effects.core.js"></script>
+	<script src="../../../ui/jquery.ui.effect.js"></script>
 	<style>
 	.box {
 		width: 100px;
diff --git a/tests/visual/effects/all.html b/tests/visual/effects/all.html
index 15bfcd254..1797c5715 100644
--- a/tests/visual/effects/all.html
+++ b/tests/visual/effects/all.html
@@ -5,20 +5,20 @@
 	<title>jQuery UI Effects Test Suite</title>
 	<link rel="stylesheet" href="effects.css">
 	<script src="../../../jquery-1.7.2.js"></script>
-	<script src="../../../ui/jquery.effects.core.js"></script>
-	<script src="../../../ui/jquery.effects.blind.js"></script>
-	<script src="../../../ui/jquery.effects.bounce.js"></script>
-	<script src="../../../ui/jquery.effects.clip.js"></script>
-	<script src="../../../ui/jquery.effects.drop.js"></script>
-	<script src="../../../ui/jquery.effects.explode.js"></script>
-	<script src="../../../ui/jquery.effects.fade.js"></script>
-	<script src="../../../ui/jquery.effects.fold.js"></script>
-	<script src="../../../ui/jquery.effects.highlight.js"></script>
-	<script src="../../../ui/jquery.effects.pulsate.js"></script>
-	<script src="../../../ui/jquery.effects.scale.js"></script>
-	<script src="../../../ui/jquery.effects.shake.js"></script>
-	<script src="../../../ui/jquery.effects.slide.js"></script>
-	<script src="../../../ui/jquery.effects.transfer.js"></script>
+	<script src="../../../ui/jquery.ui.effect.js"></script>
+	<script src="../../../ui/jquery.ui.effect-blind.js"></script>
+	<script src="../../../ui/jquery.ui.effect-bounce.js"></script>
+	<script src="../../../ui/jquery.ui.effect-clip.js"></script>
+	<script src="../../../ui/jquery.ui.effect-drop.js"></script>
+	<script src="../../../ui/jquery.ui.effect-explode.js"></script>
+	<script src="../../../ui/jquery.ui.effect-fade.js"></script>
+	<script src="../../../ui/jquery.ui.effect-fold.js"></script>
+	<script src="../../../ui/jquery.ui.effect-highlight.js"></script>
+	<script src="../../../ui/jquery.ui.effect-pulsate.js"></script>
+	<script src="../../../ui/jquery.ui.effect-scale.js"></script>
+	<script src="../../../ui/jquery.ui.effect-shake.js"></script>
+	<script src="../../../ui/jquery.ui.effect-slide.js"></script>
+	<script src="../../../ui/jquery.ui.effect-transfer.js"></script>
 	<script src="effects.js"></script>
 </head>
 <body>
diff --git a/tests/visual/effects/scale.html b/tests/visual/effects/scale.html
index add2ba01c..bca21a45f 100644
--- a/tests/visual/effects/scale.html
+++ b/tests/visual/effects/scale.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Effects Test Suite</title>
 	<link rel="stylesheet" href="effects.css">
 	<script src="../../../jquery-1.7.2.js"></script>
-	<script src="../../../ui/jquery.effects.core.js"></script>
-	<script src="../../../ui/jquery.effects.scale.js"></script>
+	<script src="../../../ui/jquery.ui.effect.js"></script>
+	<script src="../../../ui/jquery.ui.effect-scale.js"></script>
 	<script>
 	$(function() {
 		var test = $( "#testBox" ),
diff --git a/tests/visual/tooltip/animations.html b/tests/visual/tooltip/animations.html
index 24fe02905..15badb618 100644
--- a/tests/visual/tooltip/animations.html
+++ b/tests/visual/tooltip/animations.html
@@ -9,11 +9,11 @@
 	<script src="../../../ui/jquery.ui.widget.js"></script>
 	<script src="../../../ui/jquery.ui.position.js"></script>
 	<script src="../../../ui/jquery.ui.tooltip.js"></script>
-	<script src="../../../ui/jquery.effects.core.js"></script>
-	<script src="../../../ui/jquery.effects.blind.js"></script>
-	<script src="../../../ui/jquery.effects.bounce.js"></script>
-	<script src="../../../ui/jquery.effects.drop.js"></script>
-	<script src="../../../ui/jquery.effects.explode.js"></script>
+	<script src="../../../ui/jquery.ui.effect.js"></script>
+	<script src="../../../ui/jquery.ui.effect-blind.js"></script>
+	<script src="../../../ui/jquery.ui.effect-bounce.js"></script>
+	<script src="../../../ui/jquery.ui.effect-drop.js"></script>
+	<script src="../../../ui/jquery.ui.effect-explode.js"></script>
 	<style>
 	pre {
 		width: 250px;
diff --git a/ui/jquery.effects.blind.js b/ui/jquery.effects.blind.js
deleted file mode 100644
index 005b59ad6..000000000
--- a/ui/jquery.effects.blind.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/*!
- * jQuery UI Effects Blind @VERSION
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Blind
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function( $, undefined ) {
-
-var rvertical = /up|down|vertical/,
-	rpositivemotion = /up|left|vertical|horizontal/;
-
-$.effects.effect.blind = function( o, done ) {
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		direction = o.direction || "up",
-		vertical = rvertical.test( direction ),
-		ref = vertical ? "height" : "width",
-		ref2 = vertical ? "top" : "left",
-		motion = rpositivemotion.test( direction ),
-		animation = {},
-		show = mode === "show",
-		wrapper, distance, margin;
-
-	// if already wrapped, the wrapper's properties are my property. #6245
-	if ( el.parent().is( ".ui-effects-wrapper" ) ) {
-		$.effects.save( el.parent(), props );
-	} else {
-		$.effects.save( el, props );
-	}
-	el.show();
-	wrapper = $.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-
-	distance = wrapper[ ref ]();
-	margin = parseFloat( wrapper.css( ref2 ) );
-
-	animation[ ref ] = show ? distance : 0;
-	if ( !motion ) {
-		el
-			.css( vertical ? "bottom" : "right", 0 )
-			.css( vertical ? "top" : "left", "auto" )
-			.css({ position: "absolute" });
-
-	animation[ ref2 ] = show ? margin : distance + margin;
-	}
-
-	// start at 0 if we are showing
-	if ( show ) {
-		wrapper.css( ref, 0 );
-		if ( ! motion ) {
-			wrapper.css( ref2, margin + distance );
-		}
-	}
-
-	// Animate
-	wrapper.animate( animation, {
-		duration: o.duration,
-		easing: o.easing,
-		queue: false,
-		complete: function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-
-};
-
-})(jQuery);
diff --git a/ui/jquery.effects.bounce.js b/ui/jquery.effects.bounce.js
deleted file mode 100644
index 934fb16ef..000000000
--- a/ui/jquery.effects.bounce.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/*!
- * jQuery UI Effects Bounce @VERSION
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Bounce
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function( $, undefined ) {
-
-$.effects.effect.bounce = function( o, done ) {
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-
-		// defaults:
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		hide = mode === "hide",
-		show = mode === "show",
-		direction = o.direction || "up",
-		distance = o.distance,
-		times = o.times || 5,
-
-		// number of internal animations
-		anims = times * 2 + ( show || hide ? 1 : 0 ),
-		speed = o.duration / anims,
-		easing = o.easing,
-
-		// utility:
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		motion = ( direction === "up" || direction === "left" ),
-		i,
-		upAnim,
-		downAnim,
-
-		// we will need to re-assemble the queue to stack our animations in place
-		queue = el.queue(),
-		queuelen = queue.length;
-
-	// Avoid touching opacity to prevent clearType and PNG issues in IE
-	if ( show || hide ) {
-		props.push( "opacity" );
-	}
-
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el ); // Create Wrapper
-
-	// default distance for the BIGGEST bounce is the outer Distance / 3
-	if ( !distance ) {
-		distance = el[ ref === "top" ? "outerHeight" : "outerWidth" ]() / 3;
-	}
-
-	if ( show ) {
-		downAnim = { opacity: 1 };
-		downAnim[ ref ] = 0;
-
-		// if we are showing, force opacity 0 and set the initial position
-		// then do the "first" animation
-		el.css( "opacity", 0 )
-			.css( ref, motion ? -distance * 2 : distance * 2 )
-			.animate( downAnim, speed, easing );
-	}
-
-	// start at the smallest distance if we are hiding
-	if ( hide ) {
-		distance = distance / Math.pow( 2, times - 1 );
-	}
-
-	downAnim = {};
-	downAnim[ ref ] = 0;
-	// Bounces up/down/left/right then back to 0 -- times * 2 animations happen here
-	for ( i = 0; i < times; i++ ) {
-		upAnim = {};
-		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
-
-		el.animate( upAnim, speed, easing )
-			.animate( downAnim, speed, easing );
-
-		distance = hide ? distance * 2 : distance / 2;
-	}
-
-	// Last Bounce when Hiding
-	if ( hide ) {
-		upAnim = { opacity: 0 };
-		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
-
-		el.animate( upAnim, speed, easing );
-	}
-
-	el.queue(function() {
-		if ( hide ) {
-			el.hide();
-		}
-		$.effects.restore( el, props );
-		$.effects.removeWrapper( el );
-		done();
-	});
-
-	// inject all the animations we just queued to be first in line (after "inprogress")
-	if ( queuelen > 1) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	el.dequeue();
-
-};
-
-})(jQuery);
diff --git a/ui/jquery.effects.clip.js b/ui/jquery.effects.clip.js
deleted file mode 100644
index 861508cd0..000000000
--- a/ui/jquery.effects.clip.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*!
- * jQuery UI Effects Clip @VERSION
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Clip
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function( $, undefined ) {
-
-$.effects.effect.clip = function( o, done ) {
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-		direction = o.direction || "vertical",
-		vert = direction === "vertical",
-		size = vert ? "height" : "width",
-		position = vert ? "top" : "left",
-		animation = {},
-		wrapper, animate, distance;
-
-	// Save & Show
-	$.effects.save( el, props );
-	el.show();
-
-	// Create Wrapper
-	wrapper = $.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-	animate = ( el[0].tagName === "IMG" ) ? wrapper : el;
-	distance = animate[ size ]();
-
-	// Shift
-	if ( show ) {
-		animate.css( size, 0 );
-		animate.css( position, distance / 2 );
-	}
-
-	// Create Animation Object:
-	animation[ size ] = show ? distance : 0;
-	animation[ position ] = show ? 0 : distance / 2;
-
-	// Animate
-	animate.animate( animation, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( !show ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-
-};
-
-})(jQuery);
diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js
deleted file mode 100644
index 1bb1415a9..000000000
--- a/ui/jquery.effects.core.js
+++ /dev/null
@@ -1,739 +0,0 @@
-/*!
- * jQuery UI Effects @VERSION
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/
- */
-;(jQuery.effects || (function($, undefined) {
-
-var backCompat = $.uiBackCompat !== false,
-	// prefix used for storing data on .data()
-	dataSpace = "ui-effects-";
-
-$.effects = {
-	effect: {}
-};
-
-/******************************************************************************/
-/****************************** COLOR ANIMATIONS ******************************/
-/******************************************************************************/
-(function() {
-
-// override the animation for color styles
-$.each(["backgroundColor", "borderBottomColor", "borderLeftColor",
-	"borderRightColor", "borderTopColor", "borderColor", "color", "outlineColor"],
-function(i, attr) {
-	$.fx.step[attr] = function(fx) {
-		if (!fx.colorInit) {
-			fx.start = getColor(fx.elem, attr);
-			fx.end = getRGB(fx.end);
-			fx.colorInit = true;
-		}
-
-		fx.elem.style[attr] = "rgb(" +
-			Math.max(Math.min(parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0], 10), 255), 0) + "," +
-			Math.max(Math.min(parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1], 10), 255), 0) + "," +
-			Math.max(Math.min(parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2], 10), 255), 0) + ")";
-	};
-});
-
-// Color Conversion functions from highlightFade
-// By Blair Mitchelmore
-// http://jquery.offput.ca/highlightFade/
-
-// Parse strings looking for color tuples [255,255,255]
-function getRGB(color) {
-		var result;
-
-		// Check if we're already dealing with an array of colors
-		if ( color && color.constructor === Array && color.length === 3 ) {
-			return color;
-		}
-
-		// Look for rgb(num,num,num)
-		if ( (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color)) ) {
-			return [parseInt(result[1],10), parseInt(result[2],10), parseInt(result[3],10)];
-		}
-
-		// Look for rgb(num%,num%,num%)
-		if ( (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color)) ) {
-			return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
-		}
-
-		// Look for #a0b1c2
-		if ( (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color)) ) {
-			return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)];
-		}
-
-		// Look for #fff
-		if ( (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color)) ) {
-			return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)];
-		}
-
-		// Look for rgba(0, 0, 0, 0) == transparent in Safari 3
-		if ( (result = /rgba\(0, 0, 0, 0\)/.exec(color)) ) {
-			return colors.transparent;
-		}
-
-		// Otherwise, we're most likely dealing with a named color
-		return colors[$.trim(color).toLowerCase()];
-}
-
-function getColor(elem, attr) {
-		var color;
-
-		do {
-				color = $.css(elem, attr);
-
-				// Keep going until we find an element that has color, or we hit the body
-				if ( color && color !== "transparent" || $.nodeName(elem, "body") ) {
-					break;
-				}
-
-				attr = "backgroundColor";
-		} while ( (elem = elem.parentNode) );
-
-		return getRGB(color);
-}
-
-// Some named colors to work with
-// From Interface by Stefan Petre
-// http://interface.eyecon.ro/
-
-var colors = {
-	aqua:[0,255,255],
-	azure:[240,255,255],
-	beige:[245,245,220],
-	black:[0,0,0],
-	blue:[0,0,255],
-	brown:[165,42,42],
-	cyan:[0,255,255],
-	darkblue:[0,0,139],
-	darkcyan:[0,139,139],
-	darkgrey:[169,169,169],
-	darkgreen:[0,100,0],
-	darkkhaki:[189,183,107],
-	darkmagenta:[139,0,139],
-	darkolivegreen:[85,107,47],
-	darkorange:[255,140,0],
-	darkorchid:[153,50,204],
-	darkred:[139,0,0],
-	darksalmon:[233,150,122],
-	darkviolet:[148,0,211],
-	fuchsia:[255,0,255],
-	gold:[255,215,0],
-	green:[0,128,0],
-	indigo:[75,0,130],
-	khaki:[240,230,140],
-	lightblue:[173,216,230],
-	lightcyan:[224,255,255],
-	lightgreen:[144,238,144],
-	lightgrey:[211,211,211],
-	lightpink:[255,182,193],
-	lightyellow:[255,255,224],
-	lime:[0,255,0],
-	magenta:[255,0,255],
-	maroon:[128,0,0],
-	navy:[0,0,128],
-	olive:[128,128,0],
-	orange:[255,165,0],
-	pink:[255,192,203],
-	purple:[128,0,128],
-	violet:[128,0,128],
-	red:[255,0,0],
-	silver:[192,192,192],
-	white:[255,255,255],
-	yellow:[255,255,0],
-	transparent: [255,255,255]
-};
-
-})();
-
-/******************************************************************************/
-/****************************** CLASS ANIMATIONS ******************************/
-/******************************************************************************/
-(function() {
-
-var classAnimationActions = [ "add", "remove", "toggle" ],
-	shorthandStyles = {
-		border: 1,
-		borderBottom: 1,
-		borderColor: 1,
-		borderLeft: 1,
-		borderRight: 1,
-		borderTop: 1,
-		borderWidth: 1,
-		margin: 1,
-		padding: 1
-	};
-
-$.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], function( _, prop ) {
-	$.fx.step[ prop ] = function( fx ) {
-		if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) {
-			jQuery.style( fx.elem, prop, fx.end );
-			fx.setAttr = true;
-		}
-	};
-});
-
-function getElementStyles() {
-	var style = this.ownerDocument.defaultView ?
-			this.ownerDocument.defaultView.getComputedStyle( this, null ) :
-			this.currentStyle,
-		newStyle = {},
-		key,
-		camelCase,
-		len;
-
-	// webkit enumerates style porperties
-	if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) {
-		len = style.length;
-		while ( len-- ) {
-			key = style[ len ];
-			if ( typeof style[ key ] === "string" ) {
-				newStyle[ $.camelCase( key ) ] = style[ key ];
-			}
-		}
-	} else {
-		for ( key in style ) {
-			if ( typeof style[ key ] === "string" ) {
-				newStyle[ key ] = style[ key ];
-			}
-		}
-	}
-
-	return newStyle;
-}
-
-
-function styleDifference( oldStyle, newStyle ) {
-	var diff = {},
-		name, value;
-
-	for ( name in newStyle ) {
-		value = newStyle[ name ];
-		if ( oldStyle[ name ] !== value ) {
-			if ( !shorthandStyles[ name ] ) {
-				if ( $.fx.step[ name ] || !isNaN( parseFloat( value ) ) ) {
-					diff[ name ] = value;
-				}
-			}
-		}
-	}
-
-	return diff;
-}
-
-$.effects.animateClass = function( value, duration, easing, callback ) {
-	var o = $.speed( duration, easing, callback );
-
-	return this.queue( function() {
-		var animated = $( this ),
-			baseClass = animated.attr( "class" ) || "",
-			applyClassChange,
-			allAnimations = o.children ? animated.find( "*" ).andSelf() : animated;
-
-		// map the animated objects to store the original styles.
-		allAnimations = allAnimations.map(function() {
-			var el = $( this );
-			return {
-				el: el,
-				start: getElementStyles.call( this )
-			};
-		});
-
-		// apply class change
-		applyClassChange = function() {
-			$.each( classAnimationActions, function(i, action) {
-				if ( value[ action ] ) {
-					animated[ action + "Class" ]( value[ action ] );
-				}
-			});
-		};
-		applyClassChange();
-
-		// map all animated objects again - calculate new styles and diff
-		allAnimations = allAnimations.map(function() {
-			this.end = getElementStyles.call( this.el[ 0 ] );
-			this.diff = styleDifference( this.start, this.end );
-			return this;
-		});
-
-		// apply original class
-		animated.attr( "class", baseClass );
-
-		// map all animated objects again - this time collecting a promise
-		allAnimations = allAnimations.map(function() {
-			var styleInfo = this,
-				dfd = $.Deferred(),
-				opts = jQuery.extend({}, o, {
-					queue: false,
-					complete: function() {
-						dfd.resolve( styleInfo );
-					}
-				});
-
-			this.el.animate( this.diff, opts );
-			return dfd.promise();
-		});
-
-		// once all animations have completed:
-		$.when.apply( $, allAnimations.get() ).done(function() {
-
-			// set the final class
-			applyClassChange();
-
-			// for each animated element,
-			// clear all css properties that were animated
-			$.each( arguments, function() {
-				var el = this.el;
-				$.each( this.diff, function(key) {
-					el.css( key, '' );
-				});
-			});
-
-			// this is guarnteed to be there if you use jQuery.speed()
-			// it also handles dequeuing the next anim...
-			o.complete.call( animated[ 0 ] );
-		});
-	});
-};
-
-$.fn.extend({
-	_addClass: $.fn.addClass,
-	addClass: function( classNames, speed, easing, callback ) {
-		return speed ?
-			$.effects.animateClass.apply( this, [{ add: classNames }, speed, easing, callback ]) :
-			this._addClass(classNames);
-	},
-
-	_removeClass: $.fn.removeClass,
-	removeClass: function( classNames, speed, easing, callback ) {
-		return speed ?
-			$.effects.animateClass.apply( this, [{ remove: classNames }, speed, easing, callback ]) :
-			this._removeClass(classNames);
-	},
-
-	_toggleClass: $.fn.toggleClass,
-	toggleClass: function( classNames, force, speed, easing, callback ) {
-		if ( typeof force === "boolean" || force === undefined ) {
-			if ( !speed ) {
-				// without speed parameter;
-				return this._toggleClass( classNames, force );
-			} else {
-				return $.effects.animateClass.apply( this, [( force ? { add:classNames } : { remove:classNames }), speed, easing, callback ]);
-			}
-		} else {
-			// without force parameter;
-			return $.effects.animateClass.apply( this, [{ toggle: classNames }, force, speed, easing ]);
-		}
-	},
-
-	switchClass: function( remove, add, speed, easing, callback) {
-		return $.effects.animateClass.apply( this, [{
-				add: add,
-				remove: remove
-			}, speed, easing, callback ]);
-	}
-});
-
-})();
-
-/******************************************************************************/
-/*********************************** EFFECTS **********************************/
-/******************************************************************************/
-
-(function() {
-
-$.extend( $.effects, {
-	version: "@VERSION",
-
-	// Saves a set of properties in a data storage
-	save: function( element, set ) {
-		for( var i=0; i < set.length; i++ ) {
-			if ( set[ i ] !== null ) {
-				element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
-			}
-		}
-	},
-
-	// Restores a set of previously saved properties from a data storage
-	restore: function( element, set ) {
-		for( var i=0; i < set.length; i++ ) {
-			if ( set[ i ] !== null ) {
-				element.css( set[ i ], element.data( dataSpace + set[ i ] ) );
-			}
-		}
-	},
-
-	setMode: function( el, mode ) {
-		if (mode === "toggle") {
-			mode = el.is( ":hidden" ) ? "show" : "hide";
-		}
-		return mode;
-	},
-
-	// Translates a [top,left] array into a baseline value
-	// this should be a little more flexible in the future to handle a string & hash
-	getBaseline: function( origin, original ) {
-		var y, x;
-		switch ( origin[ 0 ] ) {
-			case "top": y = 0; break;
-			case "middle": y = 0.5; break;
-			case "bottom": y = 1; break;
-			default: y = origin[ 0 ] / original.height;
-		}
-		switch ( origin[ 1 ] ) {
-			case "left": x = 0; break;
-			case "center": x = 0.5; break;
-			case "right": x = 1; break;
-			default: x = origin[ 1 ] / original.width;
-		}
-		return {
-			x: x,
-			y: y
-		};
-	},
-
-	// Wraps the element around a wrapper that copies position properties
-	createWrapper: function( element ) {
-
-		// if the element is already wrapped, return it
-		if ( element.parent().is( ".ui-effects-wrapper" )) {
-			return element.parent();
-		}
-
-		// wrap the element
-		var props = {
-				width: element.outerWidth(true),
-				height: element.outerHeight(true),
-				"float": element.css( "float" )
-			},
-			wrapper = $( "<div></div>" )
-				.addClass( "ui-effects-wrapper" )
-				.css({
-					fontSize: "100%",
-					background: "transparent",
-					border: "none",
-					margin: 0,
-					padding: 0
-				}),
-			// Store the size in case width/height are defined in % - Fixes #5245
-			size = {
-				width: element.width(),
-				height: element.height()
-			},
-			active = document.activeElement;
-
-		// support: Firefox
-		// Firefox incorrectly exposes anonymous content
-		// https://bugzilla.mozilla.org/show_bug.cgi?id=561664
-		try {
-			active.id;
-		} catch( e ) {
-			active = document.body;
-		}
-
-		element.wrap( wrapper );
-
-		// Fixes #7595 - Elements lose focus when wrapped.
-		if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-			$( active ).focus();
-		}
-
-		wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually lose the reference to the wrapped element
-
-		// transfer positioning properties to the wrapper
-		if ( element.css( "position" ) === "static" ) {
-			wrapper.css({ position: "relative" });
-			element.css({ position: "relative" });
-		} else {
-			$.extend( props, {
-				position: element.css( "position" ),
-				zIndex: element.css( "z-index" )
-			});
-			$.each([ "top", "left", "bottom", "right" ], function(i, pos) {
-				props[ pos ] = element.css( pos );
-				if ( isNaN( parseInt( props[ pos ], 10 ) ) ) {
-					props[ pos ] = "auto";
-				}
-			});
-			element.css({
-				position: "relative",
-				top: 0,
-				left: 0,
-				right: "auto",
-				bottom: "auto"
-			});
-		}
-		element.css(size);
-
-		return wrapper.css( props ).show();
-	},
-
-	removeWrapper: function( element ) {
-		var active = document.activeElement;
-
-		if ( element.parent().is( ".ui-effects-wrapper" ) ) {
-			element.parent().replaceWith( element );
-
-			// Fixes #7595 - Elements lose focus when wrapped.
-			if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-				$( active ).focus();
-			}
-		}
-
-
-		return element;
-	},
-
-	setTransition: function( element, list, factor, value ) {
-		value = value || {};
-		$.each( list, function( i, x ) {
-			var unit = element.cssUnit( x );
-			if ( unit[ 0 ] > 0 ) {
-				value[ x ] = unit[ 0 ] * factor + unit[ 1 ];
-			}
-		});
-		return value;
-	}
-});
-
-// return an effect options object for the given parameters:
-function _normalizeArguments( effect, options, speed, callback ) {
-
-	// allow passing all optinos as the first parameter
-	if ( $.isPlainObject( effect ) ) {
-		options = effect;
-		effect = effect.effect;
-	}
-
-	// convert to an object
-	effect = { effect: effect };
-
-	// catch (effect)
-	if ( options === undefined ) {
-		options = {};
-	}
-
-	// catch (effect, callback)
-	if ( $.isFunction( options ) ) {
-		callback = options;
-		speed = null;
-		options = {};
-	}
-
-	// catch (effect, speed, ?)
-	if ( typeof options === "number" || $.fx.speeds[ options ] ) {
-		callback = speed;
-		speed = options;
-		options = {};
-	}
-
-	// catch (effect, options, callback)
-	if ( $.isFunction( speed ) ) {
-		callback = speed;
-		speed = null;
-	}
-
-	// add options to effect
-	if ( options ) {
-		$.extend( effect, options );
-	}
-
-	speed = speed || options.duration;
-	effect.duration = $.fx.off ? 0 :
-		typeof speed === "number" ? speed :
-		speed in $.fx.speeds ? $.fx.speeds[ speed ] :
-		$.fx.speeds._default;
-
-	effect.complete = callback || options.complete;
-
-	return effect;
-}
-
-function standardSpeed( speed ) {
-	// valid standard speeds
-	if ( !speed || typeof speed === "number" || $.fx.speeds[ speed ] ) {
-		return true;
-	}
-
-	// invalid strings - treat as "normal" speed
-	if ( typeof speed === "string" && !$.effects.effect[ speed ] ) {
-		// TODO: remove in 2.0 (#7115)
-		if ( backCompat && $.effects[ speed ] ) {
-			return false;
-		}
-		return true;
-	}
-
-	return false;
-}
-
-$.fn.extend({
-	effect: function( effect, options, speed, callback ) {
-		var args = _normalizeArguments.apply( this, arguments ),
-			mode = args.mode,
-			queue = args.queue,
-			effectMethod = $.effects.effect[ args.effect ],
-
-			// DEPRECATED: remove in 2.0 (#7115)
-			oldEffectMethod = !effectMethod && backCompat && $.effects[ args.effect ];
-
-		if ( $.fx.off || !( effectMethod || oldEffectMethod ) ) {
-			// delegate to the original method (e.g., .show()) if possible
-			if ( mode ) {
-				return this[ mode ]( args.duration, args.complete );
-			} else {
-				return this.each( function() {
-					if ( args.complete ) {
-						args.complete.call( this );
-					}
-				});
-			}
-		}
-
-		function run( next ) {
-			var elem = $( this ),
-				complete = args.complete,
-				mode = args.mode;
-
-			function done() {
-				if ( $.isFunction( complete ) ) {
-					complete.call( elem[0] );
-				}
-				if ( $.isFunction( next ) ) {
-					next();
-				}
-			}
-
-			// if the element is hiddden and mode is hide,
-			// or element is visible and mode is show
-			if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
-				done();
-			} else {
-				effectMethod.call( elem[0], args, done );
-			}
-		}
-
-		// TODO: remove this check in 2.0, effectMethod will always be true
-		if ( effectMethod ) {
-			return queue === false ? this.each( run ) : this.queue( queue || "fx", run );
-		} else {
-			// DEPRECATED: remove in 2.0 (#7115)
-			return oldEffectMethod.call(this, {
-				options: args,
-				duration: args.duration,
-				callback: args.complete,
-				mode: args.mode
-			});
-		}
-	},
-
-	_show: $.fn.show,
-	show: function( speed ) {
-		if ( standardSpeed( speed ) ) {
-			return this._show.apply( this, arguments );
-		} else {
-			var args = _normalizeArguments.apply( this, arguments );
-			args.mode = "show";
-			return this.effect.call( this, args );
-		}
-	},
-
-	_hide: $.fn.hide,
-	hide: function( speed ) {
-		if ( standardSpeed( speed ) ) {
-			return this._hide.apply( this, arguments );
-		} else {
-			var args = _normalizeArguments.apply( this, arguments );
-			args.mode = "hide";
-			return this.effect.call( this, args );
-		}
-	},
-
-	// jQuery core overloads toggle and creates _toggle
-	__toggle: $.fn.toggle,
-	toggle: function( speed ) {
-		if ( standardSpeed( speed ) || typeof speed === "boolean" || $.isFunction( speed ) ) {
-			return this.__toggle.apply( this, arguments );
-		} else {
-			var args = _normalizeArguments.apply( this, arguments );
-			args.mode = "toggle";
-			return this.effect.call( this, args );
-		}
-	},
-
-	// helper functions
-	cssUnit: function(key) {
-		var style = this.css( key ),
-			val = [];
-
-		$.each( [ "em", "px", "%", "pt" ], function( i, unit ) {
-			if ( style.indexOf( unit ) > 0 ) {
-				val = [ parseFloat( style ), unit ];
-			}
-		});
-		return val;
-	}
-});
-
-})();
-
-/******************************************************************************/
-/*********************************** EASING ***********************************/
-/******************************************************************************/
-
-(function() {
-
-// based on easing equations from Robert Penner (http://www.robertpenner.com/easing)
-
-var baseEasings = {};
-
-$.each( [ "Quad", "Cubic", "Quart", "Quint", "Expo" ], function( i, name ) {
-	baseEasings[ name ] = function( p ) {
-		return Math.pow( p, i + 2 );
-	};
-});
-
-$.extend( baseEasings, {
-	Sine: function ( p ) {
-		return 1 - Math.cos( p * Math.PI / 2 );
-	},
-	Circ: function ( p ) {
-		return 1 - Math.sqrt( 1 - p * p );
-	},
-	Elastic: function( p ) {
-		return p === 0 || p === 1 ? p :
-			-Math.pow( 2, 8 * (p - 1) ) * Math.sin( ( (p - 1) * 80 - 7.5 ) * Math.PI / 15 );
-	},
-	Back: function( p ) {
-		return p * p * ( 3 * p - 2 );
-	},
-	Bounce: function ( p ) {
-		var pow2,
-			bounce = 4;
-
-		while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {}
-		return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 );
-	}
-});
-
-$.each( baseEasings, function( name, easeIn ) {
-	$.easing[ "easeIn" + name ] = easeIn;
-	$.easing[ "easeOut" + name ] = function( p ) {
-		return 1 - easeIn( 1 - p );
-	};
-	$.easing[ "easeInOut" + name ] = function( p ) {
-		return p < 0.5 ?
-			easeIn( p * 2 ) / 2 :
-			1 - easeIn( p * -2 + 2 ) / 2;
-	};
-});
-
-})();
-
-})(jQuery));
diff --git a/ui/jquery.effects.drop.js b/ui/jquery.effects.drop.js
deleted file mode 100644
index ea8d242d5..000000000
--- a/ui/jquery.effects.drop.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/*!
- * jQuery UI Effects Drop @VERSION
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Drop
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function( $, undefined ) {
-
-$.effects.effect.drop = function( o, done ) {
-
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "opacity", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-		direction = o.direction || "left",
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		motion = ( direction === "up" || direction === "left" ) ? "pos" : "neg",
-		animation = {
-			opacity: show ? 1 : 0
-		},
-		distance;
-
-	// Adjust
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el );
-
-	distance = o.distance || el[ ref === "top" ? "outerHeight": "outerWidth" ]({ margin: true }) / 2;
-
-	if ( show ) {
-		el
-			.css( "opacity", 0 )
-			.css( ref, motion === "pos" ? -distance : distance );
-	}
-
-	// Animation
-	animation[ ref ] = ( show ?
-		( motion === "pos" ? "+=" : "-=" ) :
-		( motion === "pos" ? "-=" : "+=" ) ) +
-		distance;
-
-	// Animate
-	el.animate( animation, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-};
-
-})(jQuery);
diff --git a/ui/jquery.effects.explode.js b/ui/jquery.effects.explode.js
deleted file mode 100644
index ae3efb21e..000000000
--- a/ui/jquery.effects.explode.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/*!
- * jQuery UI Effects Explode @VERSION
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Explode
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function( $, undefined ) {
-
-$.effects.effect.explode = function( o, done ) {
-
-	var rows = o.pieces ? Math.round( Math.sqrt( o.pieces ) ) : 3,
-		cells = rows,
-		el = $( this ),
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-
-		// show and then visibility:hidden the element before calculating offset
-		offset = el.show().css( "visibility", "hidden" ).offset(),
-
-		// width and height of a piece
-		width = Math.ceil( el.outerWidth() / cells ),
-		height = Math.ceil( el.outerHeight() / rows ),
-		pieces = [],
-
-		// loop
-		i, j, left, top, mx, my;
-
-	// children animate complete:
-	function childComplete() {
-		pieces.push( this );
-		if ( pieces.length === rows * cells ) {
-			animComplete();
-		}
-	}
-
-	// clone the element for each row and cell.
-	for( i = 0; i < rows ; i++ ) { // ===>
-		top = offset.top + i * height;
-		my = i - ( rows - 1 ) / 2 ;
-
-		for( j = 0; j < cells ; j++ ) { // |||
-			left = offset.left + j * width;
-			mx = j - ( cells - 1 ) / 2 ;
-
-			// Create a clone of the now hidden main element that will be absolute positioned
-			// within a wrapper div off the -left and -top equal to size of our pieces
-			el
-				.clone()
-				.appendTo( "body" )
-				.wrap( "<div></div>" )
-				.css({
-					position: "absolute",
-					visibility: "visible",
-					left: -j * width,
-					top: -i * height
-				})
-
-			// select the wrapper - make it overflow: hidden and absolute positioned based on
-			// where the original was located +left and +top equal to the size of pieces
-				.parent()
-				.addClass( "ui-effects-explode" )
-				.css({
-					position: "absolute",
-					overflow: "hidden",
-					width: width,
-					height: height,
-					left: left + ( show ? mx * width : 0 ),
-					top: top + ( show ? my * height : 0 ),
-					opacity: show ? 0 : 1
-				}).animate({
-					left: left + ( show ? 0 : mx * width ),
-					top: top + ( show ? 0 : my * height ),
-					opacity: show ? 1 : 0
-				}, o.duration || 500, o.easing, childComplete );
-		}
-	}
-
-	function animComplete() {
-		el.css({
-			visibility: "visible"
-		});
-		$( pieces ).remove();
-		if ( !show ) {
-			el.hide();
-		}
-		done();
-	}
-};
-
-})(jQuery);
diff --git a/ui/jquery.effects.fade.js b/ui/jquery.effects.fade.js
deleted file mode 100644
index 3989ee908..000000000
--- a/ui/jquery.effects.fade.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*!
- * jQuery UI Effects Fade @VERSION
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Fade
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function( $, undefined ) {
-
-$.effects.effect.fade = function( o, done ) {
-	var el = $( this ),
-		mode = $.effects.setMode( el, o.mode || "toggle" );
-
-	el.animate({
-		opacity: mode
-	}, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: done
-	});
-};
-
-})( jQuery );
diff --git a/ui/jquery.effects.fold.js b/ui/jquery.effects.fold.js
deleted file mode 100644
index 17aa9a36b..000000000
--- a/ui/jquery.effects.fold.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/*!
- * jQuery UI Effects Fold @VERSION
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Fold
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function( $, undefined ) {
-
-$.effects.effect.fold = function( o, done ) {
-
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-		hide = mode === "hide",
-		size = o.size || 15,
-		percent = /([0-9]+)%/.exec( size ),
-		horizFirst = !!o.horizFirst,
-		widthFirst = show !== horizFirst,
-		ref = widthFirst ? [ "width", "height" ] : [ "height", "width" ],
-		duration = o.duration / 2,
-		wrapper, distance,
-		animation1 = {},
-		animation2 = {};
-
-	$.effects.save( el, props );
-	el.show();
-
-	// Create Wrapper
-	wrapper = $.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-	distance = widthFirst ?
-		[ wrapper.width(), wrapper.height() ] :
-		[ wrapper.height(), wrapper.width() ];
-
-	if ( percent ) {
-		size = parseInt( percent[ 1 ], 10 ) / 100 * distance[ hide ? 0 : 1 ];
-	}
-	if ( show ) {
-		wrapper.css( horizFirst ? {
-			height: 0,
-			width: size
-		} : {
-			height: size,
-			width: 0
-		});
-	}
-
-	// Animation
-	animation1[ ref[ 0 ] ] = show ? distance[ 0 ] : size;
-	animation2[ ref[ 1 ] ] = show ? distance[ 1 ] : 0;
-
-	// Animate
-	wrapper
-		.animate( animation1, duration, o.easing )
-		.animate( animation2, duration, o.easing, function() {
-			if ( hide ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		});
-
-};
-
-})(jQuery);
diff --git a/ui/jquery.effects.highlight.js b/ui/jquery.effects.highlight.js
deleted file mode 100644
index ac6c269e5..000000000
--- a/ui/jquery.effects.highlight.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*!
- * jQuery UI Effects Highlight @VERSION
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Highlight
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function( $, undefined ) {
-
-$.effects.effect.highlight = function( o, done ) {
-	var elem = $( this ),
-		props = [ "backgroundImage", "backgroundColor", "opacity" ],
-		mode = $.effects.setMode( elem, o.mode || "show" ),
-		animation = {
-			backgroundColor: elem.css( "backgroundColor" )
-		};
-
-	if (mode === "hide") {
-		animation.opacity = 0;
-	}
-
-	$.effects.save( elem, props );
-	
-	elem
-		.show()
-		.css({
-			backgroundImage: "none",
-			backgroundColor: o.color || "#ffff99"
-		})
-		.animate( animation, {
-			queue: false,
-			duration: o.duration,
-			easing: o.easing,
-			complete: function() {
-				if ( mode === "hide" ) {
-					elem.hide();
-				}
-				$.effects.restore( elem, props );
-				done();
-			}
-		});
-};
-
-})(jQuery);
diff --git a/ui/jquery.effects.pulsate.js b/ui/jquery.effects.pulsate.js
deleted file mode 100644
index 5b27bb324..000000000
--- a/ui/jquery.effects.pulsate.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*!
- * jQuery UI Effects Pulsate @VERSION
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Pulsate
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function( $, undefined ) {
-
-$.effects.effect.pulsate = function( o, done ) {
-	var elem = $( this ),
-		mode = $.effects.setMode( elem, o.mode || "show" ),
-		show = mode === "show",
-		hide = mode === "hide",
-		showhide = ( show || mode === "hide" ),
-
-		// showing or hiding leaves of the "last" animation
-		anims = ( ( o.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
-		duration = o.duration / anims,
-		animateTo = 0,
-		queue = elem.queue(),
-		queuelen = queue.length,
-		i;
-
-	if ( show || !elem.is(":visible")) {
-		elem.css( "opacity", 0 ).show();
-		animateTo = 1;
-	}
-
-	// anims - 1 opacity "toggles"
-	for ( i = 1; i < anims; i++ ) {
-		elem.animate({
-			opacity: animateTo
-		}, duration, o.easing );
-		animateTo = 1 - animateTo;
-	}
-
-	elem.animate({
-		opacity: animateTo
-	}, duration, o.easing);
-
-	elem.queue(function() {
-		if ( hide ) {
-			elem.hide();
-		}
-		done();
-	});
-
-	// We just queued up "anims" animations, we need to put them next in the queue
-	if ( queuelen > 1 ) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	elem.dequeue();
-};
-
-})(jQuery);
diff --git a/ui/jquery.effects.scale.js b/ui/jquery.effects.scale.js
deleted file mode 100644
index 5352bde77..000000000
--- a/ui/jquery.effects.scale.js
+++ /dev/null
@@ -1,290 +0,0 @@
-/*!
- * jQuery UI Effects Scale @VERSION
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Scale
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function( $, undefined ) {
-
-$.effects.effect.puff = function( o, done ) {
-	var elem = $( this ),
-		mode = $.effects.setMode( elem, o.mode || "hide" ),
-		hide = mode === "hide",
-		percent = parseInt( o.percent, 10 ) || 150,
-		factor = percent / 100,
-		original = {
-			height: elem.height(),
-			width: elem.width()
-		};
-
-	$.extend( o, {
-		effect: "scale",
-		queue: false,
-		fade: true,
-		mode: mode,
-		complete: done,
-		percent: hide ? percent : 100,
-		from: hide ?
-			original :
-			{
-				height: original.height * factor,
-				width: original.width * factor
-			}
-	});
-
-	elem.effect( o );
-};
-
-$.effects.effect.scale = function( o, done ) {
-
-	// Create element
-	var el = $( this ),
-		options = $.extend( true, {}, o ),
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		percent = parseInt( o.percent, 10 ) ||
-			( parseInt( o.percent, 10 ) === 0 ? 0 : ( mode === "hide" ? 0 : 100 ) ),
-		direction = o.direction || "both",
-		origin = o.origin,
-		original = {
-			height: el.height(),
-			width: el.width(),
-			outerHeight: el.outerHeight(),
-			outerWidth: el.outerWidth()
-		},
-		factor = {
-			y: direction !== "horizontal" ? (percent / 100) : 1,
-			x: direction !== "vertical" ? (percent / 100) : 1
-		};
-
-	// We are going to pass this effect to the size effect:
-	options.effect = "size";
-	options.queue = false;
-	options.complete = done;
-
-	// Set default origin and restore for show/hide
-	if ( mode !== "effect" ) {
-		options.origin = origin || ["middle","center"];
-		options.restore = true;
-	}
-
-	options.from = o.from || ( mode === "show" ? { height: 0, width: 0 } : original );
-	options.to = {
-		height: original.height * factor.y,
-		width: original.width * factor.x,
-		outerHeight: original.outerHeight * factor.y,
-		outerWidth: original.outerWidth * factor.x
-	};
-
-	// Fade option to support puff
-	if ( options.fade ) {
-		if ( mode === "show" ) {
-			options.from.opacity = 0;
-			options.to.opacity = 1;
-		}
-		if ( mode === "hide" ) {
-			options.from.opacity = 1;
-			options.to.opacity = 0;
-		}
-	}
-
-	// Animate
-	el.effect( options );
-
-};
-
-$.effects.effect.size = function( o, done ) {
-
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "width", "height", "overflow", "opacity" ],
-
-		// Always restore
-		props1 = [ "position", "top", "bottom", "left", "right", "overflow", "opacity" ],
-
-		// Copy for children
-		props2 = [ "width", "height", "overflow" ],
-		cProps = [ "fontSize" ],
-		vProps = [ "borderTopWidth", "borderBottomWidth", "paddingTop", "paddingBottom" ],
-		hProps = [ "borderLeftWidth", "borderRightWidth", "paddingLeft", "paddingRight" ],
-
-		// Set options
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		restore = o.restore || mode !== "effect",
-		scale = o.scale || "both",
-		origin = o.origin || [ "middle", "center" ],
-		original, baseline, factor,
-		position = el.css( "position" );
-
-	if ( mode === "show" ) {
-		el.show();
-	}
-	original = {
-		height: el.height(),
-		width: el.width(),
-		outerHeight: el.outerHeight(),
-		outerWidth: el.outerWidth()
-	};
-
-	el.from = o.from || original;
-	el.to = o.to || original;
-
-	// Set scaling factor
-	factor = {
-		from: {
-			y: el.from.height / original.height,
-			x: el.from.width / original.width
-		},
-		to: {
-			y: el.to.height / original.height,
-			x: el.to.width / original.width
-		}
-	};
-
-	// Scale the css box
-	if ( scale === "box" || scale === "both" ) {
-
-		// Vertical props scaling
-		if ( factor.from.y !== factor.to.y ) {
-			props = props.concat( vProps );
-			el.from = $.effects.setTransition( el, vProps, factor.from.y, el.from );
-			el.to = $.effects.setTransition( el, vProps, factor.to.y, el.to );
-		}
-
-		// Horizontal props scaling
-		if ( factor.from.x !== factor.to.x ) {
-			props = props.concat( hProps );
-			el.from = $.effects.setTransition( el, hProps, factor.from.x, el.from );
-			el.to = $.effects.setTransition( el, hProps, factor.to.x, el.to );
-		}
-	}
-
-	// Scale the content
-	if ( scale === "content" || scale === "both" ) {
-
-		// Vertical props scaling
-		if ( factor.from.y !== factor.to.y ) {
-			props = props.concat( cProps );
-			el.from = $.effects.setTransition( el, cProps, factor.from.y, el.from );
-			el.to = $.effects.setTransition( el, cProps, factor.to.y, el.to );
-		}
-	}
-
-	$.effects.save( el, restore ? props : props1 );
-	el.show();
-	$.effects.createWrapper( el );
-	el.css( "overflow", "hidden" ).css( el.from );
-
-	// Adjust
-	if (origin) { // Calculate baseline shifts
-		baseline = $.effects.getBaseline( origin, original );
-		el.from.top = ( original.outerHeight - el.outerHeight() ) * baseline.y;
-		el.from.left = ( original.outerWidth - el.outerWidth() ) * baseline.x;
-		el.to.top = ( original.outerHeight - el.to.outerHeight ) * baseline.y;
-		el.to.left = ( original.outerWidth - el.to.outerWidth ) * baseline.x;
-	}
-	el.css( el.from ); // set top & left
-
-	// Animate
-	if ( scale === "content" || scale === "both" ) { // Scale the children
-
-		// Add margins/font-size
-		vProps = vProps.concat([ "marginTop", "marginBottom" ]).concat(cProps);
-		hProps = hProps.concat([ "marginLeft", "marginRight" ]);
-		props2 = props.concat(vProps).concat(hProps);
-
-		el.find( "*[width]" ).each( function(){
-			var child = $( this ),
-				c_original = {
-					height: child.height(),
-					width: child.width()
-				};
-			if (restore) {
-				$.effects.save(child, props2);
-			}
-
-			child.from = {
-				height: c_original.height * factor.from.y,
-				width: c_original.width * factor.from.x
-			};
-			child.to = {
-				height: c_original.height * factor.to.y,
-				width: c_original.width * factor.to.x
-			};
-
-			// Vertical props scaling
-			if ( factor.from.y !== factor.to.y ) {
-				child.from = $.effects.setTransition( child, vProps, factor.from.y, child.from );
-				child.to = $.effects.setTransition( child, vProps, factor.to.y, child.to );
-			}
-
-			// Horizontal props scaling
-			if ( factor.from.x !== factor.to.x ) {
-				child.from = $.effects.setTransition( child, hProps, factor.from.x, child.from );
-				child.to = $.effects.setTransition( child, hProps, factor.to.x, child.to );
-			}
-
-			// Animate children
-			child.css( child.from );
-			child.animate( child.to, o.duration, o.easing, function() {
-
-				// Restore children
-				if ( restore ) {
-					$.effects.restore( child, props2 );
-				}
-			});
-		});
-	}
-
-	// Animate
-	el.animate( el.to, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( el.to.opacity === 0 ) {
-				el.css( "opacity", el.from.opacity );
-			}
-			if( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, restore ? props : props1 );
-			if ( !restore ) {
-
-				// we need to calculate our new positioning based on the scaling
-				if ( position === "static" ) {
-					el.css({
-						position: "relative",
-						top: el.to.top,
-						left: el.to.left
-					});
-				} else {
-					$.each([ "top", "left" ], function( idx, pos ) {
-						el.css( pos, function( _, str ) {
-							var val = parseInt( str, 10 ),
-								toRef = idx ? el.to.left : el.to.top;
-
-							// if original was "auto", recalculate the new value from wrapper
-							if ( str === "auto" ) {
-								return toRef + "px";
-							}
-
-							return val + toRef + "px";
-						});
-					});
-				}
-			}
-
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-
-};
-
-})(jQuery);
diff --git a/ui/jquery.effects.shake.js b/ui/jquery.effects.shake.js
deleted file mode 100644
index 700c6df3d..000000000
--- a/ui/jquery.effects.shake.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/*!
- * jQuery UI Effects Shake @VERSION
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Shake
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function( $, undefined ) {
-
-$.effects.effect.shake = function( o, done ) {
-
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		direction = o.direction || "left",
-		distance = o.distance || 20,
-		times = o.times || 3,
-		anims = times * 2 + 1,
-		speed = o.duration,
-		ref = (direction === "up" || direction === "down") ? "top" : "left",
-		positiveMotion = (direction === "up" || direction === "left"),
-		animation = {},
-		animation1 = {},
-		animation2 = {},
-		i,
-
-		// we will need to re-assemble the queue to stack our animations in place
-		queue = el.queue(),
-		queuelen = queue.length;
-
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el );
-
-	// Animation
-	animation[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance;
-	animation1[ ref ] = ( positiveMotion ? "+=" : "-=" ) + distance * 2;
-	animation2[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance * 2;
-
-	// Animate
-	el.animate( animation, speed, o.easing );
-
-	// Shakes
-	for ( i = 1; i < times; i++ ) {
-		el.animate( animation1, speed, o.easing ).animate( animation2, speed, o.easing );
-	}
-	el
-		.animate( animation1, speed, o.easing )
-		.animate( animation, speed / 2, o.easing )
-		.queue(function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		});
-
-	// inject all the animations we just queued to be first in line (after "inprogress")
-	if ( queuelen > 1) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	el.dequeue();
-
-};
-
-})(jQuery);
diff --git a/ui/jquery.effects.slide.js b/ui/jquery.effects.slide.js
deleted file mode 100644
index ae25a187e..000000000
--- a/ui/jquery.effects.slide.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/*!
- * jQuery UI Effects Slide @VERSION
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Slide
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function( $, undefined ) {
-
-$.effects.effect.slide = function( o, done ) {
-
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "width", "height" ],
-		mode = $.effects.setMode( el, o.mode || "show" ),
-		show = mode === "show",
-		direction = o.direction || "left",
-		ref = (direction === "up" || direction === "down") ? "top" : "left",
-		positiveMotion = (direction === "up" || direction === "left"),
-		distance,
-		animation = {};
-
-	// Adjust
-	$.effects.save( el, props );
-	el.show();
-	distance = o.distance || el[ ref === "top" ? "outerHeight" : "outerWidth" ]({
-		margin: true
-	});
-
-	$.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-
-	if ( show ) {
-		el.css( ref, positiveMotion ? (isNaN(distance) ? "-" + distance : -distance) : distance );
-	}
-
-	// Animation
-	animation[ ref ] = ( show ?
-		( positiveMotion ? "+=" : "-=") :
-		( positiveMotion ? "-=" : "+=")) +
-		distance;
-
-	// Animate
-	el.animate( animation, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-};
-
-})(jQuery);
diff --git a/ui/jquery.effects.transfer.js b/ui/jquery.effects.transfer.js
deleted file mode 100644
index 3368fb18e..000000000
--- a/ui/jquery.effects.transfer.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/*!
- * jQuery UI Effects Transfer @VERSION
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Transfer
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function( $, undefined ) {
-
-$.effects.effect.transfer = function( o, done ) {
-	var elem = $( this ),
-		target = $( o.to ),
-		targetFixed = target.css( "position" ) === "fixed",
-		body = $("body"),
-		fixTop = targetFixed ? body.scrollTop() : 0,
-		fixLeft = targetFixed ? body.scrollLeft() : 0,
-		endPosition = target.offset(),
-		animation = {
-			top: endPosition.top - fixTop ,
-			left: endPosition.left - fixLeft ,
-			height: target.innerHeight(),
-			width: target.innerWidth()
-		},
-		startPosition = elem.offset(),
-		transfer = $( '<div class="ui-effects-transfer"></div>' )
-			.appendTo( document.body )
-			.addClass( o.className )
-			.css({
-				top: startPosition.top - fixTop ,
-				left: startPosition.left - fixLeft ,
-				height: elem.innerHeight(),
-				width: elem.innerWidth(),
-				position: targetFixed ? "fixed" : "absolute"
-			})
-			.animate( animation, o.duration, o.easing, function() {
-				transfer.remove();
-				done();
-			});
-};
-
-})(jQuery);
diff --git a/ui/jquery.ui.effect-blind.js b/ui/jquery.ui.effect-blind.js
new file mode 100644
index 000000000..4f25f8cd2
--- /dev/null
+++ b/ui/jquery.ui.effect-blind.js
@@ -0,0 +1,81 @@
+/*!
+ * jQuery UI Effects Blind @VERSION
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Blind
+ *
+ * Depends:
+ *	jquery.ui.effect.js
+ */
+(function( $, undefined ) {
+
+var rvertical = /up|down|vertical/,
+	rpositivemotion = /up|left|vertical|horizontal/;
+
+$.effects.effect.blind = function( o, done ) {
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		direction = o.direction || "up",
+		vertical = rvertical.test( direction ),
+		ref = vertical ? "height" : "width",
+		ref2 = vertical ? "top" : "left",
+		motion = rpositivemotion.test( direction ),
+		animation = {},
+		show = mode === "show",
+		wrapper, distance, margin;
+
+	// if already wrapped, the wrapper's properties are my property. #6245
+	if ( el.parent().is( ".ui-effects-wrapper" ) ) {
+		$.effects.save( el.parent(), props );
+	} else {
+		$.effects.save( el, props );
+	}
+	el.show();
+	wrapper = $.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+
+	distance = wrapper[ ref ]();
+	margin = parseFloat( wrapper.css( ref2 ) );
+
+	animation[ ref ] = show ? distance : 0;
+	if ( !motion ) {
+		el
+			.css( vertical ? "bottom" : "right", 0 )
+			.css( vertical ? "top" : "left", "auto" )
+			.css({ position: "absolute" });
+
+	animation[ ref2 ] = show ? margin : distance + margin;
+	}
+
+	// start at 0 if we are showing
+	if ( show ) {
+		wrapper.css( ref, 0 );
+		if ( ! motion ) {
+			wrapper.css( ref2, margin + distance );
+		}
+	}
+
+	// Animate
+	wrapper.animate( animation, {
+		duration: o.duration,
+		easing: o.easing,
+		queue: false,
+		complete: function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+
+};
+
+})(jQuery);
diff --git a/ui/jquery.ui.effect-bounce.js b/ui/jquery.ui.effect-bounce.js
new file mode 100644
index 000000000..1e7801331
--- /dev/null
+++ b/ui/jquery.ui.effect-bounce.js
@@ -0,0 +1,112 @@
+/*!
+ * jQuery UI Effects Bounce @VERSION
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Bounce
+ *
+ * Depends:
+ *	jquery.ui.effect.js
+ */
+(function( $, undefined ) {
+
+$.effects.effect.bounce = function( o, done ) {
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+
+		// defaults:
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		hide = mode === "hide",
+		show = mode === "show",
+		direction = o.direction || "up",
+		distance = o.distance,
+		times = o.times || 5,
+
+		// number of internal animations
+		anims = times * 2 + ( show || hide ? 1 : 0 ),
+		speed = o.duration / anims,
+		easing = o.easing,
+
+		// utility:
+		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
+		motion = ( direction === "up" || direction === "left" ),
+		i,
+		upAnim,
+		downAnim,
+
+		// we will need to re-assemble the queue to stack our animations in place
+		queue = el.queue(),
+		queuelen = queue.length;
+
+	// Avoid touching opacity to prevent clearType and PNG issues in IE
+	if ( show || hide ) {
+		props.push( "opacity" );
+	}
+
+	$.effects.save( el, props );
+	el.show();
+	$.effects.createWrapper( el ); // Create Wrapper
+
+	// default distance for the BIGGEST bounce is the outer Distance / 3
+	if ( !distance ) {
+		distance = el[ ref === "top" ? "outerHeight" : "outerWidth" ]() / 3;
+	}
+
+	if ( show ) {
+		downAnim = { opacity: 1 };
+		downAnim[ ref ] = 0;
+
+		// if we are showing, force opacity 0 and set the initial position
+		// then do the "first" animation
+		el.css( "opacity", 0 )
+			.css( ref, motion ? -distance * 2 : distance * 2 )
+			.animate( downAnim, speed, easing );
+	}
+
+	// start at the smallest distance if we are hiding
+	if ( hide ) {
+		distance = distance / Math.pow( 2, times - 1 );
+	}
+
+	downAnim = {};
+	downAnim[ ref ] = 0;
+	// Bounces up/down/left/right then back to 0 -- times * 2 animations happen here
+	for ( i = 0; i < times; i++ ) {
+		upAnim = {};
+		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
+
+		el.animate( upAnim, speed, easing )
+			.animate( downAnim, speed, easing );
+
+		distance = hide ? distance * 2 : distance / 2;
+	}
+
+	// Last Bounce when Hiding
+	if ( hide ) {
+		upAnim = { opacity: 0 };
+		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
+
+		el.animate( upAnim, speed, easing );
+	}
+
+	el.queue(function() {
+		if ( hide ) {
+			el.hide();
+		}
+		$.effects.restore( el, props );
+		$.effects.removeWrapper( el );
+		done();
+	});
+
+	// inject all the animations we just queued to be first in line (after "inprogress")
+	if ( queuelen > 1) {
+		queue.splice.apply( queue,
+			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
+	}
+	el.dequeue();
+
+};
+
+})(jQuery);
diff --git a/ui/jquery.ui.effect-clip.js b/ui/jquery.ui.effect-clip.js
new file mode 100644
index 000000000..0b2d7e24a
--- /dev/null
+++ b/ui/jquery.ui.effect-clip.js
@@ -0,0 +1,66 @@
+/*!
+ * jQuery UI Effects Clip @VERSION
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Clip
+ *
+ * Depends:
+ *	jquery.ui.effect.js
+ */
+(function( $, undefined ) {
+
+$.effects.effect.clip = function( o, done ) {
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+		direction = o.direction || "vertical",
+		vert = direction === "vertical",
+		size = vert ? "height" : "width",
+		position = vert ? "top" : "left",
+		animation = {},
+		wrapper, animate, distance;
+
+	// Save & Show
+	$.effects.save( el, props );
+	el.show();
+
+	// Create Wrapper
+	wrapper = $.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+	animate = ( el[0].tagName === "IMG" ) ? wrapper : el;
+	distance = animate[ size ]();
+
+	// Shift
+	if ( show ) {
+		animate.css( size, 0 );
+		animate.css( position, distance / 2 );
+	}
+
+	// Create Animation Object:
+	animation[ size ] = show ? distance : 0;
+	animation[ position ] = show ? 0 : distance / 2;
+
+	// Animate
+	animate.animate( animation, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( !show ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+
+};
+
+})(jQuery);
diff --git a/ui/jquery.ui.effect-drop.js b/ui/jquery.ui.effect-drop.js
new file mode 100644
index 000000000..8eda32d8e
--- /dev/null
+++ b/ui/jquery.ui.effect-drop.js
@@ -0,0 +1,64 @@
+/*!
+ * jQuery UI Effects Drop @VERSION
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Drop
+ *
+ * Depends:
+ *	jquery.ui.effect.js
+ */
+(function( $, undefined ) {
+
+$.effects.effect.drop = function( o, done ) {
+
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "opacity", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+		direction = o.direction || "left",
+		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
+		motion = ( direction === "up" || direction === "left" ) ? "pos" : "neg",
+		animation = {
+			opacity: show ? 1 : 0
+		},
+		distance;
+
+	// Adjust
+	$.effects.save( el, props );
+	el.show();
+	$.effects.createWrapper( el );
+
+	distance = o.distance || el[ ref === "top" ? "outerHeight": "outerWidth" ]({ margin: true }) / 2;
+
+	if ( show ) {
+		el
+			.css( "opacity", 0 )
+			.css( ref, motion === "pos" ? -distance : distance );
+	}
+
+	// Animation
+	animation[ ref ] = ( show ?
+		( motion === "pos" ? "+=" : "-=" ) :
+		( motion === "pos" ? "-=" : "+=" ) ) +
+		distance;
+
+	// Animate
+	el.animate( animation, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+};
+
+})(jQuery);
diff --git a/ui/jquery.ui.effect-explode.js b/ui/jquery.ui.effect-explode.js
new file mode 100644
index 000000000..a7447da73
--- /dev/null
+++ b/ui/jquery.ui.effect-explode.js
@@ -0,0 +1,96 @@
+/*!
+ * jQuery UI Effects Explode @VERSION
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Explode
+ *
+ * Depends:
+ *	jquery.ui.effect.js
+ */
+(function( $, undefined ) {
+
+$.effects.effect.explode = function( o, done ) {
+
+	var rows = o.pieces ? Math.round( Math.sqrt( o.pieces ) ) : 3,
+		cells = rows,
+		el = $( this ),
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+
+		// show and then visibility:hidden the element before calculating offset
+		offset = el.show().css( "visibility", "hidden" ).offset(),
+
+		// width and height of a piece
+		width = Math.ceil( el.outerWidth() / cells ),
+		height = Math.ceil( el.outerHeight() / rows ),
+		pieces = [],
+
+		// loop
+		i, j, left, top, mx, my;
+
+	// children animate complete:
+	function childComplete() {
+		pieces.push( this );
+		if ( pieces.length === rows * cells ) {
+			animComplete();
+		}
+	}
+
+	// clone the element for each row and cell.
+	for( i = 0; i < rows ; i++ ) { // ===>
+		top = offset.top + i * height;
+		my = i - ( rows - 1 ) / 2 ;
+
+		for( j = 0; j < cells ; j++ ) { // |||
+			left = offset.left + j * width;
+			mx = j - ( cells - 1 ) / 2 ;
+
+			// Create a clone of the now hidden main element that will be absolute positioned
+			// within a wrapper div off the -left and -top equal to size of our pieces
+			el
+				.clone()
+				.appendTo( "body" )
+				.wrap( "<div></div>" )
+				.css({
+					position: "absolute",
+					visibility: "visible",
+					left: -j * width,
+					top: -i * height
+				})
+
+			// select the wrapper - make it overflow: hidden and absolute positioned based on
+			// where the original was located +left and +top equal to the size of pieces
+				.parent()
+				.addClass( "ui-effects-explode" )
+				.css({
+					position: "absolute",
+					overflow: "hidden",
+					width: width,
+					height: height,
+					left: left + ( show ? mx * width : 0 ),
+					top: top + ( show ? my * height : 0 ),
+					opacity: show ? 0 : 1
+				}).animate({
+					left: left + ( show ? 0 : mx * width ),
+					top: top + ( show ? 0 : my * height ),
+					opacity: show ? 1 : 0
+				}, o.duration || 500, o.easing, childComplete );
+		}
+	}
+
+	function animComplete() {
+		el.css({
+			visibility: "visible"
+		});
+		$( pieces ).remove();
+		if ( !show ) {
+			el.hide();
+		}
+		done();
+	}
+};
+
+})(jQuery);
diff --git a/ui/jquery.ui.effect-fade.js b/ui/jquery.ui.effect-fade.js
new file mode 100644
index 000000000..92d9ca0a4
--- /dev/null
+++ b/ui/jquery.ui.effect-fade.js
@@ -0,0 +1,29 @@
+/*!
+ * jQuery UI Effects Fade @VERSION
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fade
+ *
+ * Depends:
+ *	jquery.ui.effect.js
+ */
+(function( $, undefined ) {
+
+$.effects.effect.fade = function( o, done ) {
+	var el = $( this ),
+		mode = $.effects.setMode( el, o.mode || "toggle" );
+
+	el.animate({
+		opacity: mode
+	}, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: done
+	});
+};
+
+})( jQuery );
diff --git a/ui/jquery.ui.effect-fold.js b/ui/jquery.ui.effect-fold.js
new file mode 100644
index 000000000..47b7a8395
--- /dev/null
+++ b/ui/jquery.ui.effect-fold.js
@@ -0,0 +1,75 @@
+/*!
+ * jQuery UI Effects Fold @VERSION
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fold
+ *
+ * Depends:
+ *	jquery.ui.effect.js
+ */
+(function( $, undefined ) {
+
+$.effects.effect.fold = function( o, done ) {
+
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+		hide = mode === "hide",
+		size = o.size || 15,
+		percent = /([0-9]+)%/.exec( size ),
+		horizFirst = !!o.horizFirst,
+		widthFirst = show !== horizFirst,
+		ref = widthFirst ? [ "width", "height" ] : [ "height", "width" ],
+		duration = o.duration / 2,
+		wrapper, distance,
+		animation1 = {},
+		animation2 = {};
+
+	$.effects.save( el, props );
+	el.show();
+
+	// Create Wrapper
+	wrapper = $.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+	distance = widthFirst ?
+		[ wrapper.width(), wrapper.height() ] :
+		[ wrapper.height(), wrapper.width() ];
+
+	if ( percent ) {
+		size = parseInt( percent[ 1 ], 10 ) / 100 * distance[ hide ? 0 : 1 ];
+	}
+	if ( show ) {
+		wrapper.css( horizFirst ? {
+			height: 0,
+			width: size
+		} : {
+			height: size,
+			width: 0
+		});
+	}
+
+	// Animation
+	animation1[ ref[ 0 ] ] = show ? distance[ 0 ] : size;
+	animation2[ ref[ 1 ] ] = show ? distance[ 1 ] : 0;
+
+	// Animate
+	wrapper
+		.animate( animation1, duration, o.easing )
+		.animate( animation2, duration, o.easing, function() {
+			if ( hide ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		});
+
+};
+
+})(jQuery);
diff --git a/ui/jquery.ui.effect-highlight.js b/ui/jquery.ui.effect-highlight.js
new file mode 100644
index 000000000..333e37d72
--- /dev/null
+++ b/ui/jquery.ui.effect-highlight.js
@@ -0,0 +1,49 @@
+/*!
+ * jQuery UI Effects Highlight @VERSION
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Highlight
+ *
+ * Depends:
+ *	jquery.ui.effect.js
+ */
+(function( $, undefined ) {
+
+$.effects.effect.highlight = function( o, done ) {
+	var elem = $( this ),
+		props = [ "backgroundImage", "backgroundColor", "opacity" ],
+		mode = $.effects.setMode( elem, o.mode || "show" ),
+		animation = {
+			backgroundColor: elem.css( "backgroundColor" )
+		};
+
+	if (mode === "hide") {
+		animation.opacity = 0;
+	}
+
+	$.effects.save( elem, props );
+	
+	elem
+		.show()
+		.css({
+			backgroundImage: "none",
+			backgroundColor: o.color || "#ffff99"
+		})
+		.animate( animation, {
+			queue: false,
+			duration: o.duration,
+			easing: o.easing,
+			complete: function() {
+				if ( mode === "hide" ) {
+					elem.hide();
+				}
+				$.effects.restore( elem, props );
+				done();
+			}
+		});
+};
+
+})(jQuery);
diff --git a/ui/jquery.ui.effect-pulsate.js b/ui/jquery.ui.effect-pulsate.js
new file mode 100644
index 000000000..ce9faf64f
--- /dev/null
+++ b/ui/jquery.ui.effect-pulsate.js
@@ -0,0 +1,62 @@
+/*!
+ * jQuery UI Effects Pulsate @VERSION
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Pulsate
+ *
+ * Depends:
+ *	jquery.ui.effect.js
+ */
+(function( $, undefined ) {
+
+$.effects.effect.pulsate = function( o, done ) {
+	var elem = $( this ),
+		mode = $.effects.setMode( elem, o.mode || "show" ),
+		show = mode === "show",
+		hide = mode === "hide",
+		showhide = ( show || mode === "hide" ),
+
+		// showing or hiding leaves of the "last" animation
+		anims = ( ( o.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
+		duration = o.duration / anims,
+		animateTo = 0,
+		queue = elem.queue(),
+		queuelen = queue.length,
+		i;
+
+	if ( show || !elem.is(":visible")) {
+		elem.css( "opacity", 0 ).show();
+		animateTo = 1;
+	}
+
+	// anims - 1 opacity "toggles"
+	for ( i = 1; i < anims; i++ ) {
+		elem.animate({
+			opacity: animateTo
+		}, duration, o.easing );
+		animateTo = 1 - animateTo;
+	}
+
+	elem.animate({
+		opacity: animateTo
+	}, duration, o.easing);
+
+	elem.queue(function() {
+		if ( hide ) {
+			elem.hide();
+		}
+		done();
+	});
+
+	// We just queued up "anims" animations, we need to put them next in the queue
+	if ( queuelen > 1 ) {
+		queue.splice.apply( queue,
+			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
+	}
+	elem.dequeue();
+};
+
+})(jQuery);
diff --git a/ui/jquery.ui.effect-scale.js b/ui/jquery.ui.effect-scale.js
new file mode 100644
index 000000000..9352ac027
--- /dev/null
+++ b/ui/jquery.ui.effect-scale.js
@@ -0,0 +1,290 @@
+/*!
+ * jQuery UI Effects Scale @VERSION
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Scale
+ *
+ * Depends:
+ *	jquery.ui.effect.js
+ */
+(function( $, undefined ) {
+
+$.effects.effect.puff = function( o, done ) {
+	var elem = $( this ),
+		mode = $.effects.setMode( elem, o.mode || "hide" ),
+		hide = mode === "hide",
+		percent = parseInt( o.percent, 10 ) || 150,
+		factor = percent / 100,
+		original = {
+			height: elem.height(),
+			width: elem.width()
+		};
+
+	$.extend( o, {
+		effect: "scale",
+		queue: false,
+		fade: true,
+		mode: mode,
+		complete: done,
+		percent: hide ? percent : 100,
+		from: hide ?
+			original :
+			{
+				height: original.height * factor,
+				width: original.width * factor
+			}
+	});
+
+	elem.effect( o );
+};
+
+$.effects.effect.scale = function( o, done ) {
+
+	// Create element
+	var el = $( this ),
+		options = $.extend( true, {}, o ),
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		percent = parseInt( o.percent, 10 ) ||
+			( parseInt( o.percent, 10 ) === 0 ? 0 : ( mode === "hide" ? 0 : 100 ) ),
+		direction = o.direction || "both",
+		origin = o.origin,
+		original = {
+			height: el.height(),
+			width: el.width(),
+			outerHeight: el.outerHeight(),
+			outerWidth: el.outerWidth()
+		},
+		factor = {
+			y: direction !== "horizontal" ? (percent / 100) : 1,
+			x: direction !== "vertical" ? (percent / 100) : 1
+		};
+
+	// We are going to pass this effect to the size effect:
+	options.effect = "size";
+	options.queue = false;
+	options.complete = done;
+
+	// Set default origin and restore for show/hide
+	if ( mode !== "effect" ) {
+		options.origin = origin || ["middle","center"];
+		options.restore = true;
+	}
+
+	options.from = o.from || ( mode === "show" ? { height: 0, width: 0 } : original );
+	options.to = {
+		height: original.height * factor.y,
+		width: original.width * factor.x,
+		outerHeight: original.outerHeight * factor.y,
+		outerWidth: original.outerWidth * factor.x
+	};
+
+	// Fade option to support puff
+	if ( options.fade ) {
+		if ( mode === "show" ) {
+			options.from.opacity = 0;
+			options.to.opacity = 1;
+		}
+		if ( mode === "hide" ) {
+			options.from.opacity = 1;
+			options.to.opacity = 0;
+		}
+	}
+
+	// Animate
+	el.effect( options );
+
+};
+
+$.effects.effect.size = function( o, done ) {
+
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "width", "height", "overflow", "opacity" ],
+
+		// Always restore
+		props1 = [ "position", "top", "bottom", "left", "right", "overflow", "opacity" ],
+
+		// Copy for children
+		props2 = [ "width", "height", "overflow" ],
+		cProps = [ "fontSize" ],
+		vProps = [ "borderTopWidth", "borderBottomWidth", "paddingTop", "paddingBottom" ],
+		hProps = [ "borderLeftWidth", "borderRightWidth", "paddingLeft", "paddingRight" ],
+
+		// Set options
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		restore = o.restore || mode !== "effect",
+		scale = o.scale || "both",
+		origin = o.origin || [ "middle", "center" ],
+		original, baseline, factor,
+		position = el.css( "position" );
+
+	if ( mode === "show" ) {
+		el.show();
+	}
+	original = {
+		height: el.height(),
+		width: el.width(),
+		outerHeight: el.outerHeight(),
+		outerWidth: el.outerWidth()
+	};
+
+	el.from = o.from || original;
+	el.to = o.to || original;
+
+	// Set scaling factor
+	factor = {
+		from: {
+			y: el.from.height / original.height,
+			x: el.from.width / original.width
+		},
+		to: {
+			y: el.to.height / original.height,
+			x: el.to.width / original.width
+		}
+	};
+
+	// Scale the css box
+	if ( scale === "box" || scale === "both" ) {
+
+		// Vertical props scaling
+		if ( factor.from.y !== factor.to.y ) {
+			props = props.concat( vProps );
+			el.from = $.effects.setTransition( el, vProps, factor.from.y, el.from );
+			el.to = $.effects.setTransition( el, vProps, factor.to.y, el.to );
+		}
+
+		// Horizontal props scaling
+		if ( factor.from.x !== factor.to.x ) {
+			props = props.concat( hProps );
+			el.from = $.effects.setTransition( el, hProps, factor.from.x, el.from );
+			el.to = $.effects.setTransition( el, hProps, factor.to.x, el.to );
+		}
+	}
+
+	// Scale the content
+	if ( scale === "content" || scale === "both" ) {
+
+		// Vertical props scaling
+		if ( factor.from.y !== factor.to.y ) {
+			props = props.concat( cProps );
+			el.from = $.effects.setTransition( el, cProps, factor.from.y, el.from );
+			el.to = $.effects.setTransition( el, cProps, factor.to.y, el.to );
+		}
+	}
+
+	$.effects.save( el, restore ? props : props1 );
+	el.show();
+	$.effects.createWrapper( el );
+	el.css( "overflow", "hidden" ).css( el.from );
+
+	// Adjust
+	if (origin) { // Calculate baseline shifts
+		baseline = $.effects.getBaseline( origin, original );
+		el.from.top = ( original.outerHeight - el.outerHeight() ) * baseline.y;
+		el.from.left = ( original.outerWidth - el.outerWidth() ) * baseline.x;
+		el.to.top = ( original.outerHeight - el.to.outerHeight ) * baseline.y;
+		el.to.left = ( original.outerWidth - el.to.outerWidth ) * baseline.x;
+	}
+	el.css( el.from ); // set top & left
+
+	// Animate
+	if ( scale === "content" || scale === "both" ) { // Scale the children
+
+		// Add margins/font-size
+		vProps = vProps.concat([ "marginTop", "marginBottom" ]).concat(cProps);
+		hProps = hProps.concat([ "marginLeft", "marginRight" ]);
+		props2 = props.concat(vProps).concat(hProps);
+
+		el.find( "*[width]" ).each( function(){
+			var child = $( this ),
+				c_original = {
+					height: child.height(),
+					width: child.width()
+				};
+			if (restore) {
+				$.effects.save(child, props2);
+			}
+
+			child.from = {
+				height: c_original.height * factor.from.y,
+				width: c_original.width * factor.from.x
+			};
+			child.to = {
+				height: c_original.height * factor.to.y,
+				width: c_original.width * factor.to.x
+			};
+
+			// Vertical props scaling
+			if ( factor.from.y !== factor.to.y ) {
+				child.from = $.effects.setTransition( child, vProps, factor.from.y, child.from );
+				child.to = $.effects.setTransition( child, vProps, factor.to.y, child.to );
+			}
+
+			// Horizontal props scaling
+			if ( factor.from.x !== factor.to.x ) {
+				child.from = $.effects.setTransition( child, hProps, factor.from.x, child.from );
+				child.to = $.effects.setTransition( child, hProps, factor.to.x, child.to );
+			}
+
+			// Animate children
+			child.css( child.from );
+			child.animate( child.to, o.duration, o.easing, function() {
+
+				// Restore children
+				if ( restore ) {
+					$.effects.restore( child, props2 );
+				}
+			});
+		});
+	}
+
+	// Animate
+	el.animate( el.to, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( el.to.opacity === 0 ) {
+				el.css( "opacity", el.from.opacity );
+			}
+			if( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, restore ? props : props1 );
+			if ( !restore ) {
+
+				// we need to calculate our new positioning based on the scaling
+				if ( position === "static" ) {
+					el.css({
+						position: "relative",
+						top: el.to.top,
+						left: el.to.left
+					});
+				} else {
+					$.each([ "top", "left" ], function( idx, pos ) {
+						el.css( pos, function( _, str ) {
+							var val = parseInt( str, 10 ),
+								toRef = idx ? el.to.left : el.to.top;
+
+							// if original was "auto", recalculate the new value from wrapper
+							if ( str === "auto" ) {
+								return toRef + "px";
+							}
+
+							return val + toRef + "px";
+						});
+					});
+				}
+			}
+
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+
+};
+
+})(jQuery);
diff --git a/ui/jquery.ui.effect-shake.js b/ui/jquery.ui.effect-shake.js
new file mode 100644
index 000000000..e0fb17d34
--- /dev/null
+++ b/ui/jquery.ui.effect-shake.js
@@ -0,0 +1,73 @@
+/*!
+ * jQuery UI Effects Shake @VERSION
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Shake
+ *
+ * Depends:
+ *	jquery.ui.effect.js
+ */
+(function( $, undefined ) {
+
+$.effects.effect.shake = function( o, done ) {
+
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		direction = o.direction || "left",
+		distance = o.distance || 20,
+		times = o.times || 3,
+		anims = times * 2 + 1,
+		speed = o.duration,
+		ref = (direction === "up" || direction === "down") ? "top" : "left",
+		positiveMotion = (direction === "up" || direction === "left"),
+		animation = {},
+		animation1 = {},
+		animation2 = {},
+		i,
+
+		// we will need to re-assemble the queue to stack our animations in place
+		queue = el.queue(),
+		queuelen = queue.length;
+
+	$.effects.save( el, props );
+	el.show();
+	$.effects.createWrapper( el );
+
+	// Animation
+	animation[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance;
+	animation1[ ref ] = ( positiveMotion ? "+=" : "-=" ) + distance * 2;
+	animation2[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance * 2;
+
+	// Animate
+	el.animate( animation, speed, o.easing );
+
+	// Shakes
+	for ( i = 1; i < times; i++ ) {
+		el.animate( animation1, speed, o.easing ).animate( animation2, speed, o.easing );
+	}
+	el
+		.animate( animation1, speed, o.easing )
+		.animate( animation, speed / 2, o.easing )
+		.queue(function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		});
+
+	// inject all the animations we just queued to be first in line (after "inprogress")
+	if ( queuelen > 1) {
+		queue.splice.apply( queue,
+			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
+	}
+	el.dequeue();
+
+};
+
+})(jQuery);
diff --git a/ui/jquery.ui.effect-slide.js b/ui/jquery.ui.effect-slide.js
new file mode 100644
index 000000000..0de9bed94
--- /dev/null
+++ b/ui/jquery.ui.effect-slide.js
@@ -0,0 +1,65 @@
+/*!
+ * jQuery UI Effects Slide @VERSION
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Slide
+ *
+ * Depends:
+ *	jquery.ui.effect.js
+ */
+(function( $, undefined ) {
+
+$.effects.effect.slide = function( o, done ) {
+
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "width", "height" ],
+		mode = $.effects.setMode( el, o.mode || "show" ),
+		show = mode === "show",
+		direction = o.direction || "left",
+		ref = (direction === "up" || direction === "down") ? "top" : "left",
+		positiveMotion = (direction === "up" || direction === "left"),
+		distance,
+		animation = {};
+
+	// Adjust
+	$.effects.save( el, props );
+	el.show();
+	distance = o.distance || el[ ref === "top" ? "outerHeight" : "outerWidth" ]({
+		margin: true
+	});
+
+	$.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+
+	if ( show ) {
+		el.css( ref, positiveMotion ? (isNaN(distance) ? "-" + distance : -distance) : distance );
+	}
+
+	// Animation
+	animation[ ref ] = ( show ?
+		( positiveMotion ? "+=" : "-=") :
+		( positiveMotion ? "-=" : "+=")) +
+		distance;
+
+	// Animate
+	el.animate( animation, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+};
+
+})(jQuery);
diff --git a/ui/jquery.ui.effect-transfer.js b/ui/jquery.ui.effect-transfer.js
new file mode 100644
index 000000000..fefa551b4
--- /dev/null
+++ b/ui/jquery.ui.effect-transfer.js
@@ -0,0 +1,46 @@
+/*!
+ * jQuery UI Effects Transfer @VERSION
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Transfer
+ *
+ * Depends:
+ *	jquery.ui.effect.js
+ */
+(function( $, undefined ) {
+
+$.effects.effect.transfer = function( o, done ) {
+	var elem = $( this ),
+		target = $( o.to ),
+		targetFixed = target.css( "position" ) === "fixed",
+		body = $("body"),
+		fixTop = targetFixed ? body.scrollTop() : 0,
+		fixLeft = targetFixed ? body.scrollLeft() : 0,
+		endPosition = target.offset(),
+		animation = {
+			top: endPosition.top - fixTop ,
+			left: endPosition.left - fixLeft ,
+			height: target.innerHeight(),
+			width: target.innerWidth()
+		},
+		startPosition = elem.offset(),
+		transfer = $( '<div class="ui-effects-transfer"></div>' )
+			.appendTo( document.body )
+			.addClass( o.className )
+			.css({
+				top: startPosition.top - fixTop ,
+				left: startPosition.left - fixLeft ,
+				height: elem.innerHeight(),
+				width: elem.innerWidth(),
+				position: targetFixed ? "fixed" : "absolute"
+			})
+			.animate( animation, o.duration, o.easing, function() {
+				transfer.remove();
+				done();
+			});
+};
+
+})(jQuery);
diff --git a/ui/jquery.ui.effect.js b/ui/jquery.ui.effect.js
new file mode 100644
index 000000000..1bb1415a9
--- /dev/null
+++ b/ui/jquery.ui.effect.js
@@ -0,0 +1,739 @@
+/*!
+ * jQuery UI Effects @VERSION
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/
+ */
+;(jQuery.effects || (function($, undefined) {
+
+var backCompat = $.uiBackCompat !== false,
+	// prefix used for storing data on .data()
+	dataSpace = "ui-effects-";
+
+$.effects = {
+	effect: {}
+};
+
+/******************************************************************************/
+/****************************** COLOR ANIMATIONS ******************************/
+/******************************************************************************/
+(function() {
+
+// override the animation for color styles
+$.each(["backgroundColor", "borderBottomColor", "borderLeftColor",
+	"borderRightColor", "borderTopColor", "borderColor", "color", "outlineColor"],
+function(i, attr) {
+	$.fx.step[attr] = function(fx) {
+		if (!fx.colorInit) {
+			fx.start = getColor(fx.elem, attr);
+			fx.end = getRGB(fx.end);
+			fx.colorInit = true;
+		}
+
+		fx.elem.style[attr] = "rgb(" +
+			Math.max(Math.min(parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0], 10), 255), 0) + "," +
+			Math.max(Math.min(parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1], 10), 255), 0) + "," +
+			Math.max(Math.min(parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2], 10), 255), 0) + ")";
+	};
+});
+
+// Color Conversion functions from highlightFade
+// By Blair Mitchelmore
+// http://jquery.offput.ca/highlightFade/
+
+// Parse strings looking for color tuples [255,255,255]
+function getRGB(color) {
+		var result;
+
+		// Check if we're already dealing with an array of colors
+		if ( color && color.constructor === Array && color.length === 3 ) {
+			return color;
+		}
+
+		// Look for rgb(num,num,num)
+		if ( (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color)) ) {
+			return [parseInt(result[1],10), parseInt(result[2],10), parseInt(result[3],10)];
+		}
+
+		// Look for rgb(num%,num%,num%)
+		if ( (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color)) ) {
+			return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
+		}
+
+		// Look for #a0b1c2
+		if ( (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color)) ) {
+			return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)];
+		}
+
+		// Look for #fff
+		if ( (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color)) ) {
+			return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)];
+		}
+
+		// Look for rgba(0, 0, 0, 0) == transparent in Safari 3
+		if ( (result = /rgba\(0, 0, 0, 0\)/.exec(color)) ) {
+			return colors.transparent;
+		}
+
+		// Otherwise, we're most likely dealing with a named color
+		return colors[$.trim(color).toLowerCase()];
+}
+
+function getColor(elem, attr) {
+		var color;
+
+		do {
+				color = $.css(elem, attr);
+
+				// Keep going until we find an element that has color, or we hit the body
+				if ( color && color !== "transparent" || $.nodeName(elem, "body") ) {
+					break;
+				}
+
+				attr = "backgroundColor";
+		} while ( (elem = elem.parentNode) );
+
+		return getRGB(color);
+}
+
+// Some named colors to work with
+// From Interface by Stefan Petre
+// http://interface.eyecon.ro/
+
+var colors = {
+	aqua:[0,255,255],
+	azure:[240,255,255],
+	beige:[245,245,220],
+	black:[0,0,0],
+	blue:[0,0,255],
+	brown:[165,42,42],
+	cyan:[0,255,255],
+	darkblue:[0,0,139],
+	darkcyan:[0,139,139],
+	darkgrey:[169,169,169],
+	darkgreen:[0,100,0],
+	darkkhaki:[189,183,107],
+	darkmagenta:[139,0,139],
+	darkolivegreen:[85,107,47],
+	darkorange:[255,140,0],
+	darkorchid:[153,50,204],
+	darkred:[139,0,0],
+	darksalmon:[233,150,122],
+	darkviolet:[148,0,211],
+	fuchsia:[255,0,255],
+	gold:[255,215,0],
+	green:[0,128,0],
+	indigo:[75,0,130],
+	khaki:[240,230,140],
+	lightblue:[173,216,230],
+	lightcyan:[224,255,255],
+	lightgreen:[144,238,144],
+	lightgrey:[211,211,211],
+	lightpink:[255,182,193],
+	lightyellow:[255,255,224],
+	lime:[0,255,0],
+	magenta:[255,0,255],
+	maroon:[128,0,0],
+	navy:[0,0,128],
+	olive:[128,128,0],
+	orange:[255,165,0],
+	pink:[255,192,203],
+	purple:[128,0,128],
+	violet:[128,0,128],
+	red:[255,0,0],
+	silver:[192,192,192],
+	white:[255,255,255],
+	yellow:[255,255,0],
+	transparent: [255,255,255]
+};
+
+})();
+
+/******************************************************************************/
+/****************************** CLASS ANIMATIONS ******************************/
+/******************************************************************************/
+(function() {
+
+var classAnimationActions = [ "add", "remove", "toggle" ],
+	shorthandStyles = {
+		border: 1,
+		borderBottom: 1,
+		borderColor: 1,
+		borderLeft: 1,
+		borderRight: 1,
+		borderTop: 1,
+		borderWidth: 1,
+		margin: 1,
+		padding: 1
+	};
+
+$.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], function( _, prop ) {
+	$.fx.step[ prop ] = function( fx ) {
+		if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) {
+			jQuery.style( fx.elem, prop, fx.end );
+			fx.setAttr = true;
+		}
+	};
+});
+
+function getElementStyles() {
+	var style = this.ownerDocument.defaultView ?
+			this.ownerDocument.defaultView.getComputedStyle( this, null ) :
+			this.currentStyle,
+		newStyle = {},
+		key,
+		camelCase,
+		len;
+
+	// webkit enumerates style porperties
+	if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) {
+		len = style.length;
+		while ( len-- ) {
+			key = style[ len ];
+			if ( typeof style[ key ] === "string" ) {
+				newStyle[ $.camelCase( key ) ] = style[ key ];
+			}
+		}
+	} else {
+		for ( key in style ) {
+			if ( typeof style[ key ] === "string" ) {
+				newStyle[ key ] = style[ key ];
+			}
+		}
+	}
+
+	return newStyle;
+}
+
+
+function styleDifference( oldStyle, newStyle ) {
+	var diff = {},
+		name, value;
+
+	for ( name in newStyle ) {
+		value = newStyle[ name ];
+		if ( oldStyle[ name ] !== value ) {
+			if ( !shorthandStyles[ name ] ) {
+				if ( $.fx.step[ name ] || !isNaN( parseFloat( value ) ) ) {
+					diff[ name ] = value;
+				}
+			}
+		}
+	}
+
+	return diff;
+}
+
+$.effects.animateClass = function( value, duration, easing, callback ) {
+	var o = $.speed( duration, easing, callback );
+
+	return this.queue( function() {
+		var animated = $( this ),
+			baseClass = animated.attr( "class" ) || "",
+			applyClassChange,
+			allAnimations = o.children ? animated.find( "*" ).andSelf() : animated;
+
+		// map the animated objects to store the original styles.
+		allAnimations = allAnimations.map(function() {
+			var el = $( this );
+			return {
+				el: el,
+				start: getElementStyles.call( this )
+			};
+		});
+
+		// apply class change
+		applyClassChange = function() {
+			$.each( classAnimationActions, function(i, action) {
+				if ( value[ action ] ) {
+					animated[ action + "Class" ]( value[ action ] );
+				}
+			});
+		};
+		applyClassChange();
+
+		// map all animated objects again - calculate new styles and diff
+		allAnimations = allAnimations.map(function() {
+			this.end = getElementStyles.call( this.el[ 0 ] );
+			this.diff = styleDifference( this.start, this.end );
+			return this;
+		});
+
+		// apply original class
+		animated.attr( "class", baseClass );
+
+		// map all animated objects again - this time collecting a promise
+		allAnimations = allAnimations.map(function() {
+			var styleInfo = this,
+				dfd = $.Deferred(),
+				opts = jQuery.extend({}, o, {
+					queue: false,
+					complete: function() {
+						dfd.resolve( styleInfo );
+					}
+				});
+
+			this.el.animate( this.diff, opts );
+			return dfd.promise();
+		});
+
+		// once all animations have completed:
+		$.when.apply( $, allAnimations.get() ).done(function() {
+
+			// set the final class
+			applyClassChange();
+
+			// for each animated element,
+			// clear all css properties that were animated
+			$.each( arguments, function() {
+				var el = this.el;
+				$.each( this.diff, function(key) {
+					el.css( key, '' );
+				});
+			});
+
+			// this is guarnteed to be there if you use jQuery.speed()
+			// it also handles dequeuing the next anim...
+			o.complete.call( animated[ 0 ] );
+		});
+	});
+};
+
+$.fn.extend({
+	_addClass: $.fn.addClass,
+	addClass: function( classNames, speed, easing, callback ) {
+		return speed ?
+			$.effects.animateClass.apply( this, [{ add: classNames }, speed, easing, callback ]) :
+			this._addClass(classNames);
+	},
+
+	_removeClass: $.fn.removeClass,
+	removeClass: function( classNames, speed, easing, callback ) {
+		return speed ?
+			$.effects.animateClass.apply( this, [{ remove: classNames }, speed, easing, callback ]) :
+			this._removeClass(classNames);
+	},
+
+	_toggleClass: $.fn.toggleClass,
+	toggleClass: function( classNames, force, speed, easing, callback ) {
+		if ( typeof force === "boolean" || force === undefined ) {
+			if ( !speed ) {
+				// without speed parameter;
+				return this._toggleClass( classNames, force );
+			} else {
+				return $.effects.animateClass.apply( this, [( force ? { add:classNames } : { remove:classNames }), speed, easing, callback ]);
+			}
+		} else {
+			// without force parameter;
+			return $.effects.animateClass.apply( this, [{ toggle: classNames }, force, speed, easing ]);
+		}
+	},
+
+	switchClass: function( remove, add, speed, easing, callback) {
+		return $.effects.animateClass.apply( this, [{
+				add: add,
+				remove: remove
+			}, speed, easing, callback ]);
+	}
+});
+
+})();
+
+/******************************************************************************/
+/*********************************** EFFECTS **********************************/
+/******************************************************************************/
+
+(function() {
+
+$.extend( $.effects, {
+	version: "@VERSION",
+
+	// Saves a set of properties in a data storage
+	save: function( element, set ) {
+		for( var i=0; i < set.length; i++ ) {
+			if ( set[ i ] !== null ) {
+				element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
+			}
+		}
+	},
+
+	// Restores a set of previously saved properties from a data storage
+	restore: function( element, set ) {
+		for( var i=0; i < set.length; i++ ) {
+			if ( set[ i ] !== null ) {
+				element.css( set[ i ], element.data( dataSpace + set[ i ] ) );
+			}
+		}
+	},
+
+	setMode: function( el, mode ) {
+		if (mode === "toggle") {
+			mode = el.is( ":hidden" ) ? "show" : "hide";
+		}
+		return mode;
+	},
+
+	// Translates a [top,left] array into a baseline value
+	// this should be a little more flexible in the future to handle a string & hash
+	getBaseline: function( origin, original ) {
+		var y, x;
+		switch ( origin[ 0 ] ) {
+			case "top": y = 0; break;
+			case "middle": y = 0.5; break;
+			case "bottom": y = 1; break;
+			default: y = origin[ 0 ] / original.height;
+		}
+		switch ( origin[ 1 ] ) {
+			case "left": x = 0; break;
+			case "center": x = 0.5; break;
+			case "right": x = 1; break;
+			default: x = origin[ 1 ] / original.width;
+		}
+		return {
+			x: x,
+			y: y
+		};
+	},
+
+	// Wraps the element around a wrapper that copies position properties
+	createWrapper: function( element ) {
+
+		// if the element is already wrapped, return it
+		if ( element.parent().is( ".ui-effects-wrapper" )) {
+			return element.parent();
+		}
+
+		// wrap the element
+		var props = {
+				width: element.outerWidth(true),
+				height: element.outerHeight(true),
+				"float": element.css( "float" )
+			},
+			wrapper = $( "<div></div>" )
+				.addClass( "ui-effects-wrapper" )
+				.css({
+					fontSize: "100%",
+					background: "transparent",
+					border: "none",
+					margin: 0,
+					padding: 0
+				}),
+			// Store the size in case width/height are defined in % - Fixes #5245
+			size = {
+				width: element.width(),
+				height: element.height()
+			},
+			active = document.activeElement;
+
+		// support: Firefox
+		// Firefox incorrectly exposes anonymous content
+		// https://bugzilla.mozilla.org/show_bug.cgi?id=561664
+		try {
+			active.id;
+		} catch( e ) {
+			active = document.body;
+		}
+
+		element.wrap( wrapper );
+
+		// Fixes #7595 - Elements lose focus when wrapped.
+		if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+			$( active ).focus();
+		}
+
+		wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually lose the reference to the wrapped element
+
+		// transfer positioning properties to the wrapper
+		if ( element.css( "position" ) === "static" ) {
+			wrapper.css({ position: "relative" });
+			element.css({ position: "relative" });
+		} else {
+			$.extend( props, {
+				position: element.css( "position" ),
+				zIndex: element.css( "z-index" )
+			});
+			$.each([ "top", "left", "bottom", "right" ], function(i, pos) {
+				props[ pos ] = element.css( pos );
+				if ( isNaN( parseInt( props[ pos ], 10 ) ) ) {
+					props[ pos ] = "auto";
+				}
+			});
+			element.css({
+				position: "relative",
+				top: 0,
+				left: 0,
+				right: "auto",
+				bottom: "auto"
+			});
+		}
+		element.css(size);
+
+		return wrapper.css( props ).show();
+	},
+
+	removeWrapper: function( element ) {
+		var active = document.activeElement;
+
+		if ( element.parent().is( ".ui-effects-wrapper" ) ) {
+			element.parent().replaceWith( element );
+
+			// Fixes #7595 - Elements lose focus when wrapped.
+			if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+				$( active ).focus();
+			}
+		}
+
+
+		return element;
+	},
+
+	setTransition: function( element, list, factor, value ) {
+		value = value || {};
+		$.each( list, function( i, x ) {
+			var unit = element.cssUnit( x );
+			if ( unit[ 0 ] > 0 ) {
+				value[ x ] = unit[ 0 ] * factor + unit[ 1 ];
+			}
+		});
+		return value;
+	}
+});
+
+// return an effect options object for the given parameters:
+function _normalizeArguments( effect, options, speed, callback ) {
+
+	// allow passing all optinos as the first parameter
+	if ( $.isPlainObject( effect ) ) {
+		options = effect;
+		effect = effect.effect;
+	}
+
+	// convert to an object
+	effect = { effect: effect };
+
+	// catch (effect)
+	if ( options === undefined ) {
+		options = {};
+	}
+
+	// catch (effect, callback)
+	if ( $.isFunction( options ) ) {
+		callback = options;
+		speed = null;
+		options = {};
+	}
+
+	// catch (effect, speed, ?)
+	if ( typeof options === "number" || $.fx.speeds[ options ] ) {
+		callback = speed;
+		speed = options;
+		options = {};
+	}
+
+	// catch (effect, options, callback)
+	if ( $.isFunction( speed ) ) {
+		callback = speed;
+		speed = null;
+	}
+
+	// add options to effect
+	if ( options ) {
+		$.extend( effect, options );
+	}
+
+	speed = speed || options.duration;
+	effect.duration = $.fx.off ? 0 :
+		typeof speed === "number" ? speed :
+		speed in $.fx.speeds ? $.fx.speeds[ speed ] :
+		$.fx.speeds._default;
+
+	effect.complete = callback || options.complete;
+
+	return effect;
+}
+
+function standardSpeed( speed ) {
+	// valid standard speeds
+	if ( !speed || typeof speed === "number" || $.fx.speeds[ speed ] ) {
+		return true;
+	}
+
+	// invalid strings - treat as "normal" speed
+	if ( typeof speed === "string" && !$.effects.effect[ speed ] ) {
+		// TODO: remove in 2.0 (#7115)
+		if ( backCompat && $.effects[ speed ] ) {
+			return false;
+		}
+		return true;
+	}
+
+	return false;
+}
+
+$.fn.extend({
+	effect: function( effect, options, speed, callback ) {
+		var args = _normalizeArguments.apply( this, arguments ),
+			mode = args.mode,
+			queue = args.queue,
+			effectMethod = $.effects.effect[ args.effect ],
+
+			// DEPRECATED: remove in 2.0 (#7115)
+			oldEffectMethod = !effectMethod && backCompat && $.effects[ args.effect ];
+
+		if ( $.fx.off || !( effectMethod || oldEffectMethod ) ) {
+			// delegate to the original method (e.g., .show()) if possible
+			if ( mode ) {
+				return this[ mode ]( args.duration, args.complete );
+			} else {
+				return this.each( function() {
+					if ( args.complete ) {
+						args.complete.call( this );
+					}
+				});
+			}
+		}
+
+		function run( next ) {
+			var elem = $( this ),
+				complete = args.complete,
+				mode = args.mode;
+
+			function done() {
+				if ( $.isFunction( complete ) ) {
+					complete.call( elem[0] );
+				}
+				if ( $.isFunction( next ) ) {
+					next();
+				}
+			}
+
+			// if the element is hiddden and mode is hide,
+			// or element is visible and mode is show
+			if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
+				done();
+			} else {
+				effectMethod.call( elem[0], args, done );
+			}
+		}
+
+		// TODO: remove this check in 2.0, effectMethod will always be true
+		if ( effectMethod ) {
+			return queue === false ? this.each( run ) : this.queue( queue || "fx", run );
+		} else {
+			// DEPRECATED: remove in 2.0 (#7115)
+			return oldEffectMethod.call(this, {
+				options: args,
+				duration: args.duration,
+				callback: args.complete,
+				mode: args.mode
+			});
+		}
+	},
+
+	_show: $.fn.show,
+	show: function( speed ) {
+		if ( standardSpeed( speed ) ) {
+			return this._show.apply( this, arguments );
+		} else {
+			var args = _normalizeArguments.apply( this, arguments );
+			args.mode = "show";
+			return this.effect.call( this, args );
+		}
+	},
+
+	_hide: $.fn.hide,
+	hide: function( speed ) {
+		if ( standardSpeed( speed ) ) {
+			return this._hide.apply( this, arguments );
+		} else {
+			var args = _normalizeArguments.apply( this, arguments );
+			args.mode = "hide";
+			return this.effect.call( this, args );
+		}
+	},
+
+	// jQuery core overloads toggle and creates _toggle
+	__toggle: $.fn.toggle,
+	toggle: function( speed ) {
+		if ( standardSpeed( speed ) || typeof speed === "boolean" || $.isFunction( speed ) ) {
+			return this.__toggle.apply( this, arguments );
+		} else {
+			var args = _normalizeArguments.apply( this, arguments );
+			args.mode = "toggle";
+			return this.effect.call( this, args );
+		}
+	},
+
+	// helper functions
+	cssUnit: function(key) {
+		var style = this.css( key ),
+			val = [];
+
+		$.each( [ "em", "px", "%", "pt" ], function( i, unit ) {
+			if ( style.indexOf( unit ) > 0 ) {
+				val = [ parseFloat( style ), unit ];
+			}
+		});
+		return val;
+	}
+});
+
+})();
+
+/******************************************************************************/
+/*********************************** EASING ***********************************/
+/******************************************************************************/
+
+(function() {
+
+// based on easing equations from Robert Penner (http://www.robertpenner.com/easing)
+
+var baseEasings = {};
+
+$.each( [ "Quad", "Cubic", "Quart", "Quint", "Expo" ], function( i, name ) {
+	baseEasings[ name ] = function( p ) {
+		return Math.pow( p, i + 2 );
+	};
+});
+
+$.extend( baseEasings, {
+	Sine: function ( p ) {
+		return 1 - Math.cos( p * Math.PI / 2 );
+	},
+	Circ: function ( p ) {
+		return 1 - Math.sqrt( 1 - p * p );
+	},
+	Elastic: function( p ) {
+		return p === 0 || p === 1 ? p :
+			-Math.pow( 2, 8 * (p - 1) ) * Math.sin( ( (p - 1) * 80 - 7.5 ) * Math.PI / 15 );
+	},
+	Back: function( p ) {
+		return p * p * ( 3 * p - 2 );
+	},
+	Bounce: function ( p ) {
+		var pow2,
+			bounce = 4;
+
+		while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {}
+		return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 );
+	}
+});
+
+$.each( baseEasings, function( name, easeIn ) {
+	$.easing[ "easeIn" + name ] = easeIn;
+	$.easing[ "easeOut" + name ] = function( p ) {
+		return 1 - easeIn( 1 - p );
+	};
+	$.easing[ "easeInOut" + name ] = function( p ) {
+		return p < 0.5 ?
+			easeIn( p * 2 ) / 2 :
+			1 - easeIn( p * -2 + 2 ) / 2;
+	};
+});
+
+})();
+
+})(jQuery));
-- 
cgit v1.2.3


From e79c79df4e658e22b446701d2b32023e4615d32a Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 15 Jun 2012 13:37:05 -0400
Subject: Effects tests: Fixed JSHint references.

---
 tests/unit/effects/effects_core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js
index 955e6f799..557a57cae 100644
--- a/tests/unit/effects/effects_core.js
+++ b/tests/unit/effects/effects_core.js
@@ -174,7 +174,7 @@ $.each( $.effects.effect, function( effect ) {
 
 	// puff and size are defined inside scale
 	if ( effect !== "puff" && effect !== "size" ) {
-		TestHelpers.testJshint( "effects." + effect );
+		TestHelpers.testJshint( "ui.effect-" + effect );
 	}
 
 	if ( effect === "transfer" ) {
-- 
cgit v1.2.3


From 8e541f1bf611401b824c523064f6288d7c32a4ae Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 15 Jun 2012 13:42:00 -0400
Subject: Tests: Remove the need to include the 'ui.' prefix in testJshint()
 now that effects use 'ui.'.

---
 tests/unit/core/core.js              | 2 +-
 tests/unit/effects/effects_core.js   | 2 +-
 tests/unit/position/position_core.js | 2 +-
 tests/unit/testsuite.js              | 4 ++--
 tests/unit/widget/widget_core.js     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/core/core.js b/tests/unit/core/core.js
index 1026c5b0b..db9d82819 100644
--- a/tests/unit/core/core.js
+++ b/tests/unit/core/core.js
@@ -2,7 +2,7 @@
 
 module( "core - jQuery extensions" );
 
-TestHelpers.testJshint( "ui.core" );
+TestHelpers.testJshint( "core" );
 
 test( "focus - original functionality", function() {
 	expect( 1 );
diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js
index 557a57cae..60706b87b 100644
--- a/tests/unit/effects/effects_core.js
+++ b/tests/unit/effects/effects_core.js
@@ -174,7 +174,7 @@ $.each( $.effects.effect, function( effect ) {
 
 	// puff and size are defined inside scale
 	if ( effect !== "puff" && effect !== "size" ) {
-		TestHelpers.testJshint( "ui.effect-" + effect );
+		TestHelpers.testJshint( "effect-" + effect );
 	}
 
 	if ( effect === "transfer" ) {
diff --git a/tests/unit/position/position_core.js b/tests/unit/position/position_core.js
index 4a2240311..3b749a218 100644
--- a/tests/unit/position/position_core.js
+++ b/tests/unit/position/position_core.js
@@ -16,7 +16,7 @@ module( "position", {
 	}
 });
 
-TestHelpers.testJshint( "ui.position" );
+TestHelpers.testJshint( "position" );
 
 test( "my, at, of", function() {
 	expect( 4 );
diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index 59bda7df8..e4f549de6 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -47,7 +47,7 @@ TestHelpers.testJshint = function( module ) {
 				dataType: "json"
 			}),
 			$.ajax({
-				url: "../../../ui/jquery." + module + ".js",
+				url: "../../../ui/jquery.ui." + module + ".js",
 				dataType: "text"
 			})
 		).done(function( hintArgs, srcArgs ) {
@@ -126,7 +126,7 @@ function testBasicUsage( widget ) {
 TestHelpers.commonWidgetTests = function( widget, settings ) {
 	module( widget + ": common widget" );
 
-	TestHelpers.testJshint( "ui." + widget );
+	TestHelpers.testJshint( widget );
 	testWidgetDefaults( widget, settings.defaults );
 	testWidgetOverrides( widget );
 	testBasicUsage( widget );
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index abfb0d9de..07e847926 100644
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -8,7 +8,7 @@ module( "widget factory", {
 	}
 });
 
-TestHelpers.testJshint( "ui.widget" );
+TestHelpers.testJshint( "widget" );
 
 test( "widget creation", function() {
 	var myPrototype = {
-- 
cgit v1.2.3


From 67540fd539b660c0eb3925d063014ff4e6c91667 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 16 Jun 2012 08:19:41 -0400
Subject: Effects tests: Don't use internal jQuery properties to detect support
 for fixed positioning.

---
 tests/unit/effects/effects_scale.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/effects/effects_scale.js b/tests/unit/effects/effects_scale.js
index df61d9e91..f06fa0f46 100644
--- a/tests/unit/effects/effects_scale.js
+++ b/tests/unit/effects/effects_scale.js
@@ -53,13 +53,13 @@ function suite( position ) {
 $(function() {
 	suite( "absolute" );
 	suite( "relative" );
-	var fixed = $.support.fixedPosition;
-	// jQuery < 1.7 uses $.offset.supportsFixedPosition
-	if ( fixed === undefined ) {
-		$.offset.initialize();
-		fixed = $.offset.supportsFixedPosition;
-	}
-	if ( fixed ) {
+	var fixedElem = $( "<div>" )
+		.css({
+			position: "fixed",
+			top: 10
+		})
+		.appendTo( "body" );
+	if ( fixedElem.offset().top === 10 ) {
 		suite( "fixed" );
 	}
 });
-- 
cgit v1.2.3


From 7c74af7b224ab1b016c644bdc9bc419ea82c75f0 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 16 Jun 2012 08:24:29 -0400
Subject: Button tests: Use domEqual() to test destroy().

---
 tests/unit/button/button_methods.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/button/button_methods.js b/tests/unit/button/button_methods.js
index 347806d4e..6a305d654 100644
--- a/tests/unit/button/button_methods.js
+++ b/tests/unit/button/button_methods.js
@@ -7,13 +7,10 @@
 module("button: methods");
 
 test("destroy", function() {
-	var beforeHtml = $("#button").parent().html(),
-		afterHtml = $("#button").button().button("destroy").parent().html();
-	// Opera 9 outputs role="" instead of removing the attribute like everyone else
-	if ($.browser.opera) {
-		afterHtml = afterHtml.replace(/ role=""/g, "");
-	}
-	equal( afterHtml, beforeHtml );
+	expect( 1 );
+	domEqual( "#button", function() {
+		$( "#button" ).button().button( "destroy" );
+	});
 });
 
 })(jQuery);
-- 
cgit v1.2.3


From f92f8bb56bf9e01ccc5d0c84e0f089c3660283d8 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 18 Jun 2012 13:26:46 -0400
Subject: Menu tests: Cleanup.

---
 tests/unit/menu/menu_core.js         |  27 +--
 tests/unit/menu/menu_events.js       | 453 +++++++++++++++++------------------
 tests/unit/menu/menu_methods.js      |  76 +++---
 tests/unit/menu/menu_options.js      |  74 +++---
 tests/unit/menu/menu_test_helpers.js |  25 +-
 5 files changed, 334 insertions(+), 321 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/menu/menu_core.js b/tests/unit/menu/menu_core.js
index 7732fd7b7..d7082664e 100644
--- a/tests/unit/menu/menu_core.js
+++ b/tests/unit/menu/menu_core.js
@@ -1,29 +1,24 @@
-/*
- * menu_core.js
- */
+(function( $ ) {
 
+module( "menu: core" );
 
-(function($) {
-
-module("menu: core");
-
-test("accessibility", function () {
-	expect(5);
+test( "accessibility", function () {
+	expect( 5 );
 	var item,
-		menu = $('#menu1').menu(),
-		item0 = $("li:eq(0) a");
+		menu = $( "#menu1" ).menu(),
+		item0 = $( "li:eq(0) a" );
 
-	ok( menu.hasClass("ui-menu ui-widget ui-widget-content ui-corner-all"), "menu class");
-	equal( menu.attr("role"), "menu", "main role");
-	ok( !menu.attr("aria-activedescendant"), "aria attribute not yet active");
+	ok( menu.hasClass( "ui-menu ui-widget ui-widget-content ui-corner-all" ), "menu class");
+	equal( menu.attr( "role" ), "menu", "main role" );
+	ok( !menu.attr( "aria-activedescendant" ), "aria attribute not yet active" );
 
 	item = menu.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
 	menu.menu( "focus", $.Event(), item );
-	equal( menu.attr("aria-activedescendant"), "xid", "aria attribute, id from dom");
+	equal( menu.attr("aria-activedescendant"), "xid", "aria attribute, id from DOM" );
 
 	item = menu.find( "li:last" );
 	menu.menu( "focus", $.Event(), item );
 	ok( /^ui-id-\d+$/.test( menu.attr( "aria-activedescendant" ) ), "aria attribute, generated id");
 });
 
-})(jQuery);
+})( jQuery );
diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index 2132ff764..944e76b57 100644
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/menu_events.js
@@ -1,50 +1,52 @@
-/*
- * menu_events.js
- */
-(function($) {
+(function( $ ) {
 
 var log = TestHelpers.menu.log,
+	logOutput = TestHelpers.menu.logOutput,
 	click = TestHelpers.menu.click;
 
-module("menu: events");
+module( "menu: events", {
+	setup: function() {
+		TestHelpers.menu.clearLog();
+	}
+});
 
-test("handle click on menu", function() {
-	expect(1);
-	var menu = $('#menu1').menu({
-		select: function(event, ui) {
+test( "handle click on menu", function() {
+	expect( 1 );
+	var menu = $( "#menu1" ).menu({
+		select: function( event, ui ) {
 			log();
 		}
 	});
-	log("click",true);
-	click($('#menu1'),"1");
-	log("afterclick");
-	click( menu,"2");
-	click($('#menu1'),"3");
-	click( menu,"1");
-	equal( $("#log").html(), "1,3,2,afterclick,1,click,", "Click order not valid.");
+	log( "click", true );
+	click( $( "#menu1" ), "1" );
+	log( "afterclick" );
+	click( menu, "2" );
+	click( $( "#menu1" ), "3" );
+	click( menu, "1" );
+	equal( logOutput(), "1,3,2,afterclick,1,click,", "Click order not valid." );
 });
 
-test("handle click on custom item menu", function() {
-	expect(1);
-	var menu = $('#menu5').menu({
-		select: function(event, ui) {
+test( "handle click on custom item menu", function() {
+	expect( 1 );
+	var menu = $( "#menu5" ).menu({
+		select: function( event, ui ) {
 			log();
 		},
 		menus: "div"
 	});
-	log("click",true);
-	click($('#menu5'),"1");
-	log("afterclick");
-	click( menu,"2");
-	click($('#menu5'),"3");
-	click( menu,"1");
-	equal( $("#log").html(), "1,3,2,afterclick,1,click,", "Click order not valid.");
+	log( "click", true );
+	click( $( "#menu5" ), "1" );
+	log( "afterclick" );
+	click( menu, "2" );
+	click( $( "#menu5" ), "3" );
+	click( menu, "1" );
+	equal( logOutput(), "1,3,2,afterclick,1,click,", "Click order not valid." );
 });
 
 asyncTest( "handle blur", function() {
 	expect( 1 );
 	var blurHandled = false,
-		$menu = $( "#menu1" ).menu({
+		menu = $( "#menu1" ).menu({
 			blur: function( event, ui ) {
 				// Ignore duplicate blur event fired by IE
 				if ( !blurHandled ) {
@@ -54,17 +56,17 @@ asyncTest( "handle blur", function() {
 			}
 		});
 
-	click( $menu, "1" );
+	click( menu, "1" );
 	setTimeout( function() {
-		$menu.blur();
+		menu.blur();
 		start();
-	}, 350);
+	}, 350 );
 });
 
 asyncTest( "handle blur on click", function() {
 	expect( 1 );
 	var blurHandled = false,
-		$menu = $( "#menu1" ).menu({
+		menu = $( "#menu1" ).menu({
 			blur: function( event, ui ) {
 				// Ignore duplicate blur event fired by IE
 				if ( !blurHandled ) {
@@ -74,12 +76,11 @@ asyncTest( "handle blur on click", function() {
 			}
 		});
 
-	click( $menu, "1" );
+	click( menu, "1" );
 	setTimeout( function() {
-		$( "<a>", { id: "remove"} ).appendTo("body").trigger( "click" );
-		$("#remove").remove();
+		$( "<a>", { id: "remove"} ).appendTo( "body" ).trigger( "click" );
 		start();
-	}, 350);
+	}, 350 );
 });
 
 test( "handle focus of menu with active item", function() {
@@ -95,226 +96,225 @@ test( "handle focus of menu with active item", function() {
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 	element.focus();
-	equal( $("#log").html(), "2,2,1,0,focus,", "current active item remains active");
+	equal( logOutput(), "2,2,1,0,focus,", "current active item remains active" );
 });
 
 asyncTest( "handle submenu auto collapse: mouseleave", function() {
 	expect( 4 );
-	var $menu = $( "#menu2" ).menu(),
+	var menu = $( "#menu2" ).menu(),
 		event = $.Event( "mouseenter" );
 
 	function menumouseleave1() {
-		equal( $menu.find( "ul[aria-expanded='true']" ).length, 1, "first submenu expanded" );
-		$menu.menu( "focus", event, $menu.find( "li:nth-child(7) li:first" ) );
+		equal( menu.find( "ul[aria-expanded='true']" ).length, 1, "first submenu expanded" );
+		menu.menu( "focus", event, menu.find( "li:nth-child(7) li:first" ) );
 		setTimeout( menumouseleave2, 350 );
 	}
 	function menumouseleave2() {
-		equal( $menu.find( "ul[aria-expanded='true']" ).length, 2, "second submenu expanded" );
-		$menu.find( "ul[aria-expanded='true']:first" ).trigger( "mouseleave" );
+		equal( menu.find( "ul[aria-expanded='true']" ).length, 2, "second submenu expanded" );
+		menu.find( "ul[aria-expanded='true']:first" ).trigger( "mouseleave" );
 		setTimeout( menumouseleave3, 350 );
 	}
 	function menumouseleave3() {
-		equal( $menu.find( "ul[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
-		$menu.trigger( "mouseleave" );
+		equal( menu.find( "ul[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
+		menu.trigger( "mouseleave" );
 		setTimeout( menumouseleave4, 350 );
 	}
 	function menumouseleave4() {
-		equal( $menu.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
+		equal( menu.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
 		start();
 	}
 
-	$menu.find( "li:nth-child(7)" ).trigger( "mouseenter" );
+	menu.find( "li:nth-child(7)" ).trigger( "mouseenter" );
 	setTimeout( menumouseleave1, 350 );
 });
 
 asyncTest( "handle submenu auto collapse: mouseleave", function() {
 	expect( 4 );
-	var $menu = $( "#menu5" ).menu( { menus: "div" } ),
+	var menu = $( "#menu5" ).menu({ menus: "div" }),
 		event = $.Event( "mouseenter" );
 
 	function menumouseleave1() {
-		equal( $menu.find( "div[aria-expanded='true']" ).length, 1, "first submenu expanded" );
-		$menu.menu( "focus", event, $menu.find( ":nth-child(7)" ).find( "div" ).eq( 0 ).children().eq( 0 ) );
+		equal( menu.find( "div[aria-expanded='true']" ).length, 1, "first submenu expanded" );
+		menu.menu( "focus", event, menu.find( ":nth-child(7)" ).find( "div" ).eq( 0 ).children().eq( 0 ) );
 		setTimeout( menumouseleave2, 350 );
 	}
 	function menumouseleave2() {
-		equal( $menu.find( "div[aria-expanded='true']" ).length, 2, "second submenu expanded" );
-		$menu.find( "div[aria-expanded='true']:first" ).trigger( "mouseleave" );
+		equal( menu.find( "div[aria-expanded='true']" ).length, 2, "second submenu expanded" );
+		menu.find( "div[aria-expanded='true']:first" ).trigger( "mouseleave" );
 		setTimeout( menumouseleave3, 350 );
 	}
 	function menumouseleave3() {
-		equal( $menu.find( "div[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
-		$menu.trigger( "mouseleave" );
+		equal( menu.find( "div[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
+		menu.trigger( "mouseleave" );
 		setTimeout( menumouseleave4, 350 );
 	}
 	function menumouseleave4() {
-		equal( $menu.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
+		equal( menu.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
 		start();
 	}
 
-	$menu.find( ":nth-child(7)" ).trigger( "mouseenter" );
+	menu.find( ":nth-child(7)" ).trigger( "mouseenter" );
 	setTimeout( menumouseleave1, 350 );
-
 });
 
 
-test("handle keyboard navigation on menu without scroll and without submenus", function() {
-	expect(12);
-	var element = $('#menu1').menu({
-		select: function(event, ui) {
-			log($(ui.item[0]).text());
+test( "handle keyboard navigation on menu without scroll and without submenus", function() {
+	expect( 12 );
+	var element = $( "#menu1" ).menu({
+		select: function( event, ui ) {
+			log( $( ui.item[0] ).text() );
 		},
 		focus: function( event, ui ) {
-			log($(event.target).find(".ui-state-focus").parent().index());
+			log( $( event.target ).find( ".ui-state-focus" ).parent().index() );
 		}
 	});
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.focus();
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equal( $("#log").html(), "2,1,0,keydown,", "Keydown DOWN");
+	equal( logOutput(), "2,1,0,keydown,", "Keydown DOWN" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equal( $("#log").html(), "1,keydown,", "Keydown UP");
+	equal( logOutput(), "1,keydown,", "Keydown UP" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-	equal( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
+	equal( logOutput(), "keydown,", "Keydown LEFT (no effect)" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-	equal( $("#log").html(), "keydown,", "Keydown RIGHT (no effect)");
+	equal( logOutput(), "keydown,", "Keydown RIGHT (no effect)" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-	equal( $("#log").html(), "4,keydown,", "Keydown PAGE_DOWN");
+	equal( logOutput(), "4,keydown,", "Keydown PAGE_DOWN" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-	equal( $("#log").html(), "keydown,", "Keydown PAGE_DOWN (no effect)");
+	equal( logOutput(), "keydown,", "Keydown PAGE_DOWN (no effect)" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-	equal( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
+	equal( logOutput(), "0,keydown,", "Keydown PAGE_UP" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-	equal( $("#log").html(), "keydown,", "Keydown PAGE_UP (no effect)");
+	equal( logOutput(), "keydown,", "Keydown PAGE_UP (no effect)" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-	equal( $("#log").html(), "4,keydown,", "Keydown END");
+	equal( logOutput(), "4,keydown,", "Keydown END" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-	equal( $("#log").html(), "0,keydown,", "Keydown HOME");
+	equal( logOutput(), "0,keydown,", "Keydown HOME" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-	equal( $("#log").html(), "keydown,", "Keydown ESCAPE (no effect)");
+	equal( logOutput(), "keydown,", "Keydown ESCAPE (no effect)" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-	equal( $("#log").html(), "Aberdeen,keydown,", "Keydown ENTER");
+	equal( logOutput(), "Aberdeen,keydown,", "Keydown ENTER" );
 });
 
-asyncTest("handle keyboard navigation on menu without scroll and with submenus", function() {
-	expect(16);
-	var element = $('#menu2').menu({
-		select: function(event, ui) {
-			log($(ui.item[0]).text());
+asyncTest( "handle keyboard navigation on menu without scroll and with submenus", function() {
+	expect( 16 );
+	var element = $( "#menu2" ).menu({
+		select: function( event, ui ) {
+			log( $( ui.item[0] ).text() );
 		},
 		focus: function( event, ui ) {
-			log($(event.target).find(".ui-state-focus").parent().index());
+			log( $( event.target ).find( ".ui-state-focus" ).parent().index() );
 		}
 	});
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.one( "menufocus", function( event, ui ) {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		equal( $("#log").html(), "2,1,keydown,", "Keydown DOWN");
+		equal( logOutput(), "2,1,keydown,", "Keydown DOWN" );
 		setTimeout( menukeyboard1, 50 );
 	});
 	element.focus();
 
 	function menukeyboard1() {
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-		equal( $("#log").html(), "0,1,keydown,", "Keydown UP");
+		equal( logOutput(), "0,1,keydown,", "Keydown UP" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
+		equal( logOutput(), "keydown,", "Keydown LEFT (no effect)" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
 
-		setTimeout( function() {
-			equal( $("#log").html(), "0,4,3,2,1,keydown,", "Keydown RIGHT (open submenu)");
-		}, 50);
-		setTimeout( menukeyboard2, 50 );
+		setTimeout(function() {
+			equal( logOutput(), "0,4,3,2,1,keydown,", "Keydown RIGHT (open submenu)" );
+			setTimeout( menukeyboard2, 50 );
+		}, 50 );
 	}
 
 	function menukeyboard2() {
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( $("#log").html(), "4,keydown,", "Keydown LEFT (close submenu)");
+		equal( logOutput(), "4,keydown,", "Keydown LEFT (close submenu)" );
 
-		//re-open submenu
+		// re-open submenu
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
 		setTimeout( menukeyboard3, 50 );
 	}
 
 	function menukeyboard3() {
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( $("#log").html(), "2,keydown,", "Keydown PAGE_DOWN");
+		equal( logOutput(), "2,keydown,", "Keydown PAGE_DOWN" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( $("#log").html(), "keydown,", "Keydown PAGE_DOWN (no effect)");
+		equal( logOutput(), "keydown,", "Keydown PAGE_DOWN (no effect)" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
+		equal( logOutput(), "0,keydown,", "Keydown PAGE_UP" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( $("#log").html(), "keydown,", "Keydown PAGE_UP (no effect)");
+		equal( logOutput(), "keydown,", "Keydown PAGE_UP (no effect)" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-		equal( $("#log").html(), "2,keydown,", "Keydown END");
+		equal( logOutput(), "2,keydown,", "Keydown END" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-		equal( $("#log").html(), "0,keydown,", "Keydown HOME");
+		equal( logOutput(), "0,keydown,", "Keydown HOME" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-		equal( $("#log").html(), "4,keydown,", "Keydown ESCAPE (close submenu)");
+		equal( logOutput(), "4,keydown,", "Keydown ESCAPE (close submenu)" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.SPACE } );
 		setTimeout( menukeyboard4, 50 );
 	}
 
 	function menukeyboard4() {
-		equal( $("#log").html(), "0,keydown,", "Keydown SPACE (open submenu)");
+		equal( logOutput(), "0,keydown,", "Keydown SPACE (open submenu)" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-		equal( $("#log").html(), "4,keydown,", "Keydown ESCAPE (close submenu)");
+		equal( logOutput(), "4,keydown,", "Keydown ESCAPE (close submenu)" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
@@ -325,9 +325,9 @@ asyncTest("handle keyboard navigation on menu without scroll and with submenus",
 				element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 				element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 				element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-				equal( $("#log").html(), "0,4,2,0,1,0,6,5,keydown,", "Keydown skip dividers and items without anchors");
+				equal( logOutput(), "0,4,2,0,1,0,6,5,keydown,", "Keydown skip dividers and items without anchors" );
 
-				log("keydown",true);
+				log( "keydown", true );
 				element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 				setTimeout( menukeyboard6, 50 );
 			}, 50 );
@@ -335,232 +335,229 @@ asyncTest("handle keyboard navigation on menu without scroll and with submenus",
 	}
 
 	function menukeyboard6() {
-		equal( $("#log").html(), "Ada,keydown,", "Keydown ENTER (open submenu)");
-
+		equal( logOutput(), "Ada,keydown,", "Keydown ENTER (open submenu)" );
 		start();
 	}
 });
 
-test("handle keyboard navigation on menu with scroll and without submenus", function() {
-	expect(14);
-	var element = $('#menu3').menu({
-		select: function(event, ui) {
-			log($(ui.item[0]).text());
+test( "handle keyboard navigation on menu with scroll and without submenus", function() {
+	expect( 14 );
+	var element = $( "#menu3" ).menu({
+		select: function( event, ui ) {
+			log( $( ui.item[0] ).text() );
 		},
 		focus: function( event, ui ) {
-			log($(event.target).find(".ui-state-focus").parent().index());
+			log( $( event.target ).find( ".ui-state-focus" ).parent().index());
 		}
 	});
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.focus();
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equal( $("#log").html(), "2,1,0,keydown,", "Keydown DOWN");
+	equal( logOutput(), "2,1,0,keydown,", "Keydown DOWN" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equal( $("#log").html(), "0,1,keydown,", "Keydown UP");
+	equal( logOutput(), "0,1,keydown,", "Keydown UP" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-	equal( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
+	equal( logOutput(), "keydown,", "Keydown LEFT (no effect)" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-	equal( $("#log").html(), "keydown,", "Keydown RIGHT (no effect)");
+	equal( logOutput(), "keydown,", "Keydown RIGHT (no effect)" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-	equal( $("#log").html(), "10,keydown,", "Keydown PAGE_DOWN");
+	equal( logOutput(), "10,keydown,", "Keydown PAGE_DOWN" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-	equal( $("#log").html(), "20,keydown,", "Keydown PAGE_DOWN");
+	equal( logOutput(), "20,keydown,", "Keydown PAGE_DOWN" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-	equal( $("#log").html(), "10,keydown,", "Keydown PAGE_UP");
+	equal( logOutput(), "10,keydown,", "Keydown PAGE_UP" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-	equal( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
+	equal( logOutput(), "0,keydown,", "Keydown PAGE_UP" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-	equal( $("#log").html(), "keydown,", "Keydown PAGE_UP (no effect)");
+	equal( logOutput(), "keydown,", "Keydown PAGE_UP (no effect)" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-	equal( $("#log").html(), "37,keydown,", "Keydown END");
+	equal( logOutput(), "37,keydown,", "Keydown END" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-	equal( $("#log").html(), "keydown,", "Keydown PAGE_DOWN (no effect)");
+	equal( logOutput(), "keydown,", "Keydown PAGE_DOWN (no effect)" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-	equal( $("#log").html(), "0,keydown,", "Keydown HOME");
+	equal( logOutput(), "0,keydown,", "Keydown HOME" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-	equal( $("#log").html(), "keydown,", "Keydown ESCAPE (no effect)");
+	equal( logOutput(), "keydown,", "Keydown ESCAPE (no effect)" );
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-	equal( $("#log").html(), "Aberdeen,keydown,", "Keydown ENTER");
+	equal( logOutput(), "Aberdeen,keydown,", "Keydown ENTER" );
 });
 
-asyncTest("handle keyboard navigation on menu with scroll and with submenus", function() {
-	expect(14);
-	var element = $('#menu4').menu({
-		select: function(event, ui) {
-			log($(ui.item[0]).text());
+asyncTest( "handle keyboard navigation on menu with scroll and with submenus", function() {
+	expect( 14 );
+	var element = $( "#menu4" ).menu({
+		select: function( event, ui ) {
+			log( $( ui.item[0] ).text() );
 		},
 		focus: function( event, ui ) {
-			log($(event.target).find(".ui-state-focus").parent().index());
+			log( $( event.target ).find( ".ui-state-focus" ).parent().index());
 		}
 	});
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.one( "menufocus", function( event, ui ) {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		equal( $("#log").html(), "2,1,keydown,", "Keydown DOWN");
+		equal( logOutput(), "2,1,keydown,", "Keydown DOWN" );
 		setTimeout( menukeyboard1, 50 );
 	});
 	element.focus();
 
-
 	function menukeyboard1() {
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-		equal( $("#log").html(), "0,1,keydown,", "Keydown UP");
+		equal( logOutput(), "0,1,keydown,", "Keydown UP" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
+		equal( logOutput(), "keydown,", "Keydown LEFT (no effect)" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
 
 		setTimeout( function() {
-			equal( $("#log").html(), "0,1,keydown,", "Keydown RIGHT (open submenu)");
-		}, 50);
+			equal( logOutput(), "0,1,keydown,", "Keydown RIGHT (open submenu)" );
+		}, 50 );
 		setTimeout( menukeyboard2, 50 );
 	}
 
 	function menukeyboard2() {
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( $("#log").html(), "1,keydown,", "Keydown LEFT (close submenu)");
+		equal( logOutput(), "1,keydown,", "Keydown LEFT (close submenu)" );
 
-		//re-open submenu
+		// re-open submenu
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
 		setTimeout( menukeyboard3, 50 );
 	}
 
 	function menukeyboard3() {
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( $("#log").html(), "10,keydown,", "Keydown PAGE_DOWN");
+		equal( logOutput(), "10,keydown,", "Keydown PAGE_DOWN" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( $("#log").html(), "20,keydown,", "Keydown PAGE_DOWN");
+		equal( logOutput(), "20,keydown,", "Keydown PAGE_DOWN" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( $("#log").html(), "10,keydown,", "Keydown PAGE_UP");
+		equal( logOutput(), "10,keydown,", "Keydown PAGE_UP" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
+		equal( logOutput(), "0,keydown,", "Keydown PAGE_UP" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-		equal( $("#log").html(), "27,keydown,", "Keydown END");
+		equal( logOutput(), "27,keydown,", "Keydown END" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-		equal( $("#log").html(), "0,keydown,", "Keydown HOME");
+		equal( logOutput(), "0,keydown,", "Keydown HOME" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-		equal( $("#log").html(), "1,keydown,", "Keydown ESCAPE (close submenu)");
+		equal( logOutput(), "1,keydown,", "Keydown ESCAPE (close submenu)" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 		setTimeout( menukeyboard4, 50 );
 	}
 
 	function menukeyboard4() {
-		equal( $("#log").html(), "0,keydown,", "Keydown ENTER (open submenu)");
+		equal( logOutput(), "0,keydown,", "Keydown ENTER (open submenu)" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-		equal( $("#log").html(), "Aberdeen,keydown,", "Keydown ENTER (select item)");
+		equal( logOutput(), "Aberdeen,keydown,", "Keydown ENTER (select item)" );
 
 		start();
 	}
 });
 
-asyncTest("handle keyboard navigation and mouse click on menu with disabled items", function() {
-	expect(6);
-	var element = $('#menu6').menu({
-		select: function(event, ui) {
-			log($(ui.item[0]).text());
+asyncTest( "handle keyboard navigation and mouse click on menu with disabled items", function() {
+	expect( 6 );
+	var element = $( "#menu6" ).menu({
+		select: function( event, ui ) {
+			log( $( ui.item[0] ).text() );
 		},
 		focus: function( event, ui ) {
-			log($(event.target).find(".ui-state-focus").parent().index());
+			log( $( event.target ).find( ".ui-state-focus" ).parent().index());
 		}
 	});
 
-	log("keydown",true);
+	log( "keydown", true );
 	element.one( "menufocus", function( event, ui ) {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-		equal( $("#log").html(), "1,keydown,", "Keydown focus but not select disabled item");
+		equal( logOutput(), "1,keydown,", "Keydown focus but not select disabled item" );
 		setTimeout( menukeyboard1, 50 );
 	});
 	element.focus();
 
-
 	function menukeyboard1() {
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		equal( $("#log").html(), "4,3,2,keydown,", "Keydown focus disabled item with submenu");
+		equal( logOutput(), "4,3,2,keydown,", "Keydown focus disabled item with submenu" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
+		equal( logOutput(), "keydown,", "Keydown LEFT (no effect)" );
 
-		log("keydown",true);
+		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
 
 		setTimeout( function() {
-			equal( $("#log").html(), "keydown,", "Keydown RIGHT (no effect on disabled sub-menu)");
+			equal( logOutput(), "keydown,", "Keydown RIGHT (no effect on disabled sub-menu)" );
 
-			log("keydown",true);
+			log( "keydown", true );
 			element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 
 			setTimeout( function() {
-				equal( $("#log").html(), "keydown,", "Keydown ENTER (no effect on disabled sub-menu)");
-				log("click",true);
+				equal( logOutput(), "keydown,", "Keydown ENTER (no effect on disabled sub-menu)" );
+				log( "click", true );
 				click( element, "1" );
-				equal( $("#log").html(), "click,", "Click disabled item (no effect)");
+				equal( logOutput(), "click,", "Click disabled item (no effect)" );
 				start();
-			}, 50);
-		}, 50);
+			}, 50 );
+		}, 50 );
 	}
 });
 
-test("handle keyboard navigation with spelling of menu items", function() {
+test( "handle keyboard navigation with spelling of menu items", function() {
 	expect( 2 );
 	var element = $( "#menu2" ).menu({
 		focus: function( event, ui ) {
@@ -573,14 +570,14 @@ test("handle keyboard navigation with spelling of menu items", function() {
 		element.simulate( "keydown", { keyCode: 65 } );
 		element.simulate( "keydown", { keyCode: 68 } );
 		element.simulate( "keydown", { keyCode: 68 } );
-		equal( $("#log").html(), "3,1,0,keydown,", "Keydown focus Addyston by spelling the first 3 letters");
+		equal( logOutput(), "3,1,0,keydown,", "Keydown focus Addyston by spelling the first 3 letters" );
 		element.simulate( "keydown", { keyCode: 68 } );
-		equal( $("#log").html(), "4,3,1,0,keydown,", "Keydown focus Delphi by repeating the 'd' again");
+		equal( logOutput(), "4,3,1,0,keydown,", "Keydown focus Delphi by repeating the 'd' again" );
 	});
 	element.focus();
 });
 
-asyncTest("handle page up and page down before the menu has focus", function() {
+asyncTest( "handle page up and page down before the menu has focus", function() {
 	expect( 1 );
 	var element = $( "#menu1" ).menu({
 		focus: function( event, ui ) {
@@ -593,9 +590,9 @@ asyncTest("handle page up and page down before the menu has focus", function() {
 	element.blur();
 	setTimeout( function() {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( $("#log").html(), "0,0,keydown,", "Page Up and Page Down bring initial focus to first item");
+		equal( logOutput(), "0,0,keydown,", "Page Up and Page Down bring initial focus to first item" );
 		start();
-	}, 500);
+	}, 500 );
 });
 
-})(jQuery);
+})( jQuery );
diff --git a/tests/unit/menu/menu_methods.js b/tests/unit/menu/menu_methods.js
index 3a7b2d8fe..faaa7609f 100644
--- a/tests/unit/menu/menu_methods.js
+++ b/tests/unit/menu/menu_methods.js
@@ -1,61 +1,63 @@
-/*
- * menu_methods.js
- */
-(function($) {
+(function( $ ) {
 
 var log = TestHelpers.menu.log,
+	logOutput = TestHelpers.menu.logOutput,
 	click = TestHelpers.menu.click;
 
-module("menu: methods");
+module( "menu: methods", {
+	setup: function() {
+		TestHelpers.menu.clearLog();
+	}
+});
 
 test( "enable/disable", function() {
 	expect( 3 );
 	var menu = $( "#menu1" ).menu({
-		select: function(event, ui) {
+		select: function( event, ui ) {
 			log();
 		}
 	});
-	menu.menu("disable");
-	ok(menu.is(".ui-state-disabled"),"Missing ui-state-disabled class");
-	log("click",true);
-	click(menu,"1");
-	log("afterclick");
-	menu.menu("enable");
-	ok(menu.not(".ui-state-disabled"),"Has ui-state-disabled class");
-	log("click");
-	click(menu,"1");
-	log("afterclick");
-	equal( $("#log").html(), "afterclick,1,click,afterclick,click,", "Click order not valid.");
+	menu.menu( "disable" );
+	ok(menu.is( ".ui-state-disabled" ),"Missing ui-state-disabled class" );
+	log( "click", true );
+	click( menu, "1" );
+	log( "afterclick" );
+	menu.menu( "enable" );
+	ok(menu.not( ".ui-state-disabled" ),"Has ui-state-disabled class" );
+	log( "click" );
+	click( menu, "1" );
+	log( "afterclick" );
+	equal( logOutput(), "afterclick,1,click,afterclick,click,", "Click order not valid." );
 });
 
 test( "refresh", function() {
 	expect( 5 );
 	var menu = $( "#menu1" ).menu();
-	equal(menu.find(".ui-menu-item").length,5,"Incorrect number of menu items");
-	menu.append("<li><a href='#'>test item</a></li>").menu("refresh");
-	equal(menu.find(".ui-menu-item").length,6,"Incorrect number of menu items");
-	menu.find(".ui-menu-item:last").remove().end().menu("refresh");
-	equal(menu.find(".ui-menu-item").length,5,"Incorrect number of menu items");
-	menu.append("<li>---</li>").menu("refresh");
-	equal(menu.find(".ui-menu-item").length,5,"Incorrect number of menu items");
-	menu.children(":last").remove().end().menu("refresh");
-	equal(menu.find(".ui-menu-item").length,5,"Incorrect number of menu items");
+	equal( menu.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
+	menu.append( "<li><a href='#'>test item</a></li>" ).menu( "refresh" );
+	equal( menu.find( ".ui-menu-item" ).length, 6, "Incorrect number of menu items" );
+	menu.find( ".ui-menu-item:last" ).remove().end().menu( "refresh" );
+	equal( menu.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
+	menu.append( "<li>---</li>" ).menu( "refresh" );
+	equal( menu.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
+	menu.children( ":last" ).remove().end().menu( "refresh" );
+	equal( menu.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
 });
 
-test("destroy", function() {
-	domEqual("#menu1", function() {
-		$("#menu1").menu().menu("destroy");
+test( "destroy", function() {
+	expect( 4 );
+	domEqual( "#menu1", function() {
+		$( "#menu1" ).menu().menu( "destroy" );
 	});
-	domEqual("#menu2", function() {
-		$("#menu2").menu().menu("destroy");
+	domEqual( "#menu2", function() {
+		$( "#menu2" ).menu().menu( "destroy" );
 	});
-	domEqual("#menu5", function() {
-		$("#menu5").menu().menu("destroy");
+	domEqual( "#menu5", function() {
+		$( "#menu5").menu().menu( "destroy" );
 	});
-	domEqual("#menu6", function() {
-		$("#menu6").menu().menu("destroy");
+	domEqual( "#menu6", function() {
+		$( "#menu6" ).menu().menu( "destroy" );
 	});
 });
 
-
-})(jQuery);
+})( jQuery );
diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js
index 306f575ea..df2ae4380 100644
--- a/tests/unit/menu/menu_options.js
+++ b/tests/unit/menu/menu_options.js
@@ -1,12 +1,14 @@
-/*
- * menu_options.js
- */
-(function($) {
+(function( $ ) {
 
 var log = TestHelpers.menu.log,
+	logOutput = TestHelpers.menu.logOutput,
 	click = TestHelpers.menu.click;
 
-module("menu: options");
+module( "menu: options", {
+	setup: function() {
+		TestHelpers.menu.clearLog();
+	}
+});
 
 test( "{ disabled: true }", function() {
 	expect( 2 );
@@ -16,52 +18,54 @@ test( "{ disabled: true }", function() {
 			log();
 		}
 	});
-	ok(menu.is(".ui-state-disabled"),"Missing ui-state-disabled class");
-	log("click",true);
-	click(menu,"1");
-	log("afterclick");
-	equal( $("#log").html(), "afterclick,click,", "Click order not valid.");
+	ok( menu.is( ".ui-state-disabled" ), "Missing ui-state-disabled class" );
+	log( "click", true );
+	click( menu, "1" );
+	log( "afterclick" );
+	equal( logOutput(), "afterclick,click,", "Click order not valid." );
 });
 
 test( "{ disabled: false }", function() {
 	expect( 2 );
 	var menu = $( "#menu1" ).menu({
 		disabled: false,
-		select: function(event, ui) {
+		select: function( event, ui ) {
 			log();
 		}
 	});
-	ok(menu.not(".ui-state-disabled"),"Has ui-state-disabled class");
-	log("click",true);
-	click(menu,"1");
-	log("afterclick");
-	equal( $("#log").html(), "afterclick,1,click,", "Click order not valid.");
+	ok( menu.not( ".ui-state-disabled" ), "Has ui-state-disabled class" );
+	log( "click", true );
+	click( menu, "1" );
+	log( "afterclick" );
+	equal( logOutput(), "afterclick,1,click,", "Click order not valid." );
 });
 
-test("{ role: 'menu' } ", function () {
-	var menu = $('#menu1').menu();
-	expect(2 + 5 * $("li", menu).length);
+test( "{ role: 'menu' } ", function () {
+	var menu = $( "#menu1" ).menu(),
+		items = menu.find( "li" );
+	expect( 2 + 5 * items.length );
 	equal( menu.attr( "role" ), "menu" );
-	ok( $("li", menu).length > 0, "number of menu items");
-	$("li", menu).each(function(item) {
-		ok( $(this).hasClass("ui-menu-item"), "menu item ("+ item + ") class for item");
-		equal( $(this).attr("role"), "presentation", "menu item ("+ item + ") role");
-		equal( $("a", this).attr("role"), "menuitem", "menu item ("+ item + ") role");
-		ok( $("a",this).hasClass("ui-corner-all"), "a element class for menu item ("+ item + ") ");
-		equal( $("a",this).attr("tabindex"), "-1", "a element tabindex for menu item ("+ item + ") ");
+	ok( items.length > 0, "number of menu items" );
+	items.each(function( item ) {
+		ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" );
+		equal( $( this ).attr( "role" ), "presentation", "menu item ("+ item + ") role" );
+		equal( $( "a", this ).attr( "role" ), "menuitem", "menu item ("+ item + ") role" );
+		ok( $( "a", this ).hasClass( "ui-corner-all" ), "a element class for menu item ("+ item + ") " );
+		equal( $( "a", this ).attr( "tabindex" ), "-1", "a element tabindex for menu item ("+ item + ") " );
 	});
 });
 
-test("{ role: 'listbox' } ", function () {
-	var menu = $('#menu1').menu({
-		role: "listbox"
-	});
-	expect(2 + $("li", menu).length);
+test( "{ role: 'listbox' } ", function () {
+	var menu = $( "#menu1" ).menu({
+			role: "listbox"
+		}),
+		items = menu.find( "li" );
+	expect(2 + items.length);
 	equal( menu.attr( "role" ), "listbox" );
-	ok( ($("li", menu).length > 0 ), "number of menu items");
-	$("li", menu).each(function(item) {
-		equal( $("a", this).attr("role"), "option", "menu item ("+ item + ") role");
+	ok( items.length > 0, "number of menu items" );
+	items.each(function( item ) {
+		equal( $( "a", this ).attr( "role" ), "option", "menu item ("+ item + ") role" );
 	});
 });
 
-})(jQuery);
+})( jQuery );
diff --git a/tests/unit/menu/menu_test_helpers.js b/tests/unit/menu/menu_test_helpers.js
index a576af19a..820cbcdce 100644
--- a/tests/unit/menu/menu_test_helpers.js
+++ b/tests/unit/menu/menu_test_helpers.js
@@ -1,16 +1,31 @@
+(function() {
+
+var lastItem,
+	log = [];
+
 TestHelpers.menu = {
 	log: function( message, clear ) {
 		if ( clear ) {
-			$( "#log" ).empty();
+			log.length = 0;
 		}
 		if ( message === undefined ) {
-			message = $( "#log" ).data( "lastItem" );
+			message = lastItem;
 		}
-		$( "#log" ).prepend( $.trim( message ) + "," );
+		log.unshift( $.trim( message ) );
+	},
+
+	logOutput: function() {
+		return log.join( "," ) + ",";
+	},
+
+	clearLog: function() {
+		log.length = 0;
 	},
 
 	click: function( menu, item ) {
-		$( "#log" ).data( "lastItem", item );
+		lastItem = item;
 		menu.children( ":eq(" + item + ")" ).find( "a:first" ).trigger( "click" );
 	}
-};
\ No newline at end of file
+};
+
+})();
-- 
cgit v1.2.3


From 156f07b48a9476250f4fdbd8816080cf1a9f58c5 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 18 Jun 2012 13:38:16 -0400
Subject: Menu tests: Saner output for log helper.

---
 tests/unit/menu/menu.html            |   2 -
 tests/unit/menu/menu_events.js       | 136 +++++++++++++++++------------------
 tests/unit/menu/menu_methods.js      |   2 +-
 tests/unit/menu/menu_options.js      |   4 +-
 tests/unit/menu/menu_test_helpers.js |   4 +-
 5 files changed, 73 insertions(+), 75 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/menu/menu.html b/tests/unit/menu/menu.html
index 31c29a924..c58b9fc65 100644
--- a/tests/unit/menu/menu.html
+++ b/tests/unit/menu/menu.html
@@ -268,8 +268,6 @@
 	<li class="foo"><a class="foo" href="#">Saarland</a></li>
 </ul>
 
-<div id="log"></div>
-
 </div>
 </body>
 </html>
diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index 944e76b57..44c792fb4 100644
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/menu_events.js
@@ -23,7 +23,7 @@ test( "handle click on menu", function() {
 	click( menu, "2" );
 	click( $( "#menu1" ), "3" );
 	click( menu, "1" );
-	equal( logOutput(), "1,3,2,afterclick,1,click,", "Click order not valid." );
+	equal( logOutput(), "click,1,afterclick,2,3,1", "Click order not valid." );
 });
 
 test( "handle click on custom item menu", function() {
@@ -40,7 +40,7 @@ test( "handle click on custom item menu", function() {
 	click( menu, "2" );
 	click( $( "#menu5" ), "3" );
 	click( menu, "1" );
-	equal( logOutput(), "1,3,2,afterclick,1,click,", "Click order not valid." );
+	equal( logOutput(), "click,1,afterclick,2,3,1", "Click order not valid." );
 });
 
 asyncTest( "handle blur", function() {
@@ -96,7 +96,7 @@ test( "handle focus of menu with active item", function() {
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 	element.focus();
-	equal( logOutput(), "2,2,1,0,focus,", "current active item remains active" );
+	equal( logOutput(), "focus,0,1,2,2", "current active item remains active" );
 });
 
 asyncTest( "handle submenu auto collapse: mouseleave", function() {
@@ -173,51 +173,51 @@ test( "handle keyboard navigation on menu without scroll and without submenus",
 	element.focus();
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equal( logOutput(), "2,1,0,keydown,", "Keydown DOWN" );
+	equal( logOutput(), "keydown,0,1,2", "Keydown DOWN" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equal( logOutput(), "1,keydown,", "Keydown UP" );
+	equal( logOutput(), "keydown,1", "Keydown UP" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-	equal( logOutput(), "keydown,", "Keydown LEFT (no effect)" );
+	equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-	equal( logOutput(), "keydown,", "Keydown RIGHT (no effect)" );
+	equal( logOutput(), "keydown", "Keydown RIGHT (no effect)" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-	equal( logOutput(), "4,keydown,", "Keydown PAGE_DOWN" );
+	equal( logOutput(), "keydown,4", "Keydown PAGE_DOWN" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-	equal( logOutput(), "keydown,", "Keydown PAGE_DOWN (no effect)" );
+	equal( logOutput(), "keydown", "Keydown PAGE_DOWN (no effect)" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-	equal( logOutput(), "0,keydown,", "Keydown PAGE_UP" );
+	equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-	equal( logOutput(), "keydown,", "Keydown PAGE_UP (no effect)" );
+	equal( logOutput(), "keydown", "Keydown PAGE_UP (no effect)" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-	equal( logOutput(), "4,keydown,", "Keydown END" );
+	equal( logOutput(), "keydown,4", "Keydown END" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-	equal( logOutput(), "0,keydown,", "Keydown HOME" );
+	equal( logOutput(), "keydown,0", "Keydown HOME" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-	equal( logOutput(), "keydown,", "Keydown ESCAPE (no effect)" );
+	equal( logOutput(), "keydown", "Keydown ESCAPE (no effect)" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-	equal( logOutput(), "Aberdeen,keydown,", "Keydown ENTER" );
+	equal( logOutput(), "keydown,Aberdeen", "Keydown ENTER" );
 });
 
 asyncTest( "handle keyboard navigation on menu without scroll and with submenus", function() {
@@ -235,7 +235,7 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
 	element.one( "menufocus", function( event, ui ) {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		equal( logOutput(), "2,1,keydown,", "Keydown DOWN" );
+		equal( logOutput(), "keydown,1,2", "Keydown DOWN" );
 		setTimeout( menukeyboard1, 50 );
 	});
 	element.focus();
@@ -244,11 +244,11 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-		equal( logOutput(), "0,1,keydown,", "Keydown UP" );
+		equal( logOutput(), "keydown,1,0", "Keydown UP" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( logOutput(), "keydown,", "Keydown LEFT (no effect)" );
+		equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
@@ -258,7 +258,7 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
 
 		setTimeout(function() {
-			equal( logOutput(), "0,4,3,2,1,keydown,", "Keydown RIGHT (open submenu)" );
+			equal( logOutput(), "keydown,1,2,3,4,0", "Keydown RIGHT (open submenu)" );
 			setTimeout( menukeyboard2, 50 );
 		}, 50 );
 	}
@@ -266,7 +266,7 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
 	function menukeyboard2() {
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( logOutput(), "4,keydown,", "Keydown LEFT (close submenu)" );
+		equal( logOutput(), "keydown,4", "Keydown LEFT (close submenu)" );
 
 		// re-open submenu
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
@@ -276,31 +276,31 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
 	function menukeyboard3() {
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( logOutput(), "2,keydown,", "Keydown PAGE_DOWN" );
+		equal( logOutput(), "keydown,2", "Keydown PAGE_DOWN" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( logOutput(), "keydown,", "Keydown PAGE_DOWN (no effect)" );
+		equal( logOutput(), "keydown", "Keydown PAGE_DOWN (no effect)" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( logOutput(), "0,keydown,", "Keydown PAGE_UP" );
+		equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( logOutput(), "keydown,", "Keydown PAGE_UP (no effect)" );
+		equal( logOutput(), "keydown", "Keydown PAGE_UP (no effect)" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-		equal( logOutput(), "2,keydown,", "Keydown END" );
+		equal( logOutput(), "keydown,2", "Keydown END" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-		equal( logOutput(), "0,keydown,", "Keydown HOME" );
+		equal( logOutput(), "keydown,0", "Keydown HOME" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-		equal( logOutput(), "4,keydown,", "Keydown ESCAPE (close submenu)" );
+		equal( logOutput(), "keydown,4", "Keydown ESCAPE (close submenu)" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.SPACE } );
@@ -308,11 +308,11 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
 	}
 
 	function menukeyboard4() {
-		equal( logOutput(), "0,keydown,", "Keydown SPACE (open submenu)" );
+		equal( logOutput(), "keydown,0", "Keydown SPACE (open submenu)" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-		equal( logOutput(), "4,keydown,", "Keydown ESCAPE (close submenu)" );
+		equal( logOutput(), "keydown,4", "Keydown ESCAPE (close submenu)" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
@@ -325,7 +325,7 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
 				element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 				element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 				element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-				equal( logOutput(), "0,4,2,0,1,0,6,5,keydown,", "Keydown skip dividers and items without anchors" );
+				equal( logOutput(), "keydown,5,6,0,1,0,2,4,0", "Keydown skip dividers and items without anchors" );
 
 				log( "keydown", true );
 				element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
@@ -335,7 +335,7 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
 	}
 
 	function menukeyboard6() {
-		equal( logOutput(), "Ada,keydown,", "Keydown ENTER (open submenu)" );
+		equal( logOutput(), "keydown,Ada", "Keydown ENTER (open submenu)" );
 		start();
 	}
 });
@@ -355,60 +355,60 @@ test( "handle keyboard navigation on menu with scroll and without submenus", fun
 	element.focus();
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equal( logOutput(), "2,1,0,keydown,", "Keydown DOWN" );
+	equal( logOutput(), "keydown,0,1,2", "Keydown DOWN" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equal( logOutput(), "0,1,keydown,", "Keydown UP" );
+	equal( logOutput(), "keydown,1,0", "Keydown UP" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-	equal( logOutput(), "keydown,", "Keydown LEFT (no effect)" );
+	equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-	equal( logOutput(), "keydown,", "Keydown RIGHT (no effect)" );
+	equal( logOutput(), "keydown", "Keydown RIGHT (no effect)" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-	equal( logOutput(), "10,keydown,", "Keydown PAGE_DOWN" );
+	equal( logOutput(), "keydown,10", "Keydown PAGE_DOWN" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-	equal( logOutput(), "20,keydown,", "Keydown PAGE_DOWN" );
+	equal( logOutput(), "keydown,20", "Keydown PAGE_DOWN" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-	equal( logOutput(), "10,keydown,", "Keydown PAGE_UP" );
+	equal( logOutput(), "keydown,10", "Keydown PAGE_UP" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-	equal( logOutput(), "0,keydown,", "Keydown PAGE_UP" );
+	equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-	equal( logOutput(), "keydown,", "Keydown PAGE_UP (no effect)" );
+	equal( logOutput(), "keydown", "Keydown PAGE_UP (no effect)" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-	equal( logOutput(), "37,keydown,", "Keydown END" );
+	equal( logOutput(), "keydown,37", "Keydown END" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-	equal( logOutput(), "keydown,", "Keydown PAGE_DOWN (no effect)" );
+	equal( logOutput(), "keydown", "Keydown PAGE_DOWN (no effect)" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-	equal( logOutput(), "0,keydown,", "Keydown HOME" );
+	equal( logOutput(), "keydown,0", "Keydown HOME" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-	equal( logOutput(), "keydown,", "Keydown ESCAPE (no effect)" );
+	equal( logOutput(), "keydown", "Keydown ESCAPE (no effect)" );
 
 	log( "keydown", true );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-	equal( logOutput(), "Aberdeen,keydown,", "Keydown ENTER" );
+	equal( logOutput(), "keydown,Aberdeen", "Keydown ENTER" );
 });
 
 asyncTest( "handle keyboard navigation on menu with scroll and with submenus", function() {
@@ -426,7 +426,7 @@ asyncTest( "handle keyboard navigation on menu with scroll and with submenus", f
 	element.one( "menufocus", function( event, ui ) {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		equal( logOutput(), "2,1,keydown,", "Keydown DOWN" );
+		equal( logOutput(), "keydown,1,2", "Keydown DOWN" );
 		setTimeout( menukeyboard1, 50 );
 	});
 	element.focus();
@@ -435,18 +435,18 @@ asyncTest( "handle keyboard navigation on menu with scroll and with submenus", f
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-		equal( logOutput(), "0,1,keydown,", "Keydown UP" );
+		equal( logOutput(), "keydown,1,0", "Keydown UP" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( logOutput(), "keydown,", "Keydown LEFT (no effect)" );
+		equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
 
 		setTimeout( function() {
-			equal( logOutput(), "0,1,keydown,", "Keydown RIGHT (open submenu)" );
+			equal( logOutput(), "keydown,1,0", "Keydown RIGHT (open submenu)" );
 		}, 50 );
 		setTimeout( menukeyboard2, 50 );
 	}
@@ -454,7 +454,7 @@ asyncTest( "handle keyboard navigation on menu with scroll and with submenus", f
 	function menukeyboard2() {
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( logOutput(), "1,keydown,", "Keydown LEFT (close submenu)" );
+		equal( logOutput(), "keydown,1", "Keydown LEFT (close submenu)" );
 
 		// re-open submenu
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
@@ -464,31 +464,31 @@ asyncTest( "handle keyboard navigation on menu with scroll and with submenus", f
 	function menukeyboard3() {
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( logOutput(), "10,keydown,", "Keydown PAGE_DOWN" );
+		equal( logOutput(), "keydown,10", "Keydown PAGE_DOWN" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal( logOutput(), "20,keydown,", "Keydown PAGE_DOWN" );
+		equal( logOutput(), "keydown,20", "Keydown PAGE_DOWN" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( logOutput(), "10,keydown,", "Keydown PAGE_UP" );
+		equal( logOutput(), "keydown,10", "Keydown PAGE_UP" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( logOutput(), "0,keydown,", "Keydown PAGE_UP" );
+		equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-		equal( logOutput(), "27,keydown,", "Keydown END" );
+		equal( logOutput(), "keydown,27", "Keydown END" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-		equal( logOutput(), "0,keydown,", "Keydown HOME" );
+		equal( logOutput(), "keydown,0", "Keydown HOME" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-		equal( logOutput(), "1,keydown,", "Keydown ESCAPE (close submenu)" );
+		equal( logOutput(), "keydown,1", "Keydown ESCAPE (close submenu)" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
@@ -496,11 +496,11 @@ asyncTest( "handle keyboard navigation on menu with scroll and with submenus", f
 	}
 
 	function menukeyboard4() {
-		equal( logOutput(), "0,keydown,", "Keydown ENTER (open submenu)" );
+		equal( logOutput(), "keydown,0", "Keydown ENTER (open submenu)" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-		equal( logOutput(), "Aberdeen,keydown,", "Keydown ENTER (select item)" );
+		equal( logOutput(), "keydown,Aberdeen", "Keydown ENTER (select item)" );
 
 		start();
 	}
@@ -521,7 +521,7 @@ asyncTest( "handle keyboard navigation and mouse click on menu with disabled ite
 	element.one( "menufocus", function( event, ui ) {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-		equal( logOutput(), "1,keydown,", "Keydown focus but not select disabled item" );
+		equal( logOutput(), "keydown,1", "Keydown focus but not select disabled item" );
 		setTimeout( menukeyboard1, 50 );
 	});
 	element.focus();
@@ -531,26 +531,26 @@ asyncTest( "handle keyboard navigation and mouse click on menu with disabled ite
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		equal( logOutput(), "4,3,2,keydown,", "Keydown focus disabled item with submenu" );
+		equal( logOutput(), "keydown,2,3,4", "Keydown focus disabled item with submenu" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-		equal( logOutput(), "keydown,", "Keydown LEFT (no effect)" );
+		equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
 
 		log( "keydown", true );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
 
 		setTimeout( function() {
-			equal( logOutput(), "keydown,", "Keydown RIGHT (no effect on disabled sub-menu)" );
+			equal( logOutput(), "keydown", "Keydown RIGHT (no effect on disabled sub-menu)" );
 
 			log( "keydown", true );
 			element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 
 			setTimeout( function() {
-				equal( logOutput(), "keydown,", "Keydown ENTER (no effect on disabled sub-menu)" );
+				equal( logOutput(), "keydown", "Keydown ENTER (no effect on disabled sub-menu)" );
 				log( "click", true );
 				click( element, "1" );
-				equal( logOutput(), "click,", "Click disabled item (no effect)" );
+				equal( logOutput(), "click", "Click disabled item (no effect)" );
 				start();
 			}, 50 );
 		}, 50 );
@@ -570,9 +570,9 @@ test( "handle keyboard navigation with spelling of menu items", function() {
 		element.simulate( "keydown", { keyCode: 65 } );
 		element.simulate( "keydown", { keyCode: 68 } );
 		element.simulate( "keydown", { keyCode: 68 } );
-		equal( logOutput(), "3,1,0,keydown,", "Keydown focus Addyston by spelling the first 3 letters" );
+		equal( logOutput(), "keydown,0,1,3", "Keydown focus Addyston by spelling the first 3 letters" );
 		element.simulate( "keydown", { keyCode: 68 } );
-		equal( logOutput(), "4,3,1,0,keydown,", "Keydown focus Delphi by repeating the 'd' again" );
+		equal( logOutput(), "keydown,0,1,3,4", "Keydown focus Delphi by repeating the 'd' again" );
 	});
 	element.focus();
 });
@@ -590,7 +590,7 @@ asyncTest( "handle page up and page down before the menu has focus", function()
 	element.blur();
 	setTimeout( function() {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal( logOutput(), "0,0,keydown,", "Page Up and Page Down bring initial focus to first item" );
+		equal( logOutput(), "keydown,0,0", "Page Up and Page Down bring initial focus to first item" );
 		start();
 	}, 500 );
 });
diff --git a/tests/unit/menu/menu_methods.js b/tests/unit/menu/menu_methods.js
index faaa7609f..cd6728266 100644
--- a/tests/unit/menu/menu_methods.js
+++ b/tests/unit/menu/menu_methods.js
@@ -27,7 +27,7 @@ test( "enable/disable", function() {
 	log( "click" );
 	click( menu, "1" );
 	log( "afterclick" );
-	equal( logOutput(), "afterclick,1,click,afterclick,click,", "Click order not valid." );
+	equal( logOutput(), "click,afterclick,click,1,afterclick", "Click order not valid." );
 });
 
 test( "refresh", function() {
diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js
index df2ae4380..a25b59a2c 100644
--- a/tests/unit/menu/menu_options.js
+++ b/tests/unit/menu/menu_options.js
@@ -22,7 +22,7 @@ test( "{ disabled: true }", function() {
 	log( "click", true );
 	click( menu, "1" );
 	log( "afterclick" );
-	equal( logOutput(), "afterclick,click,", "Click order not valid." );
+	equal( logOutput(), "click,afterclick", "Click order not valid." );
 });
 
 test( "{ disabled: false }", function() {
@@ -37,7 +37,7 @@ test( "{ disabled: false }", function() {
 	log( "click", true );
 	click( menu, "1" );
 	log( "afterclick" );
-	equal( logOutput(), "afterclick,1,click,", "Click order not valid." );
+	equal( logOutput(), "click,1,afterclick", "Click order not valid." );
 });
 
 test( "{ role: 'menu' } ", function () {
diff --git a/tests/unit/menu/menu_test_helpers.js b/tests/unit/menu/menu_test_helpers.js
index 820cbcdce..b6c09ad7a 100644
--- a/tests/unit/menu/menu_test_helpers.js
+++ b/tests/unit/menu/menu_test_helpers.js
@@ -11,11 +11,11 @@ TestHelpers.menu = {
 		if ( message === undefined ) {
 			message = lastItem;
 		}
-		log.unshift( $.trim( message ) );
+		log.push( $.trim( message ) );
 	},
 
 	logOutput: function() {
-		return log.join( "," ) + ",";
+		return log.join( "," );
 	},
 
 	clearLog: function() {
-- 
cgit v1.2.3


From 8f6c656c280354111302bc352bde0f9db4d1ba54 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Tue, 19 Jun 2012 17:08:38 +0200
Subject: Core: Make uniqueId test pass in IE6/7 with jQuery 1.6, where
 undefined id is returned as empty string

---
 tests/unit/core/core.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/core/core.js b/tests/unit/core/core.js
index db9d82819..a77e618aa 100644
--- a/tests/unit/core/core.js
+++ b/tests/unit/core/core.js
@@ -156,11 +156,13 @@ test( "outerHeight(true) - setter", function() {
 test( "uniqueId / removeUniqueId", function() {
 	var el = $( "img" ).eq( 0 );
 
-	equal( el.attr( "id" ), undefined, "element has no initial id" );
+	// TODO use equal(id, undefined) when dropping jQuery 1.6 support (or IE6/7)
+	ok( !el.attr( "id" ), "element has no initial id" );
 	el.uniqueId();
 	ok( /ui-id-\d+$/.test( el.attr( "id" ) ), "element has generated id" );
 	el.removeUniqueId();
-	equal( el.attr( "id" ), undefined, "unique id has been removed from element" );
+	// TODO see above
+	ok( !el.attr( "id" ), "unique id has been removed from element" );
 });
 
 })( jQuery );
-- 
cgit v1.2.3


From 0fcf37fba6126c24c1ff9a5e2979fd565a9b4cec Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Tue, 19 Jun 2012 17:12:38 +0200
Subject: Tooltip: Make title-tests pass in IE6/7 with jQuery 1.6, where
 undefined attribute is returned as empty string

---
 tests/unit/tooltip/tooltip_core.js    | 3 ++-
 tests/unit/tooltip/tooltip_methods.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/tooltip/tooltip_core.js b/tests/unit/tooltip/tooltip_core.js
index 1c8817aa8..52941784f 100644
--- a/tests/unit/tooltip/tooltip_core.js
+++ b/tests/unit/tooltip/tooltip_core.js
@@ -34,7 +34,8 @@ test( "accessibility", function() {
 	equal( element.attr( "aria-describedby" ), "fixture-span " + tooltipId,
 		"multiple describedby when open" );
 	// strictEqual to distinguish between .removeAttr( "title" ) and .attr( "title", "" )
-	strictEqual( element.attr( "title" ), undefined, "no title when open" );
+	// TODO actually use strictEqual(..., undefined, msg) when dropping jQuery 1.6 support (or IE6/7)
+	ok( !element.attr( "title" ), "no title when open" );
 	element.tooltip( "close" );
 	equal( element.attr( "aria-describedby" ), "fixture-span",
 		"correct describedby when closed" );
diff --git a/tests/unit/tooltip/tooltip_methods.js b/tests/unit/tooltip/tooltip_methods.js
index 1b8cd2bf2..33ce44764 100644
--- a/tests/unit/tooltip/tooltip_methods.js
+++ b/tests/unit/tooltip/tooltip_methods.js
@@ -42,7 +42,8 @@ test( "enable/disable", function() {
 
 	element.tooltip( "disable" );
 	equal( $( ".ui-tooltip" ).length, 0, "no tooltip when disabled" );
-	equal( tooltip.attr( "title" ), undefined, "title removed on disable" );
+	// TODO use equal(..., undefined, msg) when dropping jQuery 1.6 support (or IE6/7)
+	ok( !tooltip.attr( "title" ), "title removed on disable" );
 
 	element.tooltip( "open" );
 	equal( $( ".ui-tooltip" ).length, 0, "open does nothing when disabled" );
-- 
cgit v1.2.3


From f612a41b18aa9aced54cfe7a42dd4aa7728027e1 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 25 Jun 2012 13:05:01 -0400
Subject: Effects tests: Convert step callback to a no-op after first call in
 animateClass test.

---
 tests/unit/effects/effects_core.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js
index 60706b87b..04bfc12da 100644
--- a/tests/unit/effects/effects_core.js
+++ b/tests/unit/effects/effects_core.js
@@ -90,16 +90,16 @@ asyncTest( "animateClass works with colors", function() {
 });
 
 asyncTest( "animateClass calls step option", 1, function() {
-	var test = jQuery("div.animateClass"),
-		done = function() {
-			done = jQuery.noop;
+	var test = jQuery( "div.animateClass" ),
+		step = function( fx ) {
+			ok( true, "Step Function Called" );
 			test.stop();
 			start();
+			step = $.noop;
 		};
 	test.toggleClass( "testChangeBackground", {
-		step: function( fx ) {
-			ok( true, "Step Function Called" );
-			setTimeout( done, 0 );
+		step: function() {
+			step();
 		}
 	});
 });
-- 
cgit v1.2.3


From 0e550f16bbaf28e991f6236f367c22727bef2bf3 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 25 Jun 2012 14:46:45 -0400
Subject: Core tests: Updated support comments.

---
 tests/unit/core/core.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/core/core.js b/tests/unit/core/core.js
index a77e618aa..b3020179d 100644
--- a/tests/unit/core/core.js
+++ b/tests/unit/core/core.js
@@ -156,12 +156,16 @@ test( "outerHeight(true) - setter", function() {
 test( "uniqueId / removeUniqueId", function() {
 	var el = $( "img" ).eq( 0 );
 
-	// TODO use equal(id, undefined) when dropping jQuery 1.6 support (or IE6/7)
+	// support: jQuery <1.6.2
+	// support: IE <8
+	// We should use equal( id, undefined ) when dropping jQuery 1.6.1 support (or IE6/7)
 	ok( !el.attr( "id" ), "element has no initial id" );
 	el.uniqueId();
 	ok( /ui-id-\d+$/.test( el.attr( "id" ) ), "element has generated id" );
 	el.removeUniqueId();
-	// TODO see above
+	// support: jQuery <1.6.2
+	// support: IE <8
+	// see above
 	ok( !el.attr( "id" ), "unique id has been removed from element" );
 });
 
-- 
cgit v1.2.3


From abbf6a79a91cdc64005fcbb28d98ad71a27b61c0 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 25 Jun 2012 14:51:51 -0400
Subject: Tests: Update support comments.

---
 tests/unit/core/core.js               | 2 +-
 tests/unit/tooltip/tooltip_core.js    | 4 +++-
 tests/unit/tooltip/tooltip_methods.js | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/core/core.js b/tests/unit/core/core.js
index b3020179d..41bc2ab5b 100644
--- a/tests/unit/core/core.js
+++ b/tests/unit/core/core.js
@@ -158,7 +158,7 @@ test( "uniqueId / removeUniqueId", function() {
 
 	// support: jQuery <1.6.2
 	// support: IE <8
-	// We should use equal( id, undefined ) when dropping jQuery 1.6.1 support (or IE6/7)
+	// We should use strictEqual( id, undefined ) when dropping jQuery 1.6.1 support (or IE6/7)
 	ok( !el.attr( "id" ), "element has no initial id" );
 	el.uniqueId();
 	ok( /ui-id-\d+$/.test( el.attr( "id" ) ), "element has generated id" );
diff --git a/tests/unit/tooltip/tooltip_core.js b/tests/unit/tooltip/tooltip_core.js
index 52941784f..2b39253a2 100644
--- a/tests/unit/tooltip/tooltip_core.js
+++ b/tests/unit/tooltip/tooltip_core.js
@@ -34,7 +34,9 @@ test( "accessibility", function() {
 	equal( element.attr( "aria-describedby" ), "fixture-span " + tooltipId,
 		"multiple describedby when open" );
 	// strictEqual to distinguish between .removeAttr( "title" ) and .attr( "title", "" )
-	// TODO actually use strictEqual(..., undefined, msg) when dropping jQuery 1.6 support (or IE6/7)
+	// support: jQuery <1.6.2
+	// support: IE <8
+	// We should use strictEqual( ..., undefined ) when dropping jQuery 1.6.1 support (or IE6/7)
 	ok( !element.attr( "title" ), "no title when open" );
 	element.tooltip( "close" );
 	equal( element.attr( "aria-describedby" ), "fixture-span",
diff --git a/tests/unit/tooltip/tooltip_methods.js b/tests/unit/tooltip/tooltip_methods.js
index 33ce44764..ef783cbd3 100644
--- a/tests/unit/tooltip/tooltip_methods.js
+++ b/tests/unit/tooltip/tooltip_methods.js
@@ -42,7 +42,9 @@ test( "enable/disable", function() {
 
 	element.tooltip( "disable" );
 	equal( $( ".ui-tooltip" ).length, 0, "no tooltip when disabled" );
-	// TODO use equal(..., undefined, msg) when dropping jQuery 1.6 support (or IE6/7)
+	// support: jQuery <1.6.2
+	// support: IE <8
+	// We should use strictEqual( ..., undefined ) when dropping jQuery 1.6.1 support (or IE6/7)
 	ok( !tooltip.attr( "title" ), "title removed on disable" );
 
 	element.tooltip( "open" );
-- 
cgit v1.2.3


From 9b6c1c5cdb18d76d9febfc079a1cc439dc3789b3 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 27 Jun 2012 09:49:56 -0400
Subject: Menu tests: Cleanup.

---
 tests/unit/menu/menu_core.js    | 20 +++++++-------
 tests/unit/menu/menu_events.js  | 58 ++++++++++++++++++++---------------------
 tests/unit/menu/menu_methods.js | 34 ++++++++++++------------
 tests/unit/menu/menu_options.js | 30 ++++++++++-----------
 4 files changed, 71 insertions(+), 71 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/menu/menu_core.js b/tests/unit/menu/menu_core.js
index d7082664e..ee737ceb1 100644
--- a/tests/unit/menu/menu_core.js
+++ b/tests/unit/menu/menu_core.js
@@ -5,20 +5,20 @@ module( "menu: core" );
 test( "accessibility", function () {
 	expect( 5 );
 	var item,
-		menu = $( "#menu1" ).menu(),
+		element = $( "#menu1" ).menu(),
 		item0 = $( "li:eq(0) a" );
 
-	ok( menu.hasClass( "ui-menu ui-widget ui-widget-content ui-corner-all" ), "menu class");
-	equal( menu.attr( "role" ), "menu", "main role" );
-	ok( !menu.attr( "aria-activedescendant" ), "aria attribute not yet active" );
+	ok( element.hasClass( "ui-menu ui-widget ui-widget-content ui-corner-all" ), "menu class");
+	equal( element.attr( "role" ), "menu", "main role" );
+	ok( !element.attr( "aria-activedescendant" ), "aria attribute not yet active" );
 
-	item = menu.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
-	menu.menu( "focus", $.Event(), item );
-	equal( menu.attr("aria-activedescendant"), "xid", "aria attribute, id from DOM" );
+	item = element.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
+	element.menu( "focus", $.Event(), item );
+	equal( element.attr( "aria-activedescendant" ), "xid", "aria attribute, id from DOM" );
 
-	item = menu.find( "li:last" );
-	menu.menu( "focus", $.Event(), item );
-	ok( /^ui-id-\d+$/.test( menu.attr( "aria-activedescendant" ) ), "aria attribute, generated id");
+	item = element.find( "li:last" );
+	element.menu( "focus", $.Event(), item );
+	ok( /^ui-id-\d+$/.test( element.attr( "aria-activedescendant" ) ), "aria attribute, generated id");
 });
 
 })( jQuery );
diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index 44c792fb4..8eb8ee8c6 100644
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/menu_events.js
@@ -12,7 +12,7 @@ module( "menu: events", {
 
 test( "handle click on menu", function() {
 	expect( 1 );
-	var menu = $( "#menu1" ).menu({
+	var element = $( "#menu1" ).menu({
 		select: function( event, ui ) {
 			log();
 		}
@@ -20,15 +20,15 @@ test( "handle click on menu", function() {
 	log( "click", true );
 	click( $( "#menu1" ), "1" );
 	log( "afterclick" );
-	click( menu, "2" );
+	click( element, "2" );
 	click( $( "#menu1" ), "3" );
-	click( menu, "1" );
+	click( element, "1" );
 	equal( logOutput(), "click,1,afterclick,2,3,1", "Click order not valid." );
 });
 
 test( "handle click on custom item menu", function() {
 	expect( 1 );
-	var menu = $( "#menu5" ).menu({
+	var element = $( "#menu5" ).menu({
 		select: function( event, ui ) {
 			log();
 		},
@@ -37,16 +37,16 @@ test( "handle click on custom item menu", function() {
 	log( "click", true );
 	click( $( "#menu5" ), "1" );
 	log( "afterclick" );
-	click( menu, "2" );
+	click( element, "2" );
 	click( $( "#menu5" ), "3" );
-	click( menu, "1" );
+	click( element, "1" );
 	equal( logOutput(), "click,1,afterclick,2,3,1", "Click order not valid." );
 });
 
 asyncTest( "handle blur", function() {
 	expect( 1 );
 	var blurHandled = false,
-		menu = $( "#menu1" ).menu({
+		element = $( "#menu1" ).menu({
 			blur: function( event, ui ) {
 				// Ignore duplicate blur event fired by IE
 				if ( !blurHandled ) {
@@ -56,9 +56,9 @@ asyncTest( "handle blur", function() {
 			}
 		});
 
-	click( menu, "1" );
+	click( element, "1" );
 	setTimeout( function() {
-		menu.blur();
+		element.blur();
 		start();
 	}, 350 );
 });
@@ -66,7 +66,7 @@ asyncTest( "handle blur", function() {
 asyncTest( "handle blur on click", function() {
 	expect( 1 );
 	var blurHandled = false,
-		menu = $( "#menu1" ).menu({
+		element = $( "#menu1" ).menu({
 			blur: function( event, ui ) {
 				// Ignore duplicate blur event fired by IE
 				if ( !blurHandled ) {
@@ -76,7 +76,7 @@ asyncTest( "handle blur on click", function() {
 			}
 		});
 
-	click( menu, "1" );
+	click( element, "1" );
 	setTimeout( function() {
 		$( "<a>", { id: "remove"} ).appendTo( "body" ).trigger( "click" );
 		start();
@@ -101,59 +101,59 @@ test( "handle focus of menu with active item", function() {
 
 asyncTest( "handle submenu auto collapse: mouseleave", function() {
 	expect( 4 );
-	var menu = $( "#menu2" ).menu(),
+	var element = $( "#menu2" ).menu(),
 		event = $.Event( "mouseenter" );
 
 	function menumouseleave1() {
-		equal( menu.find( "ul[aria-expanded='true']" ).length, 1, "first submenu expanded" );
-		menu.menu( "focus", event, menu.find( "li:nth-child(7) li:first" ) );
+		equal( element.find( "ul[aria-expanded='true']" ).length, 1, "first submenu expanded" );
+		element.menu( "focus", event, element.find( "li:nth-child(7) li:first" ) );
 		setTimeout( menumouseleave2, 350 );
 	}
 	function menumouseleave2() {
-		equal( menu.find( "ul[aria-expanded='true']" ).length, 2, "second submenu expanded" );
-		menu.find( "ul[aria-expanded='true']:first" ).trigger( "mouseleave" );
+		equal( element.find( "ul[aria-expanded='true']" ).length, 2, "second submenu expanded" );
+		element.find( "ul[aria-expanded='true']:first" ).trigger( "mouseleave" );
 		setTimeout( menumouseleave3, 350 );
 	}
 	function menumouseleave3() {
-		equal( menu.find( "ul[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
-		menu.trigger( "mouseleave" );
+		equal( element.find( "ul[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
+		element.trigger( "mouseleave" );
 		setTimeout( menumouseleave4, 350 );
 	}
 	function menumouseleave4() {
-		equal( menu.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
+		equal( element.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
 		start();
 	}
 
-	menu.find( "li:nth-child(7)" ).trigger( "mouseenter" );
+	element.find( "li:nth-child(7)" ).trigger( "mouseenter" );
 	setTimeout( menumouseleave1, 350 );
 });
 
 asyncTest( "handle submenu auto collapse: mouseleave", function() {
 	expect( 4 );
-	var menu = $( "#menu5" ).menu({ menus: "div" }),
+	var element = $( "#menu5" ).menu({ menus: "div" }),
 		event = $.Event( "mouseenter" );
 
 	function menumouseleave1() {
-		equal( menu.find( "div[aria-expanded='true']" ).length, 1, "first submenu expanded" );
-		menu.menu( "focus", event, menu.find( ":nth-child(7)" ).find( "div" ).eq( 0 ).children().eq( 0 ) );
+		equal( element.find( "div[aria-expanded='true']" ).length, 1, "first submenu expanded" );
+		element.menu( "focus", event, element.find( ":nth-child(7)" ).find( "div" ).eq( 0 ).children().eq( 0 ) );
 		setTimeout( menumouseleave2, 350 );
 	}
 	function menumouseleave2() {
-		equal( menu.find( "div[aria-expanded='true']" ).length, 2, "second submenu expanded" );
-		menu.find( "div[aria-expanded='true']:first" ).trigger( "mouseleave" );
+		equal( element.find( "div[aria-expanded='true']" ).length, 2, "second submenu expanded" );
+		element.find( "div[aria-expanded='true']:first" ).trigger( "mouseleave" );
 		setTimeout( menumouseleave3, 350 );
 	}
 	function menumouseleave3() {
-		equal( menu.find( "div[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
-		menu.trigger( "mouseleave" );
+		equal( element.find( "div[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
+		element.trigger( "mouseleave" );
 		setTimeout( menumouseleave4, 350 );
 	}
 	function menumouseleave4() {
-		equal( menu.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
+		equal( element.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
 		start();
 	}
 
-	menu.find( ":nth-child(7)" ).trigger( "mouseenter" );
+	element.find( ":nth-child(7)" ).trigger( "mouseenter" );
 	setTimeout( menumouseleave1, 350 );
 });
 
diff --git a/tests/unit/menu/menu_methods.js b/tests/unit/menu/menu_methods.js
index cd6728266..0835f61ec 100644
--- a/tests/unit/menu/menu_methods.js
+++ b/tests/unit/menu/menu_methods.js
@@ -12,36 +12,36 @@ module( "menu: methods", {
 
 test( "enable/disable", function() {
 	expect( 3 );
-	var menu = $( "#menu1" ).menu({
+	var element = $( "#menu1" ).menu({
 		select: function( event, ui ) {
 			log();
 		}
 	});
-	menu.menu( "disable" );
-	ok(menu.is( ".ui-state-disabled" ),"Missing ui-state-disabled class" );
+	element.menu( "disable" );
+	ok( element.is( ".ui-state-disabled" ), "Missing ui-state-disabled class" );
 	log( "click", true );
-	click( menu, "1" );
+	click( element, "1" );
 	log( "afterclick" );
-	menu.menu( "enable" );
-	ok(menu.not( ".ui-state-disabled" ),"Has ui-state-disabled class" );
+	element.menu( "enable" );
+	ok( element.not( ".ui-state-disabled" ), "Has ui-state-disabled class" );
 	log( "click" );
-	click( menu, "1" );
+	click( element, "1" );
 	log( "afterclick" );
 	equal( logOutput(), "click,afterclick,click,1,afterclick", "Click order not valid." );
 });
 
 test( "refresh", function() {
 	expect( 5 );
-	var menu = $( "#menu1" ).menu();
-	equal( menu.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
-	menu.append( "<li><a href='#'>test item</a></li>" ).menu( "refresh" );
-	equal( menu.find( ".ui-menu-item" ).length, 6, "Incorrect number of menu items" );
-	menu.find( ".ui-menu-item:last" ).remove().end().menu( "refresh" );
-	equal( menu.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
-	menu.append( "<li>---</li>" ).menu( "refresh" );
-	equal( menu.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
-	menu.children( ":last" ).remove().end().menu( "refresh" );
-	equal( menu.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
+	var element = $( "#menu1" ).menu();
+	equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
+	element.append( "<li><a href='#'>test item</a></li>" ).menu( "refresh" );
+	equal( element.find( ".ui-menu-item" ).length, 6, "Incorrect number of menu items" );
+	element.find( ".ui-menu-item:last" ).remove().end().menu( "refresh" );
+	equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
+	element.append( "<li>---</li>" ).menu( "refresh" );
+	equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
+	element.children( ":last" ).remove().end().menu( "refresh" );
+	equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
 });
 
 test( "destroy", function() {
diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js
index a25b59a2c..27c2fabb3 100644
--- a/tests/unit/menu/menu_options.js
+++ b/tests/unit/menu/menu_options.js
@@ -12,56 +12,56 @@ module( "menu: options", {
 
 test( "{ disabled: true }", function() {
 	expect( 2 );
-	var menu = $( "#menu1" ).menu({
+	var element = $( "#menu1" ).menu({
 		disabled: true,
 		select: function(event, ui) {
 			log();
 		}
 	});
-	ok( menu.is( ".ui-state-disabled" ), "Missing ui-state-disabled class" );
+	ok( element.is( ".ui-state-disabled" ), "Missing ui-state-disabled class" );
 	log( "click", true );
-	click( menu, "1" );
+	click( element, "1" );
 	log( "afterclick" );
 	equal( logOutput(), "click,afterclick", "Click order not valid." );
 });
 
 test( "{ disabled: false }", function() {
 	expect( 2 );
-	var menu = $( "#menu1" ).menu({
+	var element = $( "#menu1" ).menu({
 		disabled: false,
 		select: function( event, ui ) {
 			log();
 		}
 	});
-	ok( menu.not( ".ui-state-disabled" ), "Has ui-state-disabled class" );
+	ok( element.not( ".ui-state-disabled" ), "Has ui-state-disabled class" );
 	log( "click", true );
-	click( menu, "1" );
+	click( element, "1" );
 	log( "afterclick" );
 	equal( logOutput(), "click,1,afterclick", "Click order not valid." );
 });
 
 test( "{ role: 'menu' } ", function () {
-	var menu = $( "#menu1" ).menu(),
-		items = menu.find( "li" );
+	var element = $( "#menu1" ).menu(),
+		items = element.find( "li" );
 	expect( 2 + 5 * items.length );
-	equal( menu.attr( "role" ), "menu" );
+	equal( element.attr( "role" ), "menu" );
 	ok( items.length > 0, "number of menu items" );
 	items.each(function( item ) {
 		ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" );
 		equal( $( this ).attr( "role" ), "presentation", "menu item ("+ item + ") role" );
 		equal( $( "a", this ).attr( "role" ), "menuitem", "menu item ("+ item + ") role" );
-		ok( $( "a", this ).hasClass( "ui-corner-all" ), "a element class for menu item ("+ item + ") " );
-		equal( $( "a", this ).attr( "tabindex" ), "-1", "a element tabindex for menu item ("+ item + ") " );
+		ok( $( "a", this ).hasClass( "ui-corner-all" ), "a element class for menu item ("+ item + ")" );
+		equal( $( "a", this ).attr( "tabindex" ), "-1", "a element tabindex for menu item ("+ item + ")" );
 	});
 });
 
 test( "{ role: 'listbox' } ", function () {
-	var menu = $( "#menu1" ).menu({
+	var element = $( "#menu1" ).menu({
 			role: "listbox"
 		}),
-		items = menu.find( "li" );
-	expect(2 + items.length);
-	equal( menu.attr( "role" ), "listbox" );
+		items = element.find( "li" );
+	expect( 2 + items.length );
+	equal( element.attr( "role" ), "listbox" );
 	ok( items.length > 0, "number of menu items" );
 	items.each(function( item ) {
 		equal( $( "a", this ).attr( "role" ), "option", "menu item ("+ item + ") role" );
-- 
cgit v1.2.3


From 5ae668fdb61dd5e516dc599166a31fd46a916bfd Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 27 Jun 2012 11:32:48 -0400
Subject: Tests: Enable QUnit.config.requireExpects.

---
 tests/unit/button/button_core.js              |  6 ++++++
 tests/unit/button/button_options.js           |  9 +++++++++
 tests/unit/button/button_tickets.js           |  5 +++++
 tests/unit/core/core.js                       | 14 ++++++++++++++
 tests/unit/core/selector.js                   |  4 ++++
 tests/unit/datepicker/datepicker_core.js      |  6 ++++++
 tests/unit/datepicker/datepicker_events.js    |  1 +
 tests/unit/datepicker/datepicker_methods.js   |  2 ++
 tests/unit/datepicker/datepicker_options.js   | 19 +++++++++++++++++++
 tests/unit/datepicker/datepicker_tickets.js   |  4 ++++
 tests/unit/dialog/dialog_core.js              |  1 +
 tests/unit/dialog/dialog_methods.js           | 11 +++++++++++
 tests/unit/dialog/dialog_options.js           |  9 +++++++++
 tests/unit/dialog/dialog_tickets.js           |  2 ++
 tests/unit/effects/effects_core.js            |  1 +
 tests/unit/effects/effects_scale.js           |  1 +
 tests/unit/position/position_deprecated.js    |  1 +
 tests/unit/progressbar/progressbar_options.js |  5 +++++
 tests/unit/tabs/tabs_methods.js               |  1 +
 tests/unit/tabs/tabs_options.js               |  2 ++
 tests/unit/testsuite.js                       | 10 ++++++++++
 tests/unit/tooltip/tooltip_options.js         |  3 +++
 tests/unit/widget/widget_core.js              | 18 ++++++++++++++++--
 23 files changed, 133 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/button/button_core.js b/tests/unit/button/button_core.js
index c274a8473..f3c50d840 100644
--- a/tests/unit/button/button_core.js
+++ b/tests/unit/button/button_core.js
@@ -8,6 +8,7 @@
 module("button: core");
 
 test("checkbox", function() {
+	expect( 4 );
 	var input = $("#check"),
 		label = $("label[for=check]");
 	ok( input.is(":visible") );
@@ -18,6 +19,7 @@ test("checkbox", function() {
 });
 
 test("radios", function() {
+	expect( 4 );
 	var inputs = $("#radio0 input"),
 		labels = $("#radio0 label");
 	ok( inputs.is(":visible") );
@@ -34,6 +36,7 @@ function assert(noForm, form1, form2) {
 }
 
 test("radio groups", function() {
+	expect( 12 );
 	$("input[type=radio]").button();
 	assert(":eq(0)", ":eq(1)", ":eq(2)");
 
@@ -51,6 +54,7 @@ test("radio groups", function() {
 });
 
 test("input type submit, don't create child elements", function() {
+	expect( 2 );
 	var input = $("#submit");
 	deepEqual( input.children().length, 0 );
 	input.button();
@@ -58,6 +62,7 @@ test("input type submit, don't create child elements", function() {
 });
 
 test("buttonset", function() {
+	expect( 6 );
 	var set = $("#radio1").buttonset();
 	ok( set.is(".ui-buttonset") );
 	deepEqual( set.children(".ui-button").length, 3 );
@@ -68,6 +73,7 @@ test("buttonset", function() {
 });
 
 test("buttonset (rtl)", function() {
+	expect( 6 );
 	var set,
 		parent = $("#radio1").parent();
 	// Set to rtl
diff --git a/tests/unit/button/button_options.js b/tests/unit/button/button_options.js
index 3dd361ac9..eeb6e5527 100644
--- a/tests/unit/button/button_options.js
+++ b/tests/unit/button/button_options.js
@@ -6,6 +6,7 @@
 module("button: options");
 
 test("disabled, explicit value", function() {
+	expect( 4 );
 	$("#radio01").button({ disabled: false });
 	deepEqual(false, $("#radio01").button("option", "disabled"),
 		"disabled option set to false");
@@ -18,6 +19,7 @@ test("disabled, explicit value", function() {
 });
 
 test("disabled, null", function() {
+	expect( 4 );
 	$("#radio01").button({ disabled: null });
 	deepEqual(false, $("#radio01").button("option", "disabled"),
 		"disabled option set to false");
@@ -30,6 +32,7 @@ test("disabled, null", function() {
 });
 
 test("text false without icon", function() {
+	expect( 1 );
 	$("#button").button({
 		text: false
 	});
@@ -39,6 +42,7 @@ test("text false without icon", function() {
 });
 
 test("text false with icon", function() {
+	expect( 1 );
 	$("#button").button({
 		text: false,
 		icons: {
@@ -51,6 +55,7 @@ test("text false with icon", function() {
 });
 
 test("label, default", function() {
+	expect( 2 );
 	$("#button").button();
 	deepEqual( $("#button").text(), "Label" );
 	deepEqual( $( "#button").button( "option", "label" ), "Label" );
@@ -59,6 +64,7 @@ test("label, default", function() {
 });
 
 test("label", function() {
+	expect( 2 );
 	$("#button").button({
 		label: "xxx"
 	});
@@ -69,11 +75,13 @@ test("label", function() {
 });
 
 test("label default with input type submit", function() {
+	expect( 2 );
 	deepEqual( $("#submit").button().val(), "Label" );
 	deepEqual( $("#submit").button( "option", "label" ), "Label" );
 });
 
 test("label with input type submit", function() {
+	expect( 2 );
 	var label = $("#submit").button({
 		label: "xxx"
 	}).val();
@@ -82,6 +90,7 @@ test("label with input type submit", function() {
 });
 
 test("icons", function() {
+	expect( 1 );
 	$("#button").button({
 		text: false,
 		icons: {
diff --git a/tests/unit/button/button_tickets.js b/tests/unit/button/button_tickets.js
index fe0d82fd6..846ca7ef4 100644
--- a/tests/unit/button/button_tickets.js
+++ b/tests/unit/button/button_tickets.js
@@ -6,6 +6,7 @@
 module( "button: tickets" );
 
 test( "#5946 - buttonset should ignore buttons that are not :visible", function() {
+	expect( 2 );
 	$( "#radio01" ).next().andSelf().hide();
 	var set = $( "#radio0" ).buttonset({ items: "input[type=radio]:visible" });
 	ok( set.find( "label:eq(0)" ).is( ":not(.ui-button):not(.ui-corner-left)" ) );
@@ -13,6 +14,7 @@ test( "#5946 - buttonset should ignore buttons that are not :visible", function(
 });
 
 test( "#6262 - buttonset not applying ui-corner to invisible elements", function() {
+	expect( 3 );
 	$( "#radio0" ).hide();
 	var set = $( "#radio0" ).buttonset();
 	ok( set.find( "label:eq(0)" ).is( ".ui-button.ui-corner-left" ) );
@@ -21,6 +23,7 @@ test( "#6262 - buttonset not applying ui-corner to invisible elements", function
 });
 
 test( "#6711 Checkbox/Radiobutton do not Show Focused State when using Keyboard Navigation", function() {
+	expect( 2 );
 	var check = $( "#check" ).button(),
 		label = $( "label[for='check']" );
 	ok( !label.is( ".ui-state-focus" ) );
@@ -29,6 +32,7 @@ test( "#6711 Checkbox/Radiobutton do not Show Focused State when using Keyboard
 });
 
 test( "#7092 - button creation that requires a matching label does not find label in all cases", function() {
+	expect( 5 );
 	var group = $( "<span><label for='t7092a'></label><input type='checkbox' id='t7092a'></span>" );
 	group.find( "input[type=checkbox]" ).button();
 	ok( group.find( "label" ).is( ".ui-button" ) );
@@ -51,6 +55,7 @@ test( "#7092 - button creation that requires a matching label does not find labe
 });
 
 test( "#7534 - Button label selector works for ids with \":\"", function() {
+	expect( 1 );
 	var group = $( "<span><input type='checkbox' id='check:7534'><label for='check:7534'>Label</label></span>" );
 	group.find( "input" ).button();
 	ok( group.find( "label" ).is( ".ui-button" ), "Found an id with a :" );
diff --git a/tests/unit/core/core.js b/tests/unit/core/core.js
index 41bc2ab5b..5ebb9e9f4 100644
--- a/tests/unit/core/core.js
+++ b/tests/unit/core/core.js
@@ -28,6 +28,7 @@ asyncTest( "focus", function() {
 });
 
 test( "zIndex", function() {
+	expect( 7 );
 	var el = $( "#zIndexAutoWithParent" ),
 		parent = el.parent();
 	equal( el.zIndex(), 100, "zIndex traverses up to find value" );
@@ -46,6 +47,7 @@ test( "zIndex", function() {
 });
 
 test( "innerWidth - getter", function() {
+	expect( 2 );
 	var el = $( "#dimensions" );
 
 	equal( el.innerWidth(), 122, "getter passthru" );
@@ -54,6 +56,7 @@ test( "innerWidth - getter", function() {
 });
 
 test( "innerWidth - setter", function() {
+	expect( 2 );
 	var el = $( "#dimensions" );
 
 	el.innerWidth( 120 );
@@ -64,6 +67,7 @@ test( "innerWidth - setter", function() {
 });
 
 test( "innerHeight - getter", function() {
+	expect( 2 );
 	var el = $( "#dimensions" );
 
 	equal( el.innerHeight(), 70, "getter passthru" );
@@ -72,6 +76,7 @@ test( "innerHeight - getter", function() {
 });
 
 test( "innerHeight - setter", function() {
+	expect( 2 );
 	var el = $( "#dimensions" );
 
 	el.innerHeight( 60 );
@@ -82,6 +87,7 @@ test( "innerHeight - setter", function() {
 });
 
 test( "outerWidth - getter", function() {
+	expect( 2 );
 	var el = $( "#dimensions" );
 
 	equal( el.outerWidth(), 140, "getter passthru" );
@@ -90,6 +96,7 @@ test( "outerWidth - getter", function() {
 });
 
 test( "outerWidth - setter", function() {
+	expect( 2 );
 	var el = $( "#dimensions" );
 
 	el.outerWidth( 130 );
@@ -100,6 +107,7 @@ test( "outerWidth - setter", function() {
 });
 
 test( "outerWidth(true) - getter", function() {
+	expect( 2 );
 	var el = $( "#dimensions" );
 
 	equal( el.outerWidth(true), 154, "getter passthru w/ margin" );
@@ -108,6 +116,7 @@ test( "outerWidth(true) - getter", function() {
 });
 
 test( "outerWidth(true) - setter", function() {
+	expect( 2 );
 	var el = $( "#dimensions" );
 
 	el.outerWidth( 130, true );
@@ -118,6 +127,7 @@ test( "outerWidth(true) - setter", function() {
 });
 
 test( "outerHeight - getter", function() {
+	expect( 2 );
 	var el = $( "#dimensions" );
 
 	equal( el.outerHeight(), 86, "getter passthru" );
@@ -126,6 +136,7 @@ test( "outerHeight - getter", function() {
 });
 
 test( "outerHeight - setter", function() {
+	expect( 2 );
 	var el = $( "#dimensions" );
 
 	el.outerHeight( 80 );
@@ -136,6 +147,7 @@ test( "outerHeight - setter", function() {
 });
 
 test( "outerHeight(true) - getter", function() {
+	expect( 2 );
 	var el = $( "#dimensions" );
 
 	equal( el.outerHeight(true), 98, "getter passthru w/ margin" );
@@ -144,6 +156,7 @@ test( "outerHeight(true) - getter", function() {
 });
 
 test( "outerHeight(true) - setter", function() {
+	expect( 2 );
 	var el = $( "#dimensions" );
 
 	el.outerHeight( 90, true );
@@ -154,6 +167,7 @@ test( "outerHeight(true) - setter", function() {
 });
 
 test( "uniqueId / removeUniqueId", function() {
+	expect( 3 );
 	var el = $( "img" ).eq( 0 );
 
 	// support: jQuery <1.6.2
diff --git a/tests/unit/core/selector.js b/tests/unit/core/selector.js
index 4309289c9..7876cdd07 100644
--- a/tests/unit/core/selector.js
+++ b/tests/unit/core/selector.js
@@ -150,6 +150,8 @@ test("focusable - not natively focusable with various tabindex", function() {
 });
 
 test("focusable - area elements", function() {
+	expect( 3 );
+
 	isFocusable('#areaCoordsHref', 'coords and href');
 	isFocusable('#areaNoCoordsHref', 'href but no coords');
 	isNotFocusable('#areaNoImg', 'not associated with an image');
@@ -227,6 +229,8 @@ test("tabbable -  not natively tabbable with various tabindex", function() {
 });
 
 test("tabbable - area elements", function() {
+	expect( 3 );
+
 	isTabbable('#areaCoordsHref', 'coords and href');
 	isTabbable('#areaNoCoordsHref', 'href but no coords');
 	isNotTabbable('#areaNoImg', 'not associated with an image');
diff --git a/tests/unit/datepicker/datepicker_core.js b/tests/unit/datepicker/datepicker_core.js
index 4bf04d83e..17cefe157 100644
--- a/tests/unit/datepicker/datepicker_core.js
+++ b/tests/unit/datepicker/datepicker_core.js
@@ -43,16 +43,19 @@ var PROP_NAME = 'datepicker';
 module("datepicker: core");
 
 test( "widget method - empty collection", function() {
+	expect( 1 );
 	$( "#nonExist" ).datepicker(); // should create nothing
 	ok( !$( "#ui-datepicker-div" ).length, "Non init on empty collection" );
 });
 
 test("widget method", function() {
+	expect( 1 );
 	var actual = $("#inp").datepicker().datepicker("widget")[0];
 	deepEqual($("body > #ui-datepicker-div:last-child")[0], actual);
 });
 
 test('baseStructure', function() {
+	expect( 59 );
 	var header, title, table, thead, week, panel, inl, child,
 		inp = init('#inp').focus(),
 		dp = $('#ui-datepicker-div'),
@@ -176,6 +179,7 @@ test('baseStructure', function() {
 });
 
 test('customStructure', function() {
+	expect( 20 );
 	var iframe, header, panel, title, thead,
 		dp = $('#ui-datepicker-div'),
 		// Check right-to-left localisation
@@ -233,6 +237,7 @@ test('customStructure', function() {
 });
 
 test('keystrokes', function() {
+	expect( 26 );
 	var inp = init('#inp'),
 		date = new Date();
 	inp.val('').datepicker('show').
@@ -367,6 +372,7 @@ test('keystrokes', function() {
 });
 
 test('mouse', function() {
+	expect( 15 );
 	var inl,
 		inp = init('#inp'),
 		dp = $('#ui-datepicker-div'),
diff --git a/tests/unit/datepicker/datepicker_events.js b/tests/unit/datepicker/datepicker_events.js
index b3e6704ef..e35be62ce 100644
--- a/tests/unit/datepicker/datepicker_events.js
+++ b/tests/unit/datepicker/datepicker_events.js
@@ -22,6 +22,7 @@ function callback2(year, month, inst) {
 }
 
 test('events', function() {
+	expect( 26 );
 	var dateStr, newMonthYear, inp2,
 		inp = init('#inp', {onSelect: callback}),
 	date = new Date();
diff --git a/tests/unit/datepicker/datepicker_methods.js b/tests/unit/datepicker/datepicker_methods.js
index 603427440..e7aa7602e 100644
--- a/tests/unit/datepicker/datepicker_methods.js
+++ b/tests/unit/datepicker/datepicker_methods.js
@@ -6,6 +6,7 @@
 module("datepicker: methods");
 
 test('destroy', function() {
+	expect( 33 );
 	var inl,
 		inp = init('#inp');
 	ok(inp.is('.hasDatepicker'), 'Default - marker class set');
@@ -63,6 +64,7 @@ test('destroy', function() {
 });
 
 test('enableDisable', function() {
+	expect( 33 );
 	var inl, dp,
 		inp = init('#inp');
 	ok(!inp.datepicker('isDisabled'), 'Enable/disable - initially marked as enabled');
diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index 3e200ecaa..a01b9c7e0 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/datepicker_options.js
@@ -7,6 +7,7 @@
 module("datepicker: options");
 
 test('setDefaults', function() {
+	expect( 3 );
 	var inp = init('#inp');
 	equal($.datepicker._defaults.showOn, 'focus', 'Initial showOn');
 	$.datepicker.setDefaults({showOn: 'button'});
@@ -16,6 +17,7 @@ test('setDefaults', function() {
 });
 
 test('option', function() {
+	expect( 17 );
 	var inp = init('#inp'),
 	inst = $.data(inp[0], PROP_NAME);
 	// Set option
@@ -47,6 +49,7 @@ test('option', function() {
 });
 
 test('change', function() {
+	expect( 12 );
 	var inp = init('#inp'),
 	inst = $.data(inp[0], PROP_NAME);
 	equal(inst.settings.showOn, null, 'Initial setting showOn');
@@ -67,6 +70,7 @@ test('change', function() {
 });
 
 test('invocation', function() {
+	expect( 29 );
 	var button, image,
 		inp = init('#inp'),
 		dp = $('#ui-datepicker-div'),
@@ -138,6 +142,7 @@ test('invocation', function() {
 });
 
 test('otherMonths', function() {
+	expect( 8 );
 	var inp = init('#inp'),
 		pop = $('#ui-datepicker-div');
 	inp.val('06/01/2009').datepicker('show');
@@ -159,6 +164,7 @@ test('otherMonths', function() {
 });
 
 test('defaultDate', function() {
+	expect( 17 );
 	var inp = init('#inp'),
 		date = new Date();
 	inp.val('').datepicker('show').
@@ -253,6 +259,7 @@ test('defaultDate', function() {
 });
 
 test('miscellaneous', function() {
+	expect( 19 );
 	var curYear, longNames, shortNames, date,
 		dp = $('#ui-datepicker-div'),
 		inp = init('#inp');
@@ -314,6 +321,7 @@ test('miscellaneous', function() {
 });
 
 test('minMax', function() {
+	expect( 17 );
 	var date,
 		inp = init('#inp'),
 		lastYear = new Date(2007, 6 - 1, 4),
@@ -398,6 +406,7 @@ test('minMax', function() {
 });
 
 test('setDate', function() {
+	expect( 24 );
 	var inl, alt, minDate, maxDate, dateAndTimeToSet, dateAndTimeClone,
 		inp = init('#inp'),
 		date1 = new Date(2008, 6 - 1, 4),
@@ -477,6 +486,7 @@ test('setDate', function() {
 });
 
 test('altField', function() {
+	expect( 10 );
 	var inp = init('#inp'),
 		alt = $('#alt');
 	// No alternate field set
@@ -515,6 +525,7 @@ test('altField', function() {
 });
 
 test('autoSize', function() {
+	expect( 15 );
 	var inp = init('#inp');
 	equal(inp.prop('size'), 20, 'Auto size - default');
 	inp.datepicker('option', 'autoSize', true);
@@ -550,6 +561,7 @@ test('autoSize', function() {
 });
 
 test('daylightSaving', function() {
+	expect( 25 );
 	var inp = init('#inp'),
 		dp = $('#ui-datepicker-div');
 	ok(true, 'Daylight saving - ' + new Date());
@@ -664,6 +676,7 @@ function calcWeek(date) {
 }
 
 test('callbacks', function() {
+	expect( 13 );
 	// Before show
 	var dp, day20, day21,
 		inp = init('#inp', {beforeShow: beforeAll}),
@@ -693,6 +706,7 @@ test('callbacks', function() {
 });
 
 test('localisation', function() {
+	expect( 24 );
 	var dp, month, day, date,
 		inp = init('#inp', $.datepicker.regional.fr);
 	inp.datepicker('option', {dateFormat: 'DD, d MM yy', showButtonPanel:true, changeMonth:true, changeYear:true}).val('').datepicker('show');
@@ -722,6 +736,7 @@ test('localisation', function() {
 });
 
 test('noWeekends', function() {
+	expect( 31 );
 	var i, date;
 	for (i = 1; i <= 31; i++) {
 		date = new Date(2001, 1 - 1, i);
@@ -731,6 +746,7 @@ test('noWeekends', function() {
 });
 
 test('iso8601Week', function() {
+	expect( 12 );
 	var date = new Date(2000, 12 - 1, 31);
 	equal($.datepicker.iso8601Week(date), 52, 'ISO 8601 week ' + date);
 	date = new Date(2001, 1 - 1, 1);
@@ -758,6 +774,7 @@ test('iso8601Week', function() {
 });
 
 test('parseDate', function() {
+	expect( 26 );
 	init('#inp');
 	var currentYear, gmtDate, fr, settings, zh;
 	ok($.datepicker.parseDate('d m y', '') == null, 'Parse date empty');
@@ -822,6 +839,7 @@ test('parseDate', function() {
 });
 
 test('parseDateErrors', function() {
+	expect( 17 );
 	init('#inp');
 	var fr, settings;
 	function expectError(expr, value, error) {
@@ -874,6 +892,7 @@ test('parseDateErrors', function() {
 });
 
 test('formatDate', function() {
+	expect( 16 );
 	init('#inp');
 	var gmtDate, fr, settings;
 	equal($.datepicker.formatDate('d m y', new Date(2001, 2 - 1, 3)),
diff --git a/tests/unit/datepicker/datepicker_tickets.js b/tests/unit/datepicker/datepicker_tickets.js
index 105be63a6..e1b882a89 100644
--- a/tests/unit/datepicker/datepicker_tickets.js
+++ b/tests/unit/datepicker/datepicker_tickets.js
@@ -7,6 +7,7 @@ module("datepicker: tickets");
 
 // http://forum.jquery.com/topic/several-breaking-changes-in-jquery-ui-1-8rc1
 test('beforeShowDay-getDate', function() {
+    expect( 3 );
 	var inp = init('#inp', {beforeShowDay: function(date) { inp.datepicker('getDate'); return [true, '']; }}),
 	   dp = $('#ui-datepicker-div');
 	inp.val('01/01/2010').datepicker('show');
@@ -25,6 +26,7 @@ test('beforeShowDay-getDate', function() {
 });
 
 test('Ticket 7602: Stop datepicker from appearing with beforeShow event handler', function(){
+    expect( 3 );
     var inp = init('#inp',{
             beforeShow: function(){
                 return false;
@@ -58,11 +60,13 @@ test('Ticket 7602: Stop datepicker from appearing with beforeShow event handler'
 });
 
 test('Ticket 6827: formatDate day of year calculation is wrong during day lights savings time', function(){
+    expect( 1 );
     var time = $.datepicker.formatDate("oo", new Date("2010/03/30 12:00:00 CDT"));
     equal(time, "089");
 });
 
 test('Ticket #7244: date parser does not fail when too many numbers are passed into the date function', function() {
+    expect( 4 );
     var date;
     try{
         date = $.datepicker.parseDate('dd/mm/yy', '18/04/19881');
diff --git a/tests/unit/dialog/dialog_core.js b/tests/unit/dialog/dialog_core.js
index 636b957e8..e0a5c8701 100644
--- a/tests/unit/dialog/dialog_core.js
+++ b/tests/unit/dialog/dialog_core.js
@@ -116,6 +116,7 @@ test("ARIA", function() {
 });
 
 test("widget method", function() {
+	expect( 1 );
 	var dialog = $("<div>").appendTo("#main").dialog();
 	deepEqual(dialog.parent()[0], dialog.dialog("widget")[0]);
 });
diff --git a/tests/unit/dialog/dialog_methods.js b/tests/unit/dialog/dialog_methods.js
index 1f84cd6b5..ba0c2bd41 100644
--- a/tests/unit/dialog/dialog_methods.js
+++ b/tests/unit/dialog/dialog_methods.js
@@ -34,6 +34,8 @@ test("init", function() {
 });
 
 test("destroy", function() {
+	expect( 4 );
+
 	$("<div></div>").appendTo('body').dialog().dialog("destroy").remove();
 	ok(true, '.dialog("destroy") called on element');
 
@@ -49,6 +51,8 @@ test("destroy", function() {
 });
 
 test("enable", function() {
+	expect( 3 );
+
 	var expected = $('<div></div>').dialog(),
 		actual = expected.dialog('enable');
 	equal(actual, expected, 'enable is chainable');
@@ -60,6 +64,8 @@ test("enable", function() {
 });
 
 test("disable", function() {
+	expect( 3 );
+
 	var expected = $('<div></div>').dialog(),
 		actual = expected.dialog('disable');
 	equal(actual, expected, 'disable is chainable');
@@ -71,6 +77,8 @@ test("disable", function() {
 });
 
 test("close", function() {
+	expect( 3 );
+
 	var expected = $('<div></div>').dialog(),
 		actual = expected.dialog('close');
 	equal(actual, expected, 'close is chainable');
@@ -98,6 +106,8 @@ test("isOpen", function() {
 });
 
 test("moveToTop", function() {
+	expect( 3 );
+
 	var d1, d2, dlg1, dlg2,
 		expected = $('<div></div>').dialog(),
 		actual = expected.dialog('moveToTop');
@@ -117,6 +127,7 @@ test("moveToTop", function() {
 });
 
 test("open", function() {
+	expect( 3 );
 	var expected = $('<div></div>').dialog(),
 		actual = expected.dialog('open');
 	equal(actual, expected, 'open is chainable');
diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js
index c071c1b09..ba217c6f4 100644
--- a/tests/unit/dialog/dialog_options.js
+++ b/tests/unit/dialog/dialog_options.js
@@ -106,6 +106,7 @@ test("buttons - advanced", function() {
 });
 
 test("closeOnEscape", function() {
+	expect( 6 );
 	el = $('<div></div>').dialog({ closeOnEscape: false });
 	ok(true, 'closeOnEscape: false');
 	ok(dlg().is(':visible') && !dlg().is(':hidden'), 'dialog is open before ESC');
@@ -276,6 +277,7 @@ test("minWidth", function() {
 });
 
 test("position, default center on window", function() {
+	expect( 2 );
 	var el = $('<div></div>').dialog(),
 		dialog = el.dialog('widget'),
 		offset = dialog.offset();
@@ -285,6 +287,7 @@ test("position, default center on window", function() {
 });
 
 test("position, top on window", function() {
+	expect( 2 );
 	var el = $('<div></div>').dialog({ position: "top" }),
 		dialog = el.dialog('widget'),
 		offset = dialog.offset();
@@ -294,6 +297,7 @@ test("position, top on window", function() {
 });
 
 test("position, left on window", function() {
+	expect( 2 );
 	var el = $('<div></div>').dialog({ position: "left" }),
 		dialog = el.dialog('widget'),
 		offset = dialog.offset();
@@ -303,6 +307,7 @@ test("position, left on window", function() {
 });
 
 test("position, right bottom on window", function() {
+	expect( 2 );
 	var el = $('<div></div>').dialog({ position: "right bottom" }),
 		dialog = el.dialog('widget'),
 		offset = dialog.offset();
@@ -312,6 +317,7 @@ test("position, right bottom on window", function() {
 });
 
 test("position, right bottom on window w/array", function() {
+	expect( 2 );
 	var el = $('<div></div>').dialog({ position: ["right", "bottom"] }),
 		dialog = el.dialog('widget'),
 		offset = dialog.offset();
@@ -321,6 +327,7 @@ test("position, right bottom on window w/array", function() {
 });
 
 test("position, offset from top left w/array", function() {
+	expect( 2 );
 	var el = $('<div></div>').dialog({ position: [10, 10] }),
 		dialog = el.dialog('widget'),
 		offset = dialog.offset();
@@ -330,6 +337,7 @@ test("position, offset from top left w/array", function() {
 });
 
 test("position, right bottom at right bottom via ui.position args", function() {
+	expect( 2 );
 	var el = $('<div></div>').dialog({
 			position: {
 				my: "right bottom",
@@ -345,6 +353,7 @@ test("position, right bottom at right bottom via ui.position args", function() {
 });
 
 test("position, at another element", function() {
+	expect( 4 );
 	var parent = $('<div></div>').css({
 			position: 'absolute',
 			top: 400,
diff --git a/tests/unit/dialog/dialog_tickets.js b/tests/unit/dialog/dialog_tickets.js
index 98983cf33..201ea3a87 100644
--- a/tests/unit/dialog/dialog_tickets.js
+++ b/tests/unit/dialog/dialog_tickets.js
@@ -71,6 +71,7 @@ test("#5184: isOpen in dialogclose event is true", function() {
 });
 
 test("#5531: dialog width should be at least minWidth on creation", function () {
+    expect( 4 );
     el = $('<div></div>').dialog({
             width: 200,
             minWidth: 300
@@ -192,6 +193,7 @@ test("#6966: Escape key closes all dialogs, not the top one", function(){
 });
 
 test("#4980: Destroy should place element back in original DOM position", function(){
+    expect( 2 );
     container = $('<div id="container"><div id="modal">Content</div></div>');
 	modal = container.find('#modal');
 	modal.dialog();
diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js
index 04bfc12da..9b4787a57 100644
--- a/tests/unit/effects/effects_core.js
+++ b/tests/unit/effects/effects_core.js
@@ -153,6 +153,7 @@ asyncTest( "animateClass clears style properties when stopped", function() {
 });
 
 asyncTest( "animateClass: css and class changes during animation are not lost (#7106)", function() {
+	expect( 2 );
 	var test = $( "div.ticket7106" );
 
 	// ensure the class stays and that the css property stays
diff --git a/tests/unit/effects/effects_scale.js b/tests/unit/effects/effects_scale.js
index f06fa0f46..6abbcb538 100644
--- a/tests/unit/effects/effects_scale.js
+++ b/tests/unit/effects/effects_scale.js
@@ -4,6 +4,7 @@ module( "effect.scale: Scale" );
 function run( position, v, h, vo, ho ) {
 	var desc = "End Position Correct: " + position + " (" + v + "," + h + ") - origin: (" + vo + "," + ho + ")";
 	asyncTest( desc, function() {
+		expect( 2 );
 		function complete() {
 			equal( parseInt( test.css( h ), 10 ), target[ h ], "Horizontal Position Correct " + desc );
 			equal( parseInt( test.css( v ), 10 ), target[ v ], "Vertical Position Correct " + desc );
diff --git a/tests/unit/position/position_deprecated.js b/tests/unit/position/position_deprecated.js
index 9a3164246..789d4e608 100644
--- a/tests/unit/position/position_deprecated.js
+++ b/tests/unit/position/position_deprecated.js
@@ -1,6 +1,7 @@
 (function( $ ) {
 
 test( "offset", function() {
+	expect( 3 );
 	$( "#elx" ).position({
 		my: "left top",
 		at: "left bottom",
diff --git a/tests/unit/progressbar/progressbar_options.js b/tests/unit/progressbar/progressbar_options.js
index f050fc5da..fd5988ebd 100644
--- a/tests/unit/progressbar/progressbar_options.js
+++ b/tests/unit/progressbar/progressbar_options.js
@@ -1,6 +1,7 @@
 module( "progressbar: options" );
 
 test( "{ value : 0 }, default", function() {
+	expect( 1 );
 	$( "#progressbar" ).progressbar();
 	equal( 0, $( "#progressbar" ).progressbar( "value" ) );
 });
@@ -28,6 +29,7 @@ test( "value: visibility of valueDiv", function() {
 });
 
 test( "{ value : 5 }", function() {
+	expect( 1 );
 	$( "#progressbar" ).progressbar({
 		value: 5
 	});
@@ -35,6 +37,7 @@ test( "{ value : 5 }", function() {
 });
 
 test( "{ value : -5 }", function() {
+	expect( 1 );
 	$( "#progressbar" ).progressbar({
 		value: -5
 	});
@@ -42,6 +45,7 @@ test( "{ value : -5 }", function() {
 });
 
 test( "{ value : 105 }", function() {
+	expect( 1 );
 	$( "#progressbar" ).progressbar({
 		value: 105
 	});
@@ -49,6 +53,7 @@ test( "{ value : 105 }", function() {
 });
 
 test( "{ max : 5, value : 10 }", function() {
+	expect( 1 );
 	$("#progressbar").progressbar({
 		max: 5,
 		value: 10
diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js
index e48d353e7..a41d7069d 100644
--- a/tests/unit/tabs/tabs_methods.js
+++ b/tests/unit/tabs/tabs_methods.js
@@ -6,6 +6,7 @@ var disabled = TestHelpers.tabs.disabled,
 module( "tabs: methods" );
 
 test( "destroy", function() {
+	expect( 1 );
 	domEqual( "#tabs1", function() {
 		$( "#tabs1" ).tabs().tabs( "destroy" );
 	});
diff --git a/tests/unit/tabs/tabs_options.js b/tests/unit/tabs/tabs_options.js
index 8365a42d7..eed5b99d8 100644
--- a/tests/unit/tabs/tabs_options.js
+++ b/tests/unit/tabs/tabs_options.js
@@ -69,6 +69,8 @@ test( "{ active: Number }", function() {
 
 if ( $.uiBackCompat === false ) {
 	test( "{ active: -Number }", function() {
+		expect( 8 );
+
 		var element = $( "#tabs1" ).tabs({
 			active: -1
 		});
diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index e4f549de6..99694a83e 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -10,6 +10,8 @@ function includeScript( url ) {
 	document.write( "<script src='../../../" + url + "'></script>" );
 }
 
+QUnit.config.requireExpects = true;
+
 QUnit.config.urlConfig.push( "min" );
 TestHelpers.loadResources = QUnit.urlParams.min ?
 	function() {
@@ -76,7 +78,9 @@ function testWidgetDefaults( widget, defaults ) {
 
 	// ensure that all defaults have the correct value
 	test( "defined defaults", function() {
+		var count = 0;
 		$.each( defaults, function( key, val ) {
+			expect( ++count );
 			if ( $.isFunction( val ) ) {
 				ok( $.isFunction( pluginDefaults[ key ] ), key );
 				return;
@@ -87,7 +91,9 @@ function testWidgetDefaults( widget, defaults ) {
 
 	// ensure that all defaults were tested
 	test( "tested defaults", function() {
+		var count = 0;
 		$.each( pluginDefaults, function( key, val ) {
+			expect( ++count );
 			ok( key in defaults, key );
 		});
 	});
@@ -96,6 +102,7 @@ function testWidgetDefaults( widget, defaults ) {
 function testWidgetOverrides( widget ) {
 	if ( $.uiBackCompat === false ) {
 		test( "$.widget overrides", function() {
+			expect( 4 );
 			$.each([
 				"_createWidget",
 				"destroy",
@@ -111,6 +118,8 @@ function testWidgetOverrides( widget ) {
 
 function testBasicUsage( widget ) {
 	test( "basic usage", function() {
+		expect( 3 );
+
 		var defaultElement = $.ui[ widget ].prototype.defaultElement;
 		$( defaultElement ).appendTo( "body" )[ widget ]().remove();
 		ok( true, "initialized on element" );
@@ -131,6 +140,7 @@ TestHelpers.commonWidgetTests = function( widget, settings ) {
 	testWidgetOverrides( widget );
 	testBasicUsage( widget );
 	test( "version", function() {
+		expect( 1 );
 		ok( "version" in $.ui[ widget ].prototype, "version property exists" );
 	});
 };
diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js
index a4ef9f472..771da6da7 100644
--- a/tests/unit/tooltip/tooltip_options.js
+++ b/tests/unit/tooltip/tooltip_options.js
@@ -3,11 +3,13 @@
 module( "tooltip: options" );
 
 test( "content: default", function() {
+	expect( 1 );
 	var element = $( "#tooltipped1" ).tooltip().tooltip( "open" );
 	deepEqual( $( "#" + element.data( "ui-tooltip-id" ) ).text(), "anchortitle" );
 });
 
 test( "content: return string", function() {
+	expect( 1 );
 	var element = $( "#tooltipped1" ).tooltip({
 		content: function() {
 			return "customstring";
@@ -17,6 +19,7 @@ test( "content: return string", function() {
 });
 
 test( "content: return jQuery", function() {
+	expect( 1 );
 	var element = $( "#tooltipped1" ).tooltip({
 		content: function() {
 			return $( "<div>" ).html( "cu<b>s</b>tomstring" );
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index 07e847926..0296b9e4f 100644
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -11,6 +11,7 @@ module( "widget factory", {
 TestHelpers.testJshint( "widget" );
 
 test( "widget creation", function() {
+	expect( 5 );
 	var myPrototype = {
 		_create: function() {},
 		creationTest: function() {}
@@ -78,6 +79,7 @@ test( "element normalization", function() {
 });
 
 test( "custom selector expression", function() {
+	expect( 1 );
 	var elem = $( "<div>" ).appendTo( "#qunit-fixture" );
 	$.widget( "ui.testWidget", {} );
 	elem.testWidget();
@@ -300,6 +302,7 @@ test( "._getCreateEventData()", function() {
 });
 
 test( "re-init", function() {
+	expect( 3 );
 	var div = $( "<div>" ),
 		actions = [];
 
@@ -329,6 +332,7 @@ test( "re-init", function() {
 });
 
 test( "inheritance - options", function() {
+	expect( 4 );
 	// #5830 - Widget: Using inheritance overwrites the base classes options
 	$.widget( "ui.testWidgetBase", {
 		options: {
@@ -441,6 +445,7 @@ test( "._superApply()", function() {
 });
 
 test( ".option() - getter", function() {
+	expect( 6 );
 	$.widget( "ui.testWidget", {
 		_create: function() {}
 	});
@@ -472,6 +477,7 @@ test( ".option() - getter", function() {
 });
 
 test( ".option() - deep option getter", function() {
+	expect( 5 );
 	$.widget( "ui.testWidget", {} );
 	var div = $( "<div>" ).testWidget({
 		foo: {
@@ -490,6 +496,7 @@ test( ".option() - deep option getter", function() {
 });
 
 test( ".option() - delegate to ._setOptions()", function() {
+	expect( 2 );
 	var div,
 		calls = [];
 	$.widget( "ui.testWidget", {
@@ -514,6 +521,7 @@ test( ".option() - delegate to ._setOptions()", function() {
 });
 
 test( ".option() - delegate to ._setOption()", function() {
+	expect( 2 );
 	var div,
 		calls = [];
 	$.widget( "ui.testWidget", {
@@ -544,6 +552,7 @@ test( ".option() - delegate to ._setOption()", function() {
 });
 
 test( ".option() - deep option setter", function() {
+	expect( 6 );
 	$.widget( "ui.testWidget", {} );
 	var div = $( "<div>" ).testWidget();
 	function deepOption( from, to, msg ) {
@@ -592,6 +601,7 @@ test( ".disable()", function() {
 });
 
 test( ".widget() - base", function() {
+	expect( 1 );
 	$.widget( "ui.testWidget", {
 		_create: function() {}
 	});
@@ -600,6 +610,7 @@ test( ".widget() - base", function() {
 });
 
 test( ".widget() - overriden", function() {
+	expect( 1 );
 	var wrapper = $( "<div>" );
 	$.widget( "ui.testWidget", {
 		_create: function() {},
@@ -845,6 +856,7 @@ test( "_off() - all events", function() {
 });
 
 test( "._hoverable()", function() {
+	expect( 10 );
 	$.widget( "ui.testWidget", {
 		_create: function() {
 			this._hoverable( this.element.children() );
@@ -876,10 +888,11 @@ test( "._hoverable()", function() {
 });
 
 test( "._focusable()", function() {
+	expect( 10 );
 	$.widget( "ui.testWidget", {
 		_create: function() {
-		this._focusable( this.element.children() );
-	}
+			this._focusable( this.element.children() );
+		}
 	});
 
 	var div = $( "#widget" ).testWidget().children();
@@ -959,6 +972,7 @@ test( "._trigger() - cancelled event", function() {
 });
 
 test( "._trigger() - cancelled callback", function() {
+	expect( 1 );
 	$.widget( "ui.testWidget", {
 		_create: function() {}
 	});
-- 
cgit v1.2.3


From 25d5aa1fa1c92eebccbacba6f5149a33389c4d23 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 28 Jun 2012 05:38:08 -0700
Subject: Menu tests: Split out markup structure and accessibility assertions.

---
 tests/unit/menu/menu_core.js | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/menu/menu_core.js b/tests/unit/menu/menu_core.js
index ee737ceb1..5ee28c14a 100644
--- a/tests/unit/menu/menu_core.js
+++ b/tests/unit/menu/menu_core.js
@@ -2,23 +2,29 @@
 
 module( "menu: core" );
 
+test( "markup structure", function() {
+	expect( 6 );
+	var element = $( "#menu1" ).menu();
+	ok( element.hasClass( "ui-menu" ), "main element is .ui-menu" );
+	element.children().each(function( index ) {
+		ok( $( this ).hasClass( "ui-menu-item" ), "child " + index + " is .ui-menu-item" );
+	});
+});
+
 test( "accessibility", function () {
-	expect( 5 );
-	var item,
-		element = $( "#menu1" ).menu(),
-		item0 = $( "li:eq(0) a" );
+	expect( 4 );
+	var element = $( "#menu1" ).menu();
 
-	ok( element.hasClass( "ui-menu ui-widget ui-widget-content ui-corner-all" ), "menu class");
 	equal( element.attr( "role" ), "menu", "main role" );
-	ok( !element.attr( "aria-activedescendant" ), "aria attribute not yet active" );
+	ok( !element.attr( "aria-activedescendant" ), "aria-activedescendant not set" );
+
+	element.menu( "focus", $.Event(), element.children().eq( -2 ) );
+	equal( element.attr( "aria-activedescendant" ), "testID1", "aria-activedescendant from existing id" );
 
-	item = element.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
-	element.menu( "focus", $.Event(), item );
-	equal( element.attr( "aria-activedescendant" ), "xid", "aria attribute, id from DOM" );
+	element.menu( "focus", $.Event(), element.children().eq( 0 ) );
+	ok( /^ui-id-\d+$/.test( element.attr( "aria-activedescendant" ) ), "aria-activedescendant from generated id" );
 
-	item = element.find( "li:last" );
-	element.menu( "focus", $.Event(), item );
-	ok( /^ui-id-\d+$/.test( element.attr( "aria-activedescendant" ) ), "aria attribute, generated id");
+	// Item roles are tested in the role option tests
 });
 
 })( jQuery );
-- 
cgit v1.2.3


From a4534bb993887236849adff9da2f43a51fc3df1f Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 4 Jul 2012 09:08:08 -0400
Subject: Update copyright to jQuery Foundation.

---
 MIT-LICENSE.txt                        | 3 ++-
 package.json                           | 2 +-
 tests/jquery.simulate.js               | 3 ++-
 themes/base/jquery.ui.accordion.css    | 3 ++-
 themes/base/jquery.ui.all.css          | 3 ++-
 themes/base/jquery.ui.autocomplete.css | 3 ++-
 themes/base/jquery.ui.base.css         | 3 ++-
 themes/base/jquery.ui.button.css       | 3 ++-
 themes/base/jquery.ui.core.css         | 3 ++-
 themes/base/jquery.ui.datepicker.css   | 3 ++-
 themes/base/jquery.ui.dialog.css       | 3 ++-
 themes/base/jquery.ui.menu.css         | 3 ++-
 themes/base/jquery.ui.progressbar.css  | 3 ++-
 themes/base/jquery.ui.resizable.css    | 3 ++-
 themes/base/jquery.ui.selectable.css   | 3 ++-
 themes/base/jquery.ui.slider.css       | 3 ++-
 themes/base/jquery.ui.spinner.css      | 3 ++-
 themes/base/jquery.ui.tabs.css         | 3 ++-
 themes/base/jquery.ui.theme.css        | 3 ++-
 themes/base/jquery.ui.tooltip.css      | 3 ++-
 ui/jquery.ui.accordion.js              | 3 ++-
 ui/jquery.ui.autocomplete.js           | 3 ++-
 ui/jquery.ui.button.js                 | 3 ++-
 ui/jquery.ui.core.js                   | 5 +++--
 ui/jquery.ui.datepicker.js             | 3 ++-
 ui/jquery.ui.dialog.js                 | 3 ++-
 ui/jquery.ui.draggable.js              | 3 ++-
 ui/jquery.ui.droppable.js              | 3 ++-
 ui/jquery.ui.effect-blind.js           | 3 ++-
 ui/jquery.ui.effect-bounce.js          | 3 ++-
 ui/jquery.ui.effect-clip.js            | 3 ++-
 ui/jquery.ui.effect-drop.js            | 3 ++-
 ui/jquery.ui.effect-explode.js         | 3 ++-
 ui/jquery.ui.effect-fade.js            | 3 ++-
 ui/jquery.ui.effect-fold.js            | 3 ++-
 ui/jquery.ui.effect-highlight.js       | 3 ++-
 ui/jquery.ui.effect-pulsate.js         | 3 ++-
 ui/jquery.ui.effect-scale.js           | 3 ++-
 ui/jquery.ui.effect-shake.js           | 3 ++-
 ui/jquery.ui.effect-slide.js           | 3 ++-
 ui/jquery.ui.effect-transfer.js        | 3 ++-
 ui/jquery.ui.effect.js                 | 3 ++-
 ui/jquery.ui.menu.js                   | 3 ++-
 ui/jquery.ui.mouse.js                  | 3 ++-
 ui/jquery.ui.position.js               | 3 ++-
 ui/jquery.ui.progressbar.js            | 3 ++-
 ui/jquery.ui.resizable.js              | 3 ++-
 ui/jquery.ui.selectable.js             | 3 ++-
 ui/jquery.ui.slider.js                 | 3 ++-
 ui/jquery.ui.sortable.js               | 3 ++-
 ui/jquery.ui.spinner.js                | 3 ++-
 ui/jquery.ui.tabs.js                   | 3 ++-
 ui/jquery.ui.tooltip.js                | 3 ++-
 ui/jquery.ui.widget.js                 | 3 ++-
 54 files changed, 108 insertions(+), 55 deletions(-)

(limited to 'tests')

diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt
index 29652242a..741585591 100644
--- a/MIT-LICENSE.txt
+++ b/MIT-LICENSE.txt
@@ -1,4 +1,5 @@
-Copyright (c) 2012 Paul Bakaus, http://jqueryui.com/
+Copyright 2012 jQuery Foundation and other contributors,
+http://jqueryui.com/
 
 This software consists of voluntary contributions made by many
 individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
diff --git a/package.json b/package.json
index 3c371bf76..025499228 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "version": "1.9.0pre",
   "homepage": "https://github.com/jquery/jquery-ui",
   "author": {
-    "name": "AUTHORS.txt"
+    "name": "jQuery Foundation and other contributors"
   },
   "repository": {
     "type": "git",
diff --git a/tests/jquery.simulate.js b/tests/jquery.simulate.js
index 2dae34c28..874d274cc 100644
--- a/tests/jquery.simulate.js
+++ b/tests/jquery.simulate.js
@@ -1,7 +1,8 @@
 /*
  * jquery.simulate - simulate browser mouse and keyboard events
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  */
diff --git a/themes/base/jquery.ui.accordion.css b/themes/base/jquery.ui.accordion.css
index 32c1a7242..71319ac28 100644
--- a/themes/base/jquery.ui.accordion.css
+++ b/themes/base/jquery.ui.accordion.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Accordion @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.all.css b/themes/base/jquery.ui.all.css
index e2310973a..958dac4be 100644
--- a/themes/base/jquery.ui.all.css
+++ b/themes/base/jquery.ui.all.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI CSS Framework @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.autocomplete.css b/themes/base/jquery.ui.autocomplete.css
index 5e331b63d..e1b127470 100644
--- a/themes/base/jquery.ui.autocomplete.css
+++ b/themes/base/jquery.ui.autocomplete.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Autocomplete @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.base.css b/themes/base/jquery.ui.base.css
index f52f00f28..36a5dd274 100644
--- a/themes/base/jquery.ui.base.css
+++ b/themes/base/jquery.ui.base.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI CSS Framework @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.button.css b/themes/base/jquery.ui.button.css
index 0f3eab474..f5453fb9f 100644
--- a/themes/base/jquery.ui.button.css
+++ b/themes/base/jquery.ui.button.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Button @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.core.css b/themes/base/jquery.ui.core.css
index dc27c564a..33a6c96be 100644
--- a/themes/base/jquery.ui.core.css
+++ b/themes/base/jquery.ui.core.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI CSS Framework @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.datepicker.css b/themes/base/jquery.ui.datepicker.css
index 60ed0c82d..0f4e71562 100644
--- a/themes/base/jquery.ui.datepicker.css
+++ b/themes/base/jquery.ui.datepicker.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Datepicker @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.dialog.css b/themes/base/jquery.ui.dialog.css
index 0ee0d4dd5..22523c82c 100644
--- a/themes/base/jquery.ui.dialog.css
+++ b/themes/base/jquery.ui.dialog.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Dialog @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.menu.css b/themes/base/jquery.ui.menu.css
index b96d439ab..85c387387 100644
--- a/themes/base/jquery.ui.menu.css
+++ b/themes/base/jquery.ui.menu.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Menu @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.progressbar.css b/themes/base/jquery.ui.progressbar.css
index d198bb4a3..877666589 100644
--- a/themes/base/jquery.ui.progressbar.css
+++ b/themes/base/jquery.ui.progressbar.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Progressbar @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.resizable.css b/themes/base/jquery.ui.resizable.css
index 0bb688d5b..bca140eda 100644
--- a/themes/base/jquery.ui.resizable.css
+++ b/themes/base/jquery.ui.resizable.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Resizable @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.selectable.css b/themes/base/jquery.ui.selectable.css
index 2aa7319aa..0fa8942aa 100644
--- a/themes/base/jquery.ui.selectable.css
+++ b/themes/base/jquery.ui.selectable.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Selectable @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.slider.css b/themes/base/jquery.ui.slider.css
index 94d883a44..39d15b034 100644
--- a/themes/base/jquery.ui.slider.css
+++ b/themes/base/jquery.ui.slider.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Slider @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.spinner.css b/themes/base/jquery.ui.spinner.css
index 50d8e19b7..41ffe539c 100644
--- a/themes/base/jquery.ui.spinner.css
+++ b/themes/base/jquery.ui.spinner.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Spinner @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.tabs.css b/themes/base/jquery.ui.tabs.css
index 2f12da74a..a2efae8b0 100644
--- a/themes/base/jquery.ui.tabs.css
+++ b/themes/base/jquery.ui.tabs.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Tabs @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.theme.css b/themes/base/jquery.ui.theme.css
index 3a9cfae82..86da8a295 100644
--- a/themes/base/jquery.ui.theme.css
+++ b/themes/base/jquery.ui.theme.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI CSS Framework @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.tooltip.css b/themes/base/jquery.ui.tooltip.css
index d144b0a7f..ed29c137a 100644
--- a/themes/base/jquery.ui.tooltip.css
+++ b/themes/base/jquery.ui.tooltip.css
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Tooltip @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  */
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index e8a10b746..7d98886e7 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Accordion @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index b8d86644c..25d909f8d 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Autocomplete @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 89f6626f8..1aa44abdd 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Button @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.core.js b/ui/jquery.ui.core.js
index a511de24b..ad0ab25d7 100644
--- a/ui/jquery.ui.core.js
+++ b/ui/jquery.ui.core.js
@@ -1,7 +1,8 @@
 /*!
- * jQuery UI @VERSION
+ * jQuery UI Core @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 6f3e2f34f..06db79ba7 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Datepicker @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index a22eef806..818363d0b 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Dialog @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index a9b8cadbb..2f05ad6a4 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Draggable @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js
index e2ad221e1..17a56787a 100644
--- a/ui/jquery.ui.droppable.js
+++ b/ui/jquery.ui.droppable.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Droppable @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.effect-blind.js b/ui/jquery.ui.effect-blind.js
index 4f25f8cd2..7cc353525 100644
--- a/ui/jquery.ui.effect-blind.js
+++ b/ui/jquery.ui.effect-blind.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Effects Blind @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.effect-bounce.js b/ui/jquery.ui.effect-bounce.js
index 1e7801331..0a93bda08 100644
--- a/ui/jquery.ui.effect-bounce.js
+++ b/ui/jquery.ui.effect-bounce.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Effects Bounce @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.effect-clip.js b/ui/jquery.ui.effect-clip.js
index 0b2d7e24a..6539acf24 100644
--- a/ui/jquery.ui.effect-clip.js
+++ b/ui/jquery.ui.effect-clip.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Effects Clip @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.effect-drop.js b/ui/jquery.ui.effect-drop.js
index 8eda32d8e..3246c09b0 100644
--- a/ui/jquery.ui.effect-drop.js
+++ b/ui/jquery.ui.effect-drop.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Effects Drop @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.effect-explode.js b/ui/jquery.ui.effect-explode.js
index a7447da73..1048b0a42 100644
--- a/ui/jquery.ui.effect-explode.js
+++ b/ui/jquery.ui.effect-explode.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Effects Explode @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.effect-fade.js b/ui/jquery.ui.effect-fade.js
index 92d9ca0a4..ee031fcd8 100644
--- a/ui/jquery.ui.effect-fade.js
+++ b/ui/jquery.ui.effect-fade.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Effects Fade @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.effect-fold.js b/ui/jquery.ui.effect-fold.js
index 47b7a8395..7619285c2 100644
--- a/ui/jquery.ui.effect-fold.js
+++ b/ui/jquery.ui.effect-fold.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Effects Fold @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.effect-highlight.js b/ui/jquery.ui.effect-highlight.js
index 333e37d72..f6868d136 100644
--- a/ui/jquery.ui.effect-highlight.js
+++ b/ui/jquery.ui.effect-highlight.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Effects Highlight @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.effect-pulsate.js b/ui/jquery.ui.effect-pulsate.js
index ce9faf64f..543f6310d 100644
--- a/ui/jquery.ui.effect-pulsate.js
+++ b/ui/jquery.ui.effect-pulsate.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Effects Pulsate @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.effect-scale.js b/ui/jquery.ui.effect-scale.js
index 9352ac027..5e1dc8540 100644
--- a/ui/jquery.ui.effect-scale.js
+++ b/ui/jquery.ui.effect-scale.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Effects Scale @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.effect-shake.js b/ui/jquery.ui.effect-shake.js
index e0fb17d34..51d8e1129 100644
--- a/ui/jquery.ui.effect-shake.js
+++ b/ui/jquery.ui.effect-shake.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Effects Shake @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.effect-slide.js b/ui/jquery.ui.effect-slide.js
index 0de9bed94..d61047b8b 100644
--- a/ui/jquery.ui.effect-slide.js
+++ b/ui/jquery.ui.effect-slide.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Effects Slide @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.effect-transfer.js b/ui/jquery.ui.effect-transfer.js
index fefa551b4..7d6c10933 100644
--- a/ui/jquery.ui.effect-transfer.js
+++ b/ui/jquery.ui.effect-transfer.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Effects Transfer @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.effect.js b/ui/jquery.ui.effect.js
index b4e0787da..da3c70b7c 100644
--- a/ui/jquery.ui.effect.js
+++ b/ui/jquery.ui.effect.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Effects @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 5d97343d7..2a4c0b540 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Menu @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js
index e2e06897c..6f95765f2 100644
--- a/ui/jquery.ui.mouse.js
+++ b/ui/jquery.ui.mouse.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Mouse @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js
index bd7bfb015..2802b2ce0 100644
--- a/ui/jquery.ui.position.js
+++ b/ui/jquery.ui.position.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Position @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.progressbar.js b/ui/jquery.ui.progressbar.js
index 68cccc554..74a2d6923 100644
--- a/ui/jquery.ui.progressbar.js
+++ b/ui/jquery.ui.progressbar.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Progressbar @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
index abe540c59..be174dd7e 100644
--- a/ui/jquery.ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Resizable @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.selectable.js b/ui/jquery.ui.selectable.js
index 2db9a8886..1da7fffa3 100644
--- a/ui/jquery.ui.selectable.js
+++ b/ui/jquery.ui.selectable.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Selectable @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index e44d20f7c..adceb356c 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Slider @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index c8ea73702..7e5875200 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Sortable @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js
index d6ebc6d87..6acb3693e 100644
--- a/ui/jquery.ui.spinner.js
+++ b/ui/jquery.ui.spinner.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Spinner @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index 980ecfe89..588b8cdb2 100644
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Tabs @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 5ef5051af..8bfe78c05 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Tooltip @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index dfad19220..628b63bb0 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -1,7 +1,8 @@
 /*!
  * jQuery UI Widget @VERSION
+ * http://jqueryui.com
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
-- 
cgit v1.2.3


From c6567ba8800c2ddf0b2b2a18682f670ba77a3a2b Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 5 Jul 2012 20:49:00 -0400
Subject: Tabs tests: Add tests for accessibility of ajax tabs.

---
 tests/unit/tabs/tabs_core.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/unit/tabs/tabs_core.js b/tests/unit/tabs/tabs_core.js
index fd9cc7d63..f1a2d72c1 100644
--- a/tests/unit/tabs/tabs_core.js
+++ b/tests/unit/tabs/tabs_core.js
@@ -118,8 +118,24 @@ test( "accessibility", function() {
 	equal( tabs.eq( 2 ).attr( "aria-disabled" ), "true", "disabled tab has aria-disabled=true" );
 	equal( panels.eq( 2 ).attr( "aria-expanded" ), "false", "inactive panel has aria-expanded=false" );
 	equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "inactive panel has aria-hidden=true" );
+});
 
-	// TODO: aria-live and aria-busy tests for ajax tabs
+asyncTest( "accessibility - ajax", function() {
+	expect( 4 );
+	var element = $( "#tabs2" ).tabs(),
+		tab = element.find( ".ui-tabs-nav li" ).eq( 3 ),
+		panel = $( "#custom-id" );
+
+	equal( panel.attr( "aria-live" ), "polite", "remote panel has aria-live" );
+	equal( panel.attr( "aria-busy" ), null, "does not have aria-busy on init" );
+	element.tabs( "option", "active", 3 );
+	equal( panel.attr( "aria-busy" ), "true", "panel has aria-busy during load" );
+	element.one( "tabsload", function() {
+		setTimeout(function() {
+			equal( panel.attr( "aria-busy" ), null, "panel does not have aria-busy after load" );
+			start();
+		}, 1 );
+	});
 });
 
 asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER", function() {
-- 
cgit v1.2.3


From a6e6a0504f7ebdee9726cfb31091e6e8b7f62a1d Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 5 Jul 2012 21:07:49 -0400
Subject: Tabs tests: Added tests for show and hide options.

---
 tests/unit/tabs/tabs_options.js | 50 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/unit/tabs/tabs_options.js b/tests/unit/tabs/tabs_options.js
index eed5b99d8..5a90ff895 100644
--- a/tests/unit/tabs/tabs_options.js
+++ b/tests/unit/tabs/tabs_options.js
@@ -280,6 +280,54 @@ test( "{ heightStyle: 'fill' } with multiple siblings", function() {
 	equalHeight( element, 335 );
 });
 
-// TODO: add animation tests
+test( "hide and show: false", function() {
+	expect( 3 );
+	var element = $( "#tabs1" ).tabs({
+			show: false,
+			hide: false
+		}),
+		widget = element.data( "tabs" ),
+		panels = element.find( ".ui-tabs-panel" );
+	widget._show = function() {
+		ok( false, "_show() called" );
+	};
+	widget._hide = function() {
+		ok( false, "_hide() called" );
+	};
+
+	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
+	element.tabs( "option", "active", 1 );
+	ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" );
+	ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" );
+});
+
+asyncTest( "hide and show - animation", function() {
+	expect( 5 );
+	var element = $( "#tabs1" ).tabs({
+			show: "drop",
+			hide: 2000
+		}),
+		widget = element.data( "tabs" ),
+		panels = element.find( ".ui-tabs-panel" );
+	widget._show = function( element, options, callback ) {
+		strictEqual( element[ 0 ], panels[ 1 ], "correct element in _show()" );
+		equal( options, "drop", "correct options in _show()" );
+		setTimeout(function() {
+			callback();
+		}, 1 );
+	};
+	widget._hide = function( element, options, callback ) {
+		strictEqual( element[ 0 ], panels[ 0 ], "correct element in _hide()" );
+		equal( options, 2000, "correct options in _hide()" );
+		setTimeout(function() {
+			callback();
+			start();
+		}, 1 );
+	};
+
+	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
+	element.tabs( "option", "active", 1 );
+});
+
 
 }( jQuery ) );
-- 
cgit v1.2.3


From a79d09a905740ce299f57602144144eee9b03af2 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 9 Jul 2012 16:02:43 -0400
Subject: Widget: Create lowercase pseudo selectors. Fixes #8433 - Widget:
 Create lowercase pseudo selectors.

---
 tests/unit/widget/widget_core.js | 2 +-
 ui/jquery.ui.widget.js           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index 0296b9e4f..5efd91268 100644
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -83,7 +83,7 @@ test( "custom selector expression", function() {
 	var elem = $( "<div>" ).appendTo( "#qunit-fixture" );
 	$.widget( "ui.testWidget", {} );
 	elem.testWidget();
-	deepEqual( $( ":ui-testWidget" )[0], elem[0] );
+	deepEqual( $( ":ui-testwidget" )[0], elem[0] );
 	elem.testWidget( "destroy" );
 });
 
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index 628b63bb0..b5dfaa344 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -36,7 +36,7 @@ $.widget = function( name, base, prototype ) {
 	}
 
 	// create selector for plugin
-	$.expr[ ":" ][ fullName ] = function( elem ) {
+	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
 		return !!$.data( elem, fullName );
 	};
 
-- 
cgit v1.2.3


From db3fabedb46011224a5a2a1dd300cb954dd61b8d Mon Sep 17 00:00:00 2001
From: kborchers <kris.borchers@gmail.com>
Date: Tue, 10 Jul 2012 00:12:39 -0500
Subject: Menu: Expose the submenu indicator icon as an icon option

---
 tests/unit/menu/menu_common.js | 1 +
 tests/visual/menu/menu.html    | 5 +++--
 ui/jquery.ui.menu.js           | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/menu/menu_common.js b/tests/unit/menu/menu_common.js
index 07295f1af..02e0befe8 100644
--- a/tests/unit/menu/menu_common.js
+++ b/tests/unit/menu/menu_common.js
@@ -7,6 +7,7 @@ TestHelpers.commonWidgetTests( "menu", {
 			at: "right top"
 		},
 		role: "menu",
+		icon: "ui-icon-carat-1-e",
 
 		// callbacks
 		blur: null,
diff --git a/tests/visual/menu/menu.html b/tests/visual/menu/menu.html
index 5bda32eae..205cb10c9 100644
--- a/tests/visual/menu/menu.html
+++ b/tests/visual/menu/menu.html
@@ -26,7 +26,8 @@
 
 		$( "#menu6" ).menu({
 			menus: ".menuElement",
-			select: logger
+			select: logger,
+			icon: "ui-icon-carat-1-s"
 		});
 	});
 	</script>
@@ -212,7 +213,7 @@
 	</blockquote>
 </div>
 
-<h2>Menu with custom markup, multi-line items</h2>
+<h2>Menu with custom markup, multi-line items and a custom submenu icon</h2>
 <div class="menuElement" id="menu6">
 	<div class="address-item">
 		<a href="#">
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 7861230aa..923421e52 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -28,6 +28,7 @@ $.widget( "ui.menu", {
 			at: "right top"
 		},
 		role: "menu",
+		icon: "ui-icon-carat-1-e",
 
 		// callbacks
 		blur: null,
@@ -279,6 +280,7 @@ $.widget( "ui.menu", {
 	refresh: function() {
 		// Initialize nested menus
 		var menus,
+			icon = this.options.icon,
 			submenus = this.element.find( this.options.menus + ":not(.ui-menu)" )
 				.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
 				.hide()
@@ -318,7 +320,7 @@ $.widget( "ui.menu", {
 			var menu = $( this ),
 				item = menu.prev( "a" ),
 				submenuCarat = $( "<span>" )
-					.addClass( "ui-menu-icon ui-icon ui-icon-carat-1-e" )
+					.addClass( "ui-menu-icon ui-icon " + icon )
 					.data( "ui-menu-submenu-carat", true );
 
 			item
-- 
cgit v1.2.3


From 566c5f40582effbb393e4890f2992c952702ab1d Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Tue, 10 Jul 2012 12:07:00 -0400
Subject: Menu: Alphabetize options.

---
 tests/unit/menu/menu_common.js | 2 +-
 ui/jquery.ui.menu.js           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/menu/menu_common.js b/tests/unit/menu/menu_common.js
index 02e0befe8..2ab32ac05 100644
--- a/tests/unit/menu/menu_common.js
+++ b/tests/unit/menu/menu_common.js
@@ -1,13 +1,13 @@
 TestHelpers.commonWidgetTests( "menu", {
 	defaults: {
 		disabled: false,
+		icon: "ui-icon-carat-1-e",
 		menus: "ul",
 		position: {
 			my: "left top",
 			at: "right top"
 		},
 		role: "menu",
-		icon: "ui-icon-carat-1-e",
 
 		// callbacks
 		blur: null,
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index e04c48b66..e57d1985a 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -22,13 +22,13 @@ $.widget( "ui.menu", {
 	defaultElement: "<ul>",
 	delay: 300,
 	options: {
+		icon: "ui-icon-carat-1-e",
 		menus: "ul",
 		position: {
 			my: "left top",
 			at: "right top"
 		},
 		role: "menu",
-		icon: "ui-icon-carat-1-e",
 
 		// callbacks
 		blur: null,
-- 
cgit v1.2.3


From 51c0878c41bf5880bfee58417c71727607c1d21f Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Tue, 10 Jul 2012 13:58:20 -0400
Subject: Menu tests: More complete role option tests.

---
 tests/unit/menu/menu_options.js | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js
index 27c2fabb3..a5df70026 100644
--- a/tests/unit/menu/menu_options.js
+++ b/tests/unit/menu/menu_options.js
@@ -40,7 +40,13 @@ test( "{ disabled: false }", function() {
 	equal( logOutput(), "click,1,afterclick", "Click order not valid." );
 });
 
-test( "{ role: 'menu' } ", function () {
+// TODO: test icon option
+
+// TODO: test menus option
+
+// TODO: test position option
+
+test( "{ role: 'menu' } ", function() {
 	var element = $( "#menu1" ).menu(),
 		items = element.find( "li" );
 	expect( 2 + 5 * items.length );
@@ -55,16 +61,37 @@ test( "{ role: 'menu' } ", function () {
 	});
 });
 
-test( "{ role: 'listbox' } ", function () {
+test( "{ role: 'listbox' } ", function() {
 	var element = $( "#menu1" ).menu({
 			role: "listbox"
 		}),
 		items = element.find( "li" );
-	expect( 2 + items.length );
+	expect( 2 + 5 * items.length );
 	equal( element.attr( "role" ), "listbox" );
 	ok( items.length > 0, "number of menu items" );
 	items.each(function( item ) {
+		ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" );
+		equal( $( this ).attr( "role" ), "presentation", "menu item ("+ item + ") role" );
 		equal( $( "a", this ).attr( "role" ), "option", "menu item ("+ item + ") role" );
+		ok( $( "a", this ).hasClass( "ui-corner-all" ), "a element class for menu item ("+ item + ")" );
+		equal( $( "a", this ).attr( "tabindex" ), "-1", "a element tabindex for menu item ("+ item + ")" );
+	});
+});
+
+test( "{ role: null }", function() {
+	var element = $( "#menu1" ).menu({
+			role: null
+		}),
+		items = element.find( "li" );
+	expect( 2 + 5 * items.length );
+	strictEqual( element.attr( "role" ), undefined );
+	ok( items.length > 0, "number of menu items" );
+	items.each(function( item ) {
+		ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" );
+		equal( $( this ).attr( "role" ), "presentation", "menu item ("+ item + ") role" );
+		equal( $( "a", this ).attr( "role" ), undefined, "menu item ("+ item + ") role" );
+		ok( $( "a", this ).hasClass( "ui-corner-all" ), "a element class for menu item ("+ item + ")" );
+		equal( $( "a", this ).attr( "tabindex" ), "-1", "a element tabindex for menu item ("+ item + ")" );
 	});
 });
 
-- 
cgit v1.2.3


From 70c5cce84e2003adb1e54526467808bc7c7b199c Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Tue, 10 Jul 2012 14:01:23 -0400
Subject: Menu tests: Proper detection for absence of ui-state-disabled class.

---
 tests/unit/menu/menu_options.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js
index a5df70026..1ccbb20ab 100644
--- a/tests/unit/menu/menu_options.js
+++ b/tests/unit/menu/menu_options.js
@@ -18,7 +18,7 @@ test( "{ disabled: true }", function() {
 			log();
 		}
 	});
-	ok( element.is( ".ui-state-disabled" ), "Missing ui-state-disabled class" );
+	ok( element.hasClass( "ui-state-disabled" ), "Missing ui-state-disabled class" );
 	log( "click", true );
 	click( element, "1" );
 	log( "afterclick" );
@@ -33,7 +33,7 @@ test( "{ disabled: false }", function() {
 			log();
 		}
 	});
-	ok( element.not( ".ui-state-disabled" ), "Has ui-state-disabled class" );
+	ok( !element.hasClass( "ui-state-disabled" ), "Has ui-state-disabled class" );
 	log( "click", true );
 	click( element, "1" );
 	log( "afterclick" );
-- 
cgit v1.2.3


From b2b54790b2f35cfc7562343d43582e39dc57fc39 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Tue, 10 Jul 2012 15:23:04 -0400
Subject: Menu tests: Added TODOs for missing method tests.

---
 tests/unit/menu/menu_methods.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'tests')

diff --git a/tests/unit/menu/menu_methods.js b/tests/unit/menu/menu_methods.js
index 0835f61ec..510ddb1d7 100644
--- a/tests/unit/menu/menu_methods.js
+++ b/tests/unit/menu/menu_methods.js
@@ -44,6 +44,30 @@ test( "refresh", function() {
 	equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
 });
 
+// TODO: test focus method
+
+// TODO: test blur method
+
+// TODO: test collapseAll method
+
+// TODO: test collapse method
+
+// TODO: test expand method
+
+// TODO: test next method
+
+// TODO: test prev method
+
+// TODO: test isFirstItem method
+
+// TODO: test isLastItem method
+
+// TODO: test nextPage method
+
+// TODO: test prevPage method
+
+// TODO: test select method
+
 test( "destroy", function() {
 	expect( 4 );
 	domEqual( "#menu1", function() {
-- 
cgit v1.2.3


From 0a4c3344300d7a753328d5e3b9b978b35a249122 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Mon, 9 Jul 2012 18:45:49 -0700
Subject: Update to QUnit 1.9.0 and use new urlConfig for custom checkboxes

---
 external/qunit.css      |  41 ++++++++----------
 external/qunit.js       | 113 ++++++++++++++++++++++++++++++++++++++----------
 tests/unit/testsuite.js |  14 +++++-
 3 files changed, 121 insertions(+), 47 deletions(-)

(limited to 'tests')

diff --git a/external/qunit.css b/external/qunit.css
index 5684a4485..257b224ff 100644
--- a/external/qunit.css
+++ b/external/qunit.css
@@ -1,5 +1,5 @@
 /**
- * QUnit v1.8.0 - A JavaScript Unit Testing Framework
+ * QUnit v1.9.0 - A JavaScript Unit Testing Framework
  *
  * http://docs.jquery.com/QUnit
  *
@@ -38,10 +38,10 @@
 	line-height: 1em;
 	font-weight: normal;
 
-	border-radius: 15px 15px 0 0;
-	-moz-border-radius: 15px 15px 0 0;
-	-webkit-border-top-right-radius: 15px;
-	-webkit-border-top-left-radius: 15px;
+	border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	-webkit-border-top-right-radius: 5px;
+	-webkit-border-top-left-radius: 5px;
 }
 
 #qunit-header a {
@@ -54,9 +54,9 @@
 	color: #fff;
 }
 
-#qunit-header label {
+#qunit-testrunner-toolbar label {
 	display: inline-block;
-	padding-left: 0.5em;
+	padding: 0 .5em 0 .1em;
 }
 
 #qunit-banner {
@@ -113,13 +113,9 @@
 
 	background-color: #fff;
 
-	border-radius: 15px;
-	-moz-border-radius: 15px;
-	-webkit-border-radius: 15px;
-
-	box-shadow: inset 0px 2px 13px #999;
-	-moz-box-shadow: inset 0px 2px 13px #999;
-	-webkit-box-shadow: inset 0px 2px 13px #999;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
 }
 
 #qunit-tests table {
@@ -162,8 +158,7 @@
 #qunit-tests b.failed                       { color: #710909; }
 
 #qunit-tests li li {
-	margin: 0.5em;
-	padding: 0.4em 0.5em 0.4em 0.5em;
+	padding: 5px;
 	background-color: #fff;
 	border-bottom: none;
 	list-style-position: inside;
@@ -172,9 +167,9 @@
 /*** Passing Styles */
 
 #qunit-tests li li.pass {
-	color: #5E740B;
+	color: #3c510c;
 	background-color: #fff;
-	border-left: 26px solid #C6E746;
+	border-left: 10px solid #C6E746;
 }
 
 #qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
@@ -190,15 +185,15 @@
 #qunit-tests li li.fail {
 	color: #710909;
 	background-color: #fff;
-	border-left: 26px solid #EE5757;
+	border-left: 10px solid #EE5757;
 	white-space: pre;
 }
 
 #qunit-tests > li:last-child {
-	border-radius: 0 0 15px 15px;
-	-moz-border-radius: 0 0 15px 15px;
-	-webkit-border-bottom-right-radius: 15px;
-	-webkit-border-bottom-left-radius: 15px;
+	border-radius: 0 0 5px 5px;
+	-moz-border-radius: 0 0 5px 5px;
+	-webkit-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;
 }
 
 #qunit-tests .fail                          { color: #000000; background-color: #EE5757; }
diff --git a/external/qunit.js b/external/qunit.js
index c1570c252..9efedcb44 100644
--- a/external/qunit.js
+++ b/external/qunit.js
@@ -1,5 +1,5 @@
 /**
- * QUnit v1.8.0 - A JavaScript Unit Testing Framework
+ * QUnit v1.9.0 - A JavaScript Unit Testing Framework
  *
  * http://docs.jquery.com/QUnit
  *
@@ -403,6 +403,8 @@ QUnit = {
 QUnit.assert = {
 	/**
 	 * Asserts rough true-ish result.
+	 * @name ok
+	 * @function
 	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
 	 */
 	ok: function( result, msg ) {
@@ -437,36 +439,59 @@ QUnit.assert = {
 	/**
 	 * Assert that the first two arguments are equal, with an optional message.
 	 * Prints out both actual and expected values.
+	 * @name equal
+	 * @function
 	 * @example equal( format( "Received {0} bytes.", 2), "Received 2 bytes.", "format() replaces {0} with next argument" );
 	 */
 	equal: function( actual, expected, message ) {
 		QUnit.push( expected == actual, actual, expected, message );
 	},
 
+	/**
+	 * @name notEqual
+	 * @function
+	 */
 	notEqual: function( actual, expected, message ) {
 		QUnit.push( expected != actual, actual, expected, message );
 	},
 
+	/**
+	 * @name deepEqual
+	 * @function
+	 */
 	deepEqual: function( actual, expected, message ) {
 		QUnit.push( QUnit.equiv(actual, expected), actual, expected, message );
 	},
 
+	/**
+	 * @name notDeepEqual
+	 * @function
+	 */
 	notDeepEqual: function( actual, expected, message ) {
 		QUnit.push( !QUnit.equiv(actual, expected), actual, expected, message );
 	},
 
+	/**
+	 * @name strictEqual
+	 * @function
+	 */
 	strictEqual: function( actual, expected, message ) {
 		QUnit.push( expected === actual, actual, expected, message );
 	},
 
+	/**
+	 * @name notStrictEqual
+	 * @function
+	 */
 	notStrictEqual: function( actual, expected, message ) {
 		QUnit.push( expected !== actual, actual, expected, message );
 	},
 
-	raises: function( block, expected, message ) {
+	throws: function( block, expected, message ) {
 		var actual,
 			ok = false;
 
+		// 'expected' is optional
 		if ( typeof expected === "string" ) {
 			message = expected;
 			expected = null;
@@ -494,18 +519,29 @@ QUnit.assert = {
 			} else if ( expected.call( {}, actual ) === true ) {
 				ok = true;
 			}
-		}
 
-		QUnit.push( ok, actual, null, message );
+			QUnit.push( ok, actual, null, message );
+		} else {
+			QUnit.pushFailure( message, null, 'No exception was thrown.' );
+		}
 	}
 };
 
-// @deprecated: Kept assertion helpers in root for backwards compatibility
+/**
+ * @deprecate since 1.8.0
+ * Kept assertion helpers in root for backwards compatibility
+ */
 extend( QUnit, QUnit.assert );
 
 /**
- * @deprecated: Kept for backwards compatibility
- * next step: remove entirely
+ * @deprecated since 1.9.0
+ * Kept global "raises()" for backwards compatibility
+ */
+QUnit.raises = QUnit.assert.throws;
+
+/**
+ * @deprecated since 1.0.0, replaced with error pushes since 1.3.0
+ * Kept to avoid TypeErrors for undefined methods.
  */
 QUnit.equals = function() {
 	QUnit.push( false, false, false, "QUnit.equals has been deprecated since 2009 (e88049a0), use QUnit.equal instead" );
@@ -549,7 +585,20 @@ config = {
 	// when enabled, all tests must call expect()
 	requireExpects: false,
 
-	urlConfig: [ "noglobals", "notrycatch" ],
+	// add checkboxes that are persisted in the query-string
+	// when enabled, the id is set to `true` as a `QUnit.config` property
+	urlConfig: [
+		{
+			id: "noglobals",
+			label: "Check for Globals",
+			tooltip: "Enabling this will test if any test introduces new properties on the `window` object. Stored as query-strings."
+		},
+		{
+			id: "notrycatch",
+			label: "No try-catch",
+			tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging exceptions in IE reasonable. Stored as query-strings."
+		}
+	],
 
 	// logging callback queues
 	begin: [],
@@ -770,7 +819,7 @@ extend( QUnit, {
 		});
 	},
 
-	pushFailure: function( message, source ) {
+	pushFailure: function( message, source, actual ) {
 		if ( !config.current ) {
 			throw new Error( "pushFailure() assertion outside test context, was " + sourceFromStacktrace(2) );
 		}
@@ -781,15 +830,23 @@ extend( QUnit, {
 				message: message
 			};
 
-		message = escapeInnerText(message ) || "error";
+		message = escapeInnerText( message ) || "error";
 		message = "<span class='test-message'>" + message + "</span>";
 		output = message;
 
+		output += "<table>";
+
+		if ( actual ) {
+			output += "<tr class='test-actual'><th>Result: </th><td><pre>" + escapeInnerText( actual ) + "</pre></td></tr>";
+		}
+
 		if ( source ) {
 			details.source = source;
-			output += "<table><tr class='test-source'><th>Source: </th><td><pre>" + escapeInnerText( source ) + "</pre></td></tr></table>";
+			output += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeInnerText( source ) + "</pre></td></tr>";
 		}
 
+		output += "</table>";
+
 		runLoggingCallbacks( "log", QUnit, details );
 
 		config.current.assertions.push({
@@ -859,7 +916,7 @@ QUnit.load = function() {
 	runLoggingCallbacks( "begin", QUnit, {} );
 
 	// Initialize the config, saving the execution queue
-	var banner, filter, i, label, len, main, ol, toolbar, userAgent, val,
+	var banner, filter, i, label, len, main, ol, toolbar, userAgent, val, urlConfigCheckboxes,
 		urlConfigHtml = "",
 		oldconfig = extend( {}, config );
 
@@ -872,8 +929,15 @@ QUnit.load = function() {
 
 	for ( i = 0; i < len; i++ ) {
 		val = config.urlConfig[i];
-		config[val] = QUnit.urlParams[val];
-		urlConfigHtml += "<label><input name='" + val + "' type='checkbox'" + ( config[val] ? " checked='checked'" : "" ) + ">" + val + "</label>";
+		if ( typeof val === "string" ) {
+			val = {
+				id: val,
+				label: val,
+				tooltip: "[no tooltip available]"
+			};
+		}
+		config[ val.id ] = QUnit.urlParams[ val.id ];
+		urlConfigHtml += "<input id='qunit-urlconfig-" + val.id + "' name='" + val.id + "' type='checkbox'" + ( config[ val.id ] ? " checked='checked'" : "" ) + " title='" + val.tooltip + "'><label for='qunit-urlconfig-" + val.id + "' title='" + val.tooltip + "'>" + val.label + "</label>";
 	}
 
 	// `userAgent` initialized at top of scope
@@ -885,12 +949,7 @@ QUnit.load = function() {
 	// `banner` initialized at top of scope
 	banner = id( "qunit-header" );
 	if ( banner ) {
-		banner.innerHTML = "<a href='" + QUnit.url({ filter: undefined }) + "'>" + banner.innerHTML + "</a> " + urlConfigHtml;
-		addEvent( banner, "change", function( event ) {
-			var params = {};
-			params[ event.target.name ] = event.target.checked ? true : undefined;
-			window.location = QUnit.url( params );
-		});
+		banner.innerHTML = "<a href='" + QUnit.url({ filter: undefined, module: undefined, testNumber: undefined }) + "'>" + banner.innerHTML + "</a> ";
 	}
 
 	// `toolbar` initialized at top of scope
@@ -931,8 +990,18 @@ QUnit.load = function() {
 		// `label` initialized at top of scope
 		label = document.createElement( "label" );
 		label.setAttribute( "for", "qunit-filter-pass" );
+		label.setAttribute( "title", "Only show tests and assertons that fail. Stored in sessionStorage." );
 		label.innerHTML = "Hide passed tests";
 		toolbar.appendChild( label );
+
+		urlConfigCheckboxes = document.createElement( 'span' );
+		urlConfigCheckboxes.innerHTML = urlConfigHtml;
+		addEvent( urlConfigCheckboxes, "change", function( event ) {
+			var params = {};
+			params[ event.target.name ] = event.target.checked ? true : undefined;
+			window.location = QUnit.url( params );
+		});
+		toolbar.appendChild( urlConfigCheckboxes );
 	}
 
 	// `main` initialized at top of scope
@@ -1051,14 +1120,14 @@ function done() {
 function validTest( test ) {
 	var include,
 		filter = config.filter && config.filter.toLowerCase(),
-		module = config.module,
+		module = config.module && config.module.toLowerCase(),
 		fullName = (test.module + ": " + test.testName).toLowerCase();
 
 	if ( config.testNumber ) {
 		return test.testNumber === config.testNumber;
 	}
 
-	if ( module && test.module !== module ) {
+	if ( module && ( !test.module || test.module.toLowerCase() !== module ) ) {
 		return false;
 	}
 
diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index 99694a83e..26f46138a 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -12,7 +12,12 @@ function includeScript( url ) {
 
 QUnit.config.requireExpects = true;
 
-QUnit.config.urlConfig.push( "min" );
+QUnit.config.urlConfig.push({
+  id: "min",
+  label: "Minified source",
+  tooltip: "Load minified source files instead of the regular unminified ones."
+});
+
 TestHelpers.loadResources = QUnit.urlParams.min ?
 	function() {
 		// TODO: proper include with theme images
@@ -28,7 +33,12 @@ TestHelpers.loadResources = QUnit.urlParams.min ?
 		});
 	};
 
-QUnit.config.urlConfig.push( "nojshint" );
+QUnit.config.urlConfig.push({
+	id: "nojshint",
+	label: "Skip JSHint",
+	tooltip: "Skip running JSHint, e.g. within TestSwarm, where Jenkins runs it already"
+});
+
 var jshintLoaded = false;
 TestHelpers.testJshint = function( module ) {
 	if ( QUnit.urlParams.nojshint ) {
-- 
cgit v1.2.3


From 1510f7e28a7cdb259409faa4b94ba2c1a52467ce Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Thu, 12 Jul 2012 17:34:55 +0200
Subject: Update externals to latest mousewheel plugin, drop the version from
 the fielname while at it

---
 demos/spinner/currency.html         |  2 +-
 demos/spinner/decimal.html          |  2 +-
 demos/spinner/default.html          |  2 +-
 demos/spinner/latlong.html          |  2 +-
 demos/spinner/overflow.html         |  2 +-
 demos/spinner/time.html             |  2 +-
 external/jquery.mousewheel-3.0.4.js | 78 ----------------------------------
 external/jquery.mousewheel.js       | 84 +++++++++++++++++++++++++++++++++++++
 tests/unit/spinner/spinner.html     |  2 +-
 9 files changed, 91 insertions(+), 85 deletions(-)
 delete mode 100644 external/jquery.mousewheel-3.0.4.js
 create mode 100644 external/jquery.mousewheel.js

(limited to 'tests')

diff --git a/demos/spinner/currency.html b/demos/spinner/currency.html
index 348666143..ff51b0177 100644
--- a/demos/spinner/currency.html
+++ b/demos/spinner/currency.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Spinner - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../external/jquery.mousewheel-3.0.4.js"></script>
+	<script src="../../external/jquery.mousewheel.js"></script>
 	<script src="../../external/globalize.js"></script>
 	<script src="../../external/globalize.culture.de-DE.js"></script>
 	<script src="../../external/globalize.culture.ja-JP.js"></script>
diff --git a/demos/spinner/decimal.html b/demos/spinner/decimal.html
index 0af4c520c..87e413da8 100644
--- a/demos/spinner/decimal.html
+++ b/demos/spinner/decimal.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Spinner - Decimal</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../external/jquery.mousewheel-3.0.4.js"></script>
+	<script src="../../external/jquery.mousewheel.js"></script>
 	<script src="../../external/globalize.js"></script>
 	<script src="../../external/globalize.culture.de-DE.js"></script>
 	<script src="../../external/globalize.culture.ja-JP.js"></script>
diff --git a/demos/spinner/default.html b/demos/spinner/default.html
index 1827724b9..b857a9095 100644
--- a/demos/spinner/default.html
+++ b/demos/spinner/default.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Spinner - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../external/jquery.mousewheel-3.0.4.js"></script>
+	<script src="../../external/jquery.mousewheel.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>
 	<script src="../../ui/jquery.ui.widget.js"></script>
 	<script src="../../ui/jquery.ui.button.js"></script>
diff --git a/demos/spinner/latlong.html b/demos/spinner/latlong.html
index f4292c56a..eafbd257f 100644
--- a/demos/spinner/latlong.html
+++ b/demos/spinner/latlong.html
@@ -6,7 +6,7 @@
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../external/jquery.mousewheel-3.0.4.js"></script>
+	<script src="../../external/jquery.mousewheel.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>
 	<script src="../../ui/jquery.ui.widget.js"></script>
 	<script src="../../ui/jquery.ui.button.js"></script>
diff --git a/demos/spinner/overflow.html b/demos/spinner/overflow.html
index 312853ddb..17d1ca30b 100644
--- a/demos/spinner/overflow.html
+++ b/demos/spinner/overflow.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Spinner - Overflow</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../external/jquery.mousewheel-3.0.4.js"></script>
+	<script src="../../external/jquery.mousewheel.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>
 	<script src="../../ui/jquery.ui.widget.js"></script>
 	<script src="../../ui/jquery.ui.button.js"></script>
diff --git a/demos/spinner/time.html b/demos/spinner/time.html
index 8f8088486..a45a801d5 100644
--- a/demos/spinner/time.html
+++ b/demos/spinner/time.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Spinner - Time</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.7.2.js"></script>
-	<script src="../../external/jquery.mousewheel-3.0.4.js"></script>
+	<script src="../../external/jquery.mousewheel.js"></script>
 	<script src="../../external/globalize.js"></script>
 	<script src="../../external/globalize.culture.de-DE.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>
diff --git a/external/jquery.mousewheel-3.0.4.js b/external/jquery.mousewheel-3.0.4.js
deleted file mode 100644
index dbf8f4b0f..000000000
--- a/external/jquery.mousewheel-3.0.4.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
- * Licensed under the MIT License (LICENSE.txt).
- *
- * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
- * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
- * Thanks to: Seamus Leahy for adding deltaX and deltaY
- *
- * Version: 3.0.4
- * 
- * Requires: 1.2.2+
- */
-
-(function($) {
-
-var types = ['DOMMouseScroll', 'mousewheel'];
-
-$.event.special.mousewheel = {
-    setup: function() {
-        if ( this.addEventListener ) {
-            for ( var i=types.length; i; ) {
-                this.addEventListener( types[--i], handler, false );
-            }
-        } else {
-            this.onmousewheel = handler;
-        }
-    },
-    
-    teardown: function() {
-        if ( this.removeEventListener ) {
-            for ( var i=types.length; i; ) {
-                this.removeEventListener( types[--i], handler, false );
-            }
-        } else {
-            this.onmousewheel = null;
-        }
-    }
-};
-
-$.fn.extend({
-    mousewheel: function(fn) {
-        return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
-    },
-    
-    unmousewheel: function(fn) {
-        return this.unbind("mousewheel", fn);
-    }
-});
-
-
-function handler(event) {
-    var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
-    event = $.event.fix(orgEvent);
-    event.type = "mousewheel";
-    
-    // Old school scrollwheel delta
-    if ( event.wheelDelta ) { delta = event.wheelDelta/120; }
-    if ( event.detail     ) { delta = -event.detail/3; }
-    
-    // New school multidimensional scroll (touchpads) deltas
-    deltaY = delta;
-    
-    // Gecko
-    if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
-        deltaY = 0;
-        deltaX = -1*delta;
-    }
-    
-    // Webkit
-    if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
-    if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }
-    
-    // Add event and delta to the front of the arguments
-    args.unshift(event, delta, deltaX, deltaY);
-    
-    return $.event.handle.apply(this, args);
-}
-
-})(jQuery);
\ No newline at end of file
diff --git a/external/jquery.mousewheel.js b/external/jquery.mousewheel.js
new file mode 100644
index 000000000..808e12b89
--- /dev/null
+++ b/external/jquery.mousewheel.js
@@ -0,0 +1,84 @@
+/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net)
+ * Licensed under the MIT License (LICENSE.txt).
+ *
+ * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
+ * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
+ * Thanks to: Seamus Leahy for adding deltaX and deltaY
+ *
+ * Version: 3.0.6
+ *
+ * Requires: 1.2.2+
+ */
+
+(function($) {
+
+var types = ['DOMMouseScroll', 'mousewheel'];
+
+if ($.event.fixHooks) {
+    for ( var i=types.length; i; ) {
+        $.event.fixHooks[ types[--i] ] = $.event.mouseHooks;
+    }
+}
+
+$.event.special.mousewheel = {
+    setup: function() {
+        if ( this.addEventListener ) {
+            for ( var i=types.length; i; ) {
+                this.addEventListener( types[--i], handler, false );
+            }
+        } else {
+            this.onmousewheel = handler;
+        }
+    },
+
+    teardown: function() {
+        if ( this.removeEventListener ) {
+            for ( var i=types.length; i; ) {
+                this.removeEventListener( types[--i], handler, false );
+            }
+        } else {
+            this.onmousewheel = null;
+        }
+    }
+};
+
+$.fn.extend({
+    mousewheel: function(fn) {
+        return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
+    },
+
+    unmousewheel: function(fn) {
+        return this.unbind("mousewheel", fn);
+    }
+});
+
+
+function handler(event) {
+    var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
+    event = $.event.fix(orgEvent);
+    event.type = "mousewheel";
+
+    // Old school scrollwheel delta
+    if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta/120; }
+    if ( orgEvent.detail     ) { delta = -orgEvent.detail/3; }
+
+    // New school multidimensional scroll (touchpads) deltas
+    deltaY = delta;
+
+    // Gecko
+    if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
+        deltaY = 0;
+        deltaX = -1*delta;
+    }
+
+    // Webkit
+    if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
+    if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }
+
+    // Add event and delta to the front of the arguments
+    args.unshift(event, delta, deltaX, deltaY);
+
+    return ($.event.dispatch || $.event.handle).apply(this, args);
+}
+
+})(jQuery);
\ No newline at end of file
diff --git a/tests/unit/spinner/spinner.html b/tests/unit/spinner/spinner.html
index b7f4a532a..1d09bbc38 100644
--- a/tests/unit/spinner/spinner.html
+++ b/tests/unit/spinner/spinner.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Spinner Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../../external/jquery.mousewheel-3.0.4.js"></script>
+	<script src="../../../external/jquery.mousewheel.js"></script>
 	<script src="../../../external/globalize.js"></script>
 	<script src="../../../external/globalize.culture.ja-JP.js"></script>
 	<link rel="stylesheet" href="../../../external/qunit.css">
-- 
cgit v1.2.3


From 7759fb4dba5d4135297994a8292dad093d704e19 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Thu, 12 Jul 2012 17:23:33 +0200
Subject: Menu: Rename icon option to icons.submenu

---
 demos/menu/topalignmenu.html    |  5 ++++-
 tests/unit/menu/menu.html       |  6 +-----
 tests/unit/menu/menu_common.js  |  4 +++-
 tests/unit/menu/menu_options.js | 16 +++++++++++++++-
 ui/jquery.ui.menu.js            |  6 ++++--
 5 files changed, 27 insertions(+), 10 deletions(-)

(limited to 'tests')

diff --git a/demos/menu/topalignmenu.html b/demos/menu/topalignmenu.html
index 62373ba9d..a6ac11520 100644
--- a/demos/menu/topalignmenu.html
+++ b/demos/menu/topalignmenu.html
@@ -13,7 +13,10 @@
 	<script>
 	$(function() {
 		$( "#menu" ).menu({
-			position: { of: "ul:has(a.ui-state-focus):last" }
+			position: { of: "ul:has(a.ui-state-focus):last" },
+			icons: {
+				submenu: "ui-icon-carat-1-e"
+			}
 		});
 	});
 	</script>
diff --git a/tests/unit/menu/menu.html b/tests/unit/menu/menu.html
index c58b9fc65..ed376232e 100644
--- a/tests/unit/menu/menu.html
+++ b/tests/unit/menu/menu.html
@@ -44,11 +44,7 @@
 </head>
 <body>
 
-<h1 id="qunit-header">jQuery UI Menu Test Suite</h1>
-<h2 id="qunit-banner"></h2>
-<div id="qunit-testrunner-toolbar"></div>
-<h2 id="qunit-userAgent"></h2>
-<ol id="qunit-tests"></ol>
+<div id="qunit">jQuery UI Menu Test Suite</div>
 <div id="qunit-fixture">
 
 <ul class="foo" id="menu1">
diff --git a/tests/unit/menu/menu_common.js b/tests/unit/menu/menu_common.js
index 2ab32ac05..4a89a947a 100644
--- a/tests/unit/menu/menu_common.js
+++ b/tests/unit/menu/menu_common.js
@@ -1,7 +1,9 @@
 TestHelpers.commonWidgetTests( "menu", {
 	defaults: {
 		disabled: false,
-		icon: "ui-icon-carat-1-e",
+		icons: {
+			submenu: "ui-icon-carat-1-e"
+		},
 		menus: "ul",
 		position: {
 			my: "left top",
diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js
index 1ccbb20ab..a8b029201 100644
--- a/tests/unit/menu/menu_options.js
+++ b/tests/unit/menu/menu_options.js
@@ -40,7 +40,21 @@ test( "{ disabled: false }", function() {
 	equal( logOutput(), "click,1,afterclick", "Click order not valid." );
 });
 
-// TODO: test icon option
+test( "{ icons: default }", function() {
+	expect( 1 );
+	var element = $( "#menu2" ).menu();
+	equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-carat-1-e" );
+});
+
+test( "{ icons: { submenu: 'custom' } }", function() {
+	expect( 1 );
+	var element = $( "#menu2" ).menu({
+		icons: {
+			submenu: "custom-class"
+		}
+	});
+	equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon custom-class" );
+});
 
 // TODO: test menus option
 
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index e57d1985a..81fef2e7c 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -22,7 +22,9 @@ $.widget( "ui.menu", {
 	defaultElement: "<ul>",
 	delay: 300,
 	options: {
-		icon: "ui-icon-carat-1-e",
+		icons: {
+			submenu: "ui-icon-carat-1-e"
+		},
 		menus: "ul",
 		position: {
 			my: "left top",
@@ -276,7 +278,7 @@ $.widget( "ui.menu", {
 	refresh: function() {
 		// Initialize nested menus
 		var menus,
-			icon = this.options.icon,
+			icon = this.options.icons.submenu,
 			submenus = this.element.find( this.options.menus + ":not(.ui-menu)" )
 				.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
 				.hide()
-- 
cgit v1.2.3


From e054e28836e616ed03561d5a8195bbea525866d1 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Thu, 12 Jul 2012 17:59:43 +0200
Subject: Spinner: Introduce icons option to make button icons customizable,
 mostly for consistency

---
 tests/unit/spinner/spinner_common.js  |  4 ++++
 tests/unit/spinner/spinner_options.js | 19 +++++++++++++++++++
 ui/jquery.ui.spinner.js               |  8 ++++++--
 3 files changed, 29 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/spinner/spinner_common.js b/tests/unit/spinner/spinner_common.js
index 4f05b1e63..b494e3ca3 100644
--- a/tests/unit/spinner/spinner_common.js
+++ b/tests/unit/spinner/spinner_common.js
@@ -2,6 +2,10 @@ TestHelpers.commonWidgetTests( "spinner", {
 	defaults: {
 		culture: null,
 		disabled: false,
+		icons: {
+			down: "ui-icon-triangle-1-s",
+			up: "ui-icon-triangle-1-n"
+		},
 		incremental: true,
 		max: null,
 		min: null,
diff --git a/tests/unit/spinner/spinner_options.js b/tests/unit/spinner/spinner_options.js
index e21852630..1f6646a33 100644
--- a/tests/unit/spinner/spinner_options.js
+++ b/tests/unit/spinner/spinner_options.js
@@ -6,6 +6,25 @@ module( "spinner: options" );
 
 // culture is tested after numberFormat, since it depends on numberFormat
 
+test( "icons: default ", function() {
+	expect( 2 );
+	var element = $( "#spin" ).val( 0 ).spinner().spinner( "widget" );
+	equal( element.find( ".ui-icon:first" ).attr( "class" ), "ui-icon ui-icon-triangle-1-n" );
+	equal( element.find( ".ui-icon:last" ).attr( "class" ), "ui-icon ui-icon-triangle-1-s" );
+});
+
+test( "icons: custom ", function() {
+	expect( 2 );
+	var element = $( "#spin" ).val( 0 ).spinner({
+		icons: {
+			down: "custom-down",
+			up: "custom-up"
+		}
+	}).spinner( "widget" );
+	equal( element.find( ".ui-icon:first" ).attr( "class" ), "ui-icon custom-up" );
+	equal( element.find( ".ui-icon:last" ).attr( "class" ), "ui-icon custom-down" );
+});
+
 test( "incremental, false", function() {
 	expect( 100 );
 
diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js
index 6acb3693e..ead3b17be 100644
--- a/ui/jquery.ui.spinner.js
+++ b/ui/jquery.ui.spinner.js
@@ -32,6 +32,10 @@ $.widget( "ui.spinner", {
 	widgetEventPrefix: "spin",
 	options: {
 		culture: null,
+		icons: {
+			down: "ui-icon-triangle-1-s",
+			up: "ui-icon-triangle-1-n"
+		},
 		incremental: true,
 		max: null,
 		min: null,
@@ -244,10 +248,10 @@ $.widget( "ui.spinner", {
 	_buttonHtml: function() {
 		return "" +
 			"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'>" +
-				"<span class='ui-icon ui-icon-triangle-1-n'>&#9650;</span>" +
+				"<span class='ui-icon " + this.options.icons.up + "'>&#9650;</span>" +
 			"</a>" +
 			"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>" +
-				"<span class='ui-icon ui-icon-triangle-1-s'>&#9660;</span>" +
+				"<span class='ui-icon " + this.options.icons.down + "'>&#9660;</span>" +
 			"</a>";
 	},
 
-- 
cgit v1.2.3