From a996cb31e88dc23f89a985f4f4f4bf3dc07357b3 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 08:50:24 -0400
Subject: [PATCH 01/27] Selectmenu: Style updates

Ref #14246
---
 tests/unit/selectmenu/common.js  |  2 +-
 tests/unit/selectmenu/core.js    | 74 ++++++++++++++++----------------
 tests/unit/selectmenu/events.js  | 46 ++++++++++----------
 tests/unit/selectmenu/methods.js | 26 +++++------
 tests/unit/selectmenu/options.js | 28 ++++++------
 5 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/tests/unit/selectmenu/common.js b/tests/unit/selectmenu/common.js
index 8582247caf1..97a47f2a688 100644
--- a/tests/unit/selectmenu/common.js
+++ b/tests/unit/selectmenu/common.js
@@ -29,6 +29,6 @@ common.testWidget( "selectmenu", {
 		open: null,
 		select: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/selectmenu/core.js b/tests/unit/selectmenu/core.js
index 96e83f69b10..5431d689d0a 100644
--- a/tests/unit/selectmenu/core.js
+++ b/tests/unit/selectmenu/core.js
@@ -18,15 +18,15 @@ test( "markup structure", function( assert ) {
 	assert.lacksClasses( button, "ui-selectmenu-button-open" );
 	assert.hasClasses( menuWrap, "ui-selectmenu-menu" );
 	assert.lacksClasses( menuWrap, "ui-selectmenu-menu-open" );
-});
+} );
 
 asyncTest( "accessibility", function() {
 	var wrappers, button, menu,
 		element = $( "#speed" ).attr( "title", "A demo title" );
 
-	element.find( "option" ).each(function( index ) {
+	element.find( "option" ).each( function( index ) {
 		$( this ).attr( "title", "A demo title #" + index );
-	});
+	} );
 
 	element.selectmenu();
 	button = element.selectmenu( "widget" );
@@ -37,7 +37,7 @@ asyncTest( "accessibility", function() {
 
 	expect( 13 + wrappers.length * 3 );
 
-	setTimeout(function() {
+	setTimeout( function() {
 		equal( button.attr( "role" ), "combobox", "button role" );
 		equal( button.attr( "aria-haspopup" ), "true", "button aria-haspopup" );
 		equal( button.attr( "aria-expanded" ), "false", "button aria-expanded" );
@@ -62,13 +62,13 @@ asyncTest( "accessibility", function() {
 		);
 		$.each( wrappers, function( index ) {
 			var item = $( this );
-			equal( item.attr( "role" ), "option", "menu item #" + index +" role" );
-			equal( item.attr( "tabindex" ), -1, "menu item #" + index +" tabindex" );
+			equal( item.attr( "role" ), "option", "menu item #" + index + " role" );
+			equal( item.attr( "tabindex" ), -1, "menu item #" + index + " tabindex" );
 			equal( item.attr( "title" ), "A demo title #" + index, "menu item #" + index + " title" );
-		});
+		} );
 		start();
-	});
-});
+	} );
+} );
 
 test( "_renderButtonItem()", function() {
 	expect( 2 );
@@ -102,9 +102,9 @@ test( "_renderButtonItem()", function() {
 		button.text(),
 		"click: button item text"
 	);
-});
+} );
 
-$.each([
+$.each( [
 	{
 		type: "default",
 		selector: "#speed"
@@ -127,7 +127,7 @@ $.each([
 			selected = element.find( "option:selected" ).next();
 
 		button.simulate( "focus" );
-		setTimeout(function() {
+		setTimeout( function() {
 			wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
 
 			button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
@@ -143,13 +143,13 @@ $.each([
 			);
 			equal(
 				element.find( "option:selected" ).val(),
-				selected.val() ,
+				selected.val(),
 				"original select state"
 			);
 			equal( button.text(), selected.text(), "button text" );
 			start();
-		});
-	});
+		} );
+	} );
 
 	asyncTest( "state synchronization - after click on item - " + settings.type, function() {
 		expect( 4 );
@@ -161,7 +161,7 @@ $.each([
 			selected = element.find( "option" ).last();
 
 		button.simulate( "focus" );
-		setTimeout(function() {
+		setTimeout( function() {
 			wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
 
 			button.trigger( "click" );
@@ -184,7 +184,7 @@ $.each([
 			equal( button.text(), selected.text(), "button text" );
 			start();
 		}, 1 );
-	});
+	} );
 
 	asyncTest( "state synchronization - " +
 			"after focus item and keydown on button - " + settings.type, function() {
@@ -199,7 +199,7 @@ $.each([
 		// Init menu
 		button.simulate( "focus" );
 
-		setTimeout(function() {
+		setTimeout( function() {
 			wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
 
 			// Open menu and click first item
@@ -213,20 +213,20 @@ $.each([
 			// Close and use keyboard control on button
 			button.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
 			button.simulate( "focus" );
-			setTimeout(function() {
+			setTimeout( function() {
 				button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 
 				equal( menu.attr( "aria-activedescendant" ), wrappers.eq( 1 ).attr( "id" ),
 					"menu aria-activedescendant" );
 				equal( button.attr( "aria-activedescendant" ), wrappers.eq( 1 ).attr( "id" ),
 					"button aria-activedescendant" );
-				equal( element.find( "option:selected" ).val(), options.eq( 1 ).val() ,
+				equal( element.find( "option:selected" ).val(), options.eq( 1 ).val(),
 					"original select state" );
 				equal( button.text(), options.eq( 1 ).text(), "button text" );
 				start();
-			});
-		});
-	});
+			} );
+		} );
+	} );
 
 	asyncTest( "item looping - " + settings.type, function() {
 		expect( 4 );
@@ -237,7 +237,7 @@ $.each([
 			menu = element.selectmenu( "menuWidget" );
 
 		button.simulate( "focus" );
-		setTimeout(function() {
+		setTimeout( function() {
 			wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
 
 			button.trigger( "click" );
@@ -252,8 +252,8 @@ $.each([
 			button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 			equal( element[ 0 ].selectedIndex, wrappers.length - 1, "No looping behind last item" );
 			start();
-		});
-	});
+		} );
+	} );
 
 	asyncTest( "item focus and active state - " + settings.type, function() {
 		expect( 4 );
@@ -264,11 +264,11 @@ $.each([
 			menu = element.selectmenu( "menuWidget" );
 
 		button.simulate( "focus" );
-		setTimeout(function() {
+		setTimeout( function() {
 			wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" );
 
 			button.trigger( "click" );
-			setTimeout(function() {
+			setTimeout( function() {
 				checkItemClasses();
 
 				wrappers.eq( 3 ).simulate( "mouseover" ).trigger( "click" );
@@ -282,12 +282,12 @@ $.each([
 				$( document ).trigger( "click" );
 
 				button.trigger( "click" );
-				setTimeout(function() {
+				setTimeout( function() {
 					checkItemClasses();
 					start();
-				});
-			});
-		});
+				} );
+			} );
+		} );
 
 		function checkItemClasses() {
 			focusedItem = menu.find( ".ui-menu-item-wrapper.ui-state-active" );
@@ -295,7 +295,7 @@ $.each([
 			equal( focusedItem.attr( "id" ), wrappers.eq( element[ 0 ].selectedIndex ).attr( "id" ),
 				"selected item has ui-state-focus class" );
 		}
-	});
+	} );
 
 	asyncTest( "empty option - " + settings.type, function( assert ) {
 		expect( 7 );
@@ -309,7 +309,7 @@ $.each([
 		menu = element.selectmenu( "menuWidget" );
 
 		button.simulate( "focus" );
-		setTimeout(function() {
+		setTimeout( function() {
 			wrappers = menu.find( "li:not(.ui-selectmenu-optgroup) .ui-menu-item-wrapper" );
 			wrapper = wrappers.first();
 
@@ -325,8 +325,8 @@ $.each([
 			equal( wrapper.attr( "role" ), "option", "empty item has role option" );
 
 			start();
-		});
-	});
-});
+		} );
+	} );
+} );
 
 } );
diff --git a/tests/unit/selectmenu/events.js b/tests/unit/selectmenu/events.js
index 2ab20c46ce8..2d4a3f7fc11 100644
--- a/tests/unit/selectmenu/events.js
+++ b/tests/unit/selectmenu/events.js
@@ -7,7 +7,7 @@ module( "selectmenu: events", {
 	setup: function() {
 		this.element = $( "#speed" );
 	}
-});
+} );
 
 asyncTest( "change", function() {
 	expect( 3 );
@@ -15,15 +15,15 @@ asyncTest( "change", function() {
 	var button, menu, options,
 		optionIndex = 1;
 
-	this.element.selectmenu({
-		change: function ( event, ui ) {
+	this.element.selectmenu( {
+		change: function( event, ui ) {
 			equal( ui.item.index, optionIndex, "ui.item.index contains correct option index" );
 			equal( ui.item.element[ 0 ], options.eq( optionIndex )[ 0 ],
 				"ui.item.element contains original option element" );
 			equal( ui.item.value, options.eq( optionIndex ).text(),
 				"ui.item.value property updated correctly" );
 		}
-	});
+	} );
 
 	button = this.element.selectmenu( "widget" );
 	menu = this.element.selectmenu( "menuWidget" );
@@ -31,23 +31,23 @@ asyncTest( "change", function() {
 
 	button.simulate( "focus" );
 
-	setTimeout(function() {
+	setTimeout( function() {
 		button.trigger( "click" );
 		menu.find( "li" ).eq( optionIndex ).simulate( "mouseover" ).trigger( "click" );
 		start();
-	});
-});
+	} );
+} );
 
 test( "close", function() {
 	expect( 2 );
 
 	var shouldFire;
 
-	this.element.selectmenu({
+	this.element.selectmenu( {
 		close: function() {
 			ok( shouldFire, "close event fired on close" );
 		}
-	});
+	} );
 
 	shouldFire = false;
 	this.element.selectmenu( "open" );
@@ -57,7 +57,7 @@ test( "close", function() {
 	this.element.selectmenu( "open" );
 	shouldFire = true;
 	$( "body" ).trigger( "mousedown" );
-});
+} );
 
 asyncTest( "focus", function() {
 	expect( 9 );
@@ -67,20 +67,20 @@ asyncTest( "focus", function() {
 		optionIndex = this.element[ 0 ].selectedIndex + 1,
 		options = this.element.find( "option" );
 
-	this.element.selectmenu({
+	this.element.selectmenu( {
 		focus: function( event, ui ) {
 			ok( true, "focus event fired on element #" + optionIndex + " mouseover" );
 			equal( ui.item.index, optionIndex, "ui.item.index contains correct option index" );
 			equal( ui.item.element[ 0 ], options.eq( optionIndex )[ 0 ],
 				"ui.item.element contains original option element" );
 		}
-	});
+	} );
 
 	button = this.element.selectmenu( "widget" );
 	menu = this.element.selectmenu( "menuWidget" );
 
 	button.simulate( "focus" );
-	setTimeout(function() {
+	setTimeout( function() {
 		button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 
 		button.trigger( "click" );
@@ -93,32 +93,32 @@ asyncTest( "focus", function() {
 		// This tests for unwanted, additional focus event on close
 		that.element.selectmenu( "close" );
 		start();
-	});
-});
+	} );
+} );
 
 test( "open", function() {
 	expect( 1 );
 
-	this.element.selectmenu({
+	this.element.selectmenu( {
 		open: function() {
 			ok( true, "open event fired on open" );
 		}
-	});
+	} );
 
 	this.element.selectmenu( "open" );
-});
+} );
 
 asyncTest( "select", function() {
 	expect( 3 );
 
-	this.element.selectmenu({
+	this.element.selectmenu( {
 		select: function( event, ui ) {
 			ok( true, "select event fired on item select" );
 			equal( ui.item.index, optionIndex, "ui.item.index contains correct option index" );
 			equal( ui.item.element[ 0 ], options.eq( optionIndex )[ 0 ],
 				"ui.item.element contains original option element" );
 		}
-	});
+	} );
 
 	var button = this.element.selectmenu( "widget" ),
 		menu = this.element.selectmenu( "menuWidget" ),
@@ -126,11 +126,11 @@ asyncTest( "select", function() {
 		optionIndex = 1;
 
 	button.simulate( "focus" );
-	setTimeout(function() {
+	setTimeout( function() {
 		button.trigger( "click" );
 		menu.find( "li" ).eq( optionIndex ).simulate( "mouseover" ).trigger( "click" );
 		start();
-	});
-});
+	} );
+} );
 
 } );
diff --git a/tests/unit/selectmenu/methods.js b/tests/unit/selectmenu/methods.js
index a386655ce9e..e49da50f5fb 100644
--- a/tests/unit/selectmenu/methods.js
+++ b/tests/unit/selectmenu/methods.js
@@ -9,8 +9,8 @@ test( "destroy", function( assert ) {
 	expect( 1 );
 	assert.domEqual( "#speed", function() {
 		$( "#speed" ).selectmenu().selectmenu( "destroy" );
-	});
-});
+	} );
+} );
 
 test( "open / close", function() {
 	expect( 5 );
@@ -27,7 +27,7 @@ test( "open / close", function() {
 	element.selectmenu( "close" );
 	ok( menu.is( ":hidden" ), "close: menu hidden" );
 	equal( menu.attr( "aria-hidden" ), "true", "close: menu aria-disabled" );
-});
+} );
 
 test( "enable / disable", function() {
 	expect( 10 );
@@ -49,7 +49,7 @@ test( "enable / disable", function() {
 	equal( button.attr( "aria-disabled" ), "false", "enable: button ARIA" );
 	equal( button.attr( "tabindex" ), 0, "enable: button tabindex" );
 	equal( menu.attr( "aria-disabled" ), "false", "enable: menu ARIA" );
-});
+} );
 
 test( "refresh - structure", function() {
 	expect( 3 );
@@ -73,7 +73,7 @@ test( "refresh - structure", function() {
 	equal( options.length, menuItems.length, "menu item length" );
 	equal( "Added option", menuItems.last().text(), "added item" );
 	equal( "Changed value", menuItems.eq( 0 ).text(), "changed item" );
-});
+} );
 
 asyncTest( "refresh - change selected option", function() {
 	expect( 4 );
@@ -84,7 +84,7 @@ asyncTest( "refresh - change selected option", function() {
 	equal( element.find( "option:selected" ).text(), button.text(), "button text after init" );
 
 	button.simulate( "focus" );
-	setTimeout(function() {
+	setTimeout( function() {
 		equal( element.find( "option:selected" ).text(), button.text(), "button text after focus" );
 
 		element[ 0 ].selectedIndex = 0;
@@ -98,8 +98,8 @@ asyncTest( "refresh - change selected option", function() {
 		equal( "Selected option", button.text(), "button text after adding selected option" );
 
 		start();
-	});
-});
+	} );
+} );
 
 test( "refresh - disabled select", function() {
 	expect( 4 );
@@ -115,7 +115,7 @@ test( "refresh - disabled select", function() {
 	equal( button.attr( "aria-disabled" ), "true", "button ARIA" );
 	equal( button.attr( "tabindex" ), -1, "button tabindex" );
 	equal( menu.attr( "aria-disabled" ), "true", "menu ARIA" );
-});
+} );
 
 test( "refresh - disabled option", function( assert ) {
 	expect( 1 );
@@ -129,7 +129,7 @@ test( "refresh - disabled option", function( assert ) {
 
 	disabledItem = menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).eq( 2 );
 	assert.hasClasses( disabledItem, "ui-state-disabled" );
-});
+} );
 
 test( "refresh - disabled optgroup", function( assert ) {
 	var i, item,
@@ -156,7 +156,7 @@ test( "refresh - disabled optgroup", function( assert ) {
 		item = item.next( "li" );
 		assert.hasClasses( item, "ui-state-disabled" );
 	}
-});
+} );
 
 test( "refresh - remove all options", function() {
 	expect( 2 );
@@ -170,7 +170,7 @@ test( "refresh - remove all options", function() {
 	equal( button.find( ".ui-selectmenu-text" ).html(), $( "<span>&#160;</span>" ).html(),
 		"Empty button text" );
 	equal( menu.children().length, 0, "Empty menu" );
-});
+} );
 
 test( "widget and menuWidget", function( assert ) {
 	expect( 4 );
@@ -184,6 +184,6 @@ test( "widget and menuWidget", function( assert ) {
 
 	equal( menu.length, 1, "Menu Widget: one element" );
 	ok( menu.is( "ul.ui-menu" ), "Menu Widget: element and class" );
-});
+} );
 
 } );
diff --git a/tests/unit/selectmenu/options.js b/tests/unit/selectmenu/options.js
index be2565e3732..0ac13ed6dde 100644
--- a/tests/unit/selectmenu/options.js
+++ b/tests/unit/selectmenu/options.js
@@ -11,7 +11,7 @@ test( "appendTo: null", function() {
 	var element = $( "#speed" ).selectmenu();
 	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ], document.body,
 		"defaults to body" );
-});
+} );
 
 test( "appendTo: explicit", function() {
 	expect( 6 );
@@ -19,9 +19,9 @@ test( "appendTo: explicit", function() {
 	var detached = $( "<div>" ),
 		element = $( "#speed" );
 
-	element.selectmenu({
+	element.selectmenu( {
 		appendTo: ".selectmenu-wrap"
-	});
+	} );
 	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ],
 		$( "#selectmenu-wrap1" )[ 0 ], "first found element" );
 	equal( $( "#selectmenu-wrap2 .ui-selectmenu" ).length, 0, "only appends to one element" );
@@ -32,16 +32,16 @@ test( "appendTo: explicit", function() {
 		$( "#selectmenu-wrap1" )[ 0 ], "modified after init" );
 	element.selectmenu( "destroy" );
 
-	element.selectmenu({
+	element.selectmenu( {
 		appendTo: detached
-	});
+	} );
 	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ], detached[ 0 ],
 		"detached jQuery object" );
 	element.selectmenu( "destroy" );
 
-	element.selectmenu({
+	element.selectmenu( {
 		appendTo: detached[ 0 ]
-	});
+	} );
 	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ], detached[ 0 ],
 		"detached DOM element" );
 	element.selectmenu( "destroy" );
@@ -50,7 +50,7 @@ test( "appendTo: explicit", function() {
 	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ], detached[ 0 ],
 		"detached DOM element via option()" );
 	element.selectmenu( "destroy" );
-});
+} );
 
 test( "appendTo: ui-front", function() {
 	expect( 2 );
@@ -63,12 +63,12 @@ test( "appendTo: ui-front", function() {
 		$( "#selectmenu-wrap2" )[ 0 ], "null, inside .ui-front" );
 	element.selectmenu( "destroy" );
 
-	element.selectmenu({
+	element.selectmenu( {
 		appendTo: $()
-	});
+	} );
 	equal( element.selectmenu( "menuWidget" ).parent().parent()[ 0 ],
 		$( "#selectmenu-wrap2" )[ 0 ], "empty jQuery object, inside .ui-front" );
-});
+} );
 
 test( "CSS styles", function( assert ) {
 	expect( 5 );
@@ -84,7 +84,7 @@ test( "CSS styles", function( assert ) {
 	assert.hasClasses( button.find( "span.ui-icon" ), "ui-icon-triangle-1-s" );
 	assert.hasClasses( menu, "ui-corner-bottom" );
 	assert.lacksClasses( button, "ui-corner-all" );
-});
+} );
 
 test( "width", function() {
 	expect( 6 );
@@ -120,9 +120,9 @@ test( "width", function() {
 	element
 		.selectmenu( "destroy" )
 		.css( "width", "100%" )
-		.selectmenu({ width: null });
+		.selectmenu( { width: null } );
 	button = element.selectmenu( "widget" );
 	equal( button.outerWidth(), 300, "button width fills container" );
-});
+} );
 
 } );

From c8a50dbe7fbf3e8ee714880feac94d0389f401e1 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 08:50:46 -0400
Subject: [PATCH 02/27] Tooltip: Style updates

Ref #14246
---
 tests/unit/tooltip/common-deprecated.js |   2 +-
 tests/unit/tooltip/common.js            |   2 +-
 tests/unit/tooltip/core.js              |  62 +++++++--------
 tests/unit/tooltip/deprecated.js        |   6 +-
 tests/unit/tooltip/events.js            |  24 +++---
 tests/unit/tooltip/methods.js           |  27 ++++---
 tests/unit/tooltip/options.js           | 100 ++++++++++++------------
 ui/widgets/tooltip.js                   |  10 +++
 8 files changed, 124 insertions(+), 109 deletions(-)

diff --git a/tests/unit/tooltip/common-deprecated.js b/tests/unit/tooltip/common-deprecated.js
index 75a688f0a0c..2a543733579 100644
--- a/tests/unit/tooltip/common-deprecated.js
+++ b/tests/unit/tooltip/common-deprecated.js
@@ -26,6 +26,6 @@ common.testWidget( "tooltip", {
 		create: null,
 		open: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/tooltip/common.js b/tests/unit/tooltip/common.js
index 15c9dfad833..73797fe497d 100644
--- a/tests/unit/tooltip/common.js
+++ b/tests/unit/tooltip/common.js
@@ -25,6 +25,6 @@ common.testWidget( "tooltip", {
 		create: null,
 		open: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/tooltip/core.js b/tests/unit/tooltip/core.js
index e7e22b0e651..0dfdc582537 100644
--- a/tests/unit/tooltip/core.js
+++ b/tests/unit/tooltip/core.js
@@ -21,7 +21,7 @@ test( "markup structure", function( assert ) {
 	equal( tooltip.length, 1, ".ui-tooltip exists" );
 	equal( tooltip.find( ".ui-tooltip-content" ).length, 1,
 		".ui-tooltip-content exists" );
-});
+} );
 
 test( "accessibility", function() {
 	expect( 15 );
@@ -61,7 +61,7 @@ test( "accessibility", function() {
 	element.tooltip( "destroy" );
 	equal( liveRegion.parent().length, 0,
 		"Tooltip liveregion element should be removed" );
-});
+} );
 
 test( "delegated removal", function() {
 	expect( 2 );
@@ -74,32 +74,32 @@ test( "delegated removal", function() {
 
 	container.empty();
 	equal( $( ".ui-tooltip" ).length, 0 );
-});
+} );
 
 test( "nested tooltips", function() {
 	expect( 2 );
 
 	var child = $( "#contained-tooltipped" ),
-		parent = $( "#contains-tooltipped" ).tooltip({
+		parent = $( "#contains-tooltipped" ).tooltip( {
 			show: null,
 			hide: null
-		});
+		} );
 
 	parent.trigger( "mouseover" );
 	equal( $( ".ui-tooltip:visible" ).text(), "parent" );
 
 	child.trigger( "mouseover" );
 	equal( $( ".ui-tooltip" ).text(), "child" );
-});
+} );
 
 // #8742
 test( "form containing an input with name title", function() {
 	expect( 4 );
 
-	var form = $( "#tooltip-form" ).tooltip({
+	var form = $( "#tooltip-form" ).tooltip( {
 			show: null,
 			hide: null
-		}),
+		} ),
 		input = form.find( "[name=title]" );
 
 	equal( $( ".ui-tooltip" ).length, 0, "no tooltips on init" );
@@ -111,7 +111,7 @@ test( "form containing an input with name title", function() {
 
 	form.trigger( "mouseover" );
 	equal( $( ".ui-tooltip" ).length, 0, "no tooltip for form" );
-});
+} );
 
 test( "tooltip on .ui-state-disabled element", function() {
 	expect( 2 );
@@ -124,18 +124,18 @@ test( "tooltip on .ui-state-disabled element", function() {
 
 	container.empty();
 	equal( $( ".ui-tooltip" ).length, 0 );
-});
+} );
 
 // http://bugs.jqueryui.com/ticket/8740
 asyncTest( "programmatic focus with async content", function() {
 	expect( 2 );
-	var element = $( "#tooltipped1" ).tooltip({
+	var element = $( "#tooltipped1" ).tooltip( {
 		content: function( response ) {
-			setTimeout(function() {
+			setTimeout( function() {
 				response( "test" );
-			});
+			} );
 		}
-	});
+	} );
 
 	element.on( "tooltipopen", function( event ) {
 		deepEqual( event.originalEvent.type, "focusin" );
@@ -143,35 +143,35 @@ asyncTest( "programmatic focus with async content", function() {
 		element.on( "tooltipclose", function( event ) {
 			deepEqual( event.originalEvent.type, "focusout" );
 			start();
-		});
+		} );
 
-		setTimeout(function() {
+		setTimeout( function() {
 			element.trigger( "blur" );
-		});
-	});
+		} );
+	} );
 
 	element.trigger( "focus" );
-});
+} );
 
 asyncTest( "destroy during hide animation; only one close event", function() {
 	expect( 1 );
 
-	var element = $( "#tooltipped1" ).tooltip({
+	var element = $( "#tooltipped1" ).tooltip( {
 		show: false,
 		hide: true
-	});
+	} );
 
 	element.on( "tooltipclose", function() {
 		ok( true, "tooltip closed" );
-	});
+	} );
 
 	element.tooltip( "open" );
 	element.tooltip( "close" );
-	setTimeout(function() {
+	setTimeout( function() {
 		element.tooltip( "destroy" );
 		start();
-	});
-});
+	} );
+} );
 
 // http://bugs.jqueryui.com/ticket/10602
 asyncTest( "multiple active delegated tooltips", function() {
@@ -181,7 +181,7 @@ asyncTest( "multiple active delegated tooltips", function() {
 		input = anchor.next(),
 		actions = [];
 
-	$( document ).tooltip({
+	$( document ).tooltip( {
 			show: false,
 			hide: false,
 			open: function( event, ui ) {
@@ -190,7 +190,7 @@ asyncTest( "multiple active delegated tooltips", function() {
 			close: function( event, ui ) {
 				actions.push( "close:" + ui.tooltip.text() );
 			}
-		});
+		} );
 
 	function step1() {
 		anchor.simulate( "mouseover" );
@@ -219,7 +219,7 @@ asyncTest( "multiple active delegated tooltips", function() {
 	}
 
 	step1();
-});
+} );
 
 // http://bugs.jqueryui.com/ticket/11272
 test( "remove conflicting attributes from live region", function() {
@@ -234,7 +234,7 @@ test( "remove conflicting attributes from live region", function() {
 		"</div>" );
 
 	$( "#tooltipped1" )
-		.tooltip({
+		.tooltip( {
 			content: element,
 			open: function() {
 				equal( $( ".ui-helper-hidden-accessible [name]" ).length, 0,
@@ -242,8 +242,8 @@ test( "remove conflicting attributes from live region", function() {
 				equal( $( ".ui-helper-hidden-accessible [id]" ).length, 0,
 					"no id attributes within live region" );
 			}
-		})
+		} )
 		.tooltip( "open" );
-});
+} );
 
 } );
diff --git a/tests/unit/tooltip/deprecated.js b/tests/unit/tooltip/deprecated.js
index b1325057bfa..7fc7d91a483 100644
--- a/tests/unit/tooltip/deprecated.js
+++ b/tests/unit/tooltip/deprecated.js
@@ -7,10 +7,10 @@ module( "tooltip: (deprecated) options" );
 
 test( "tooltipClass", function( assert ) {
 	expect( 1 );
-	var element = $( "#tooltipped1" ).tooltip({
+	var element = $( "#tooltipped1" ).tooltip( {
 		tooltipClass: "custom"
-	}).tooltip( "open" );
+	} ).tooltip( "open" );
 	assert.hasClasses( $( "#" + element.data( "ui-tooltip-id" ) ), "custom" );
-});
+} );
 
 } );
diff --git a/tests/unit/tooltip/events.js b/tests/unit/tooltip/events.js
index 7ad36dc08ba..3cf65fc4ed1 100644
--- a/tests/unit/tooltip/events.js
+++ b/tests/unit/tooltip/events.js
@@ -13,17 +13,17 @@ test( "programmatic triggers", function() {
 	element.one( "tooltipopen", function( event, ui ) {
 		tooltip = ui.tooltip;
 		ok( !( "originalEvent" in event ), "open" );
-		strictEqual( ui.tooltip[0],
-			$( "#" + element.data( "ui-tooltip-id" ) )[0], "ui.tooltip" );
-	});
+		strictEqual( ui.tooltip[ 0 ],
+			$( "#" + element.data( "ui-tooltip-id" ) )[ 0 ], "ui.tooltip" );
+	} );
 	element.tooltip( "open" );
 
 	element.one( "tooltipclose", function( event, ui ) {
 		ok( !( "originalEvent" in event ), "close" );
-		strictEqual( ui.tooltip[0], tooltip[0], "ui.tooltip" );
-	});
+		strictEqual( ui.tooltip[ 0 ], tooltip[ 0 ], "ui.tooltip" );
+	} );
 	element.tooltip( "close" );
-});
+} );
 
 test( "mouse events", function() {
 	expect( 2 );
@@ -31,15 +31,15 @@ test( "mouse events", function() {
 
 	element.on( "tooltipopen", function( event ) {
 		deepEqual( event.originalEvent.type, "mouseover" );
-	});
+	} );
 	element.trigger( "mouseover" );
 
 	element.on( "tooltipclose", function( event ) {
 		deepEqual( event.originalEvent.type, "mouseleave" );
-	});
+	} );
 	element.trigger( "focusout" );
 	element.trigger( "mouseleave" );
-});
+} );
 
 test( "focus events", function() {
 	expect( 2 );
@@ -47,14 +47,14 @@ test( "focus events", function() {
 
 	element.on( "tooltipopen", function( event ) {
 		deepEqual( event.originalEvent.type, "focusin" );
-	});
+	} );
 	element.trigger( "focusin" );
 
 	element.on( "tooltipclose", function( event ) {
 		deepEqual( event.originalEvent.type, "focusout" );
-	});
+	} );
 	element.trigger( "mouseleave" );
 	element.trigger( "focusout" );
-});
+} );
 
 } );
diff --git a/tests/unit/tooltip/methods.js b/tests/unit/tooltip/methods.js
index d4c56e1f3d1..31fe86532d0 100644
--- a/tests/unit/tooltip/methods.js
+++ b/tests/unit/tooltip/methods.js
@@ -11,17 +11,17 @@ test( "destroy", function( assert ) {
 
 	assert.domEqual( "#tooltipped1", function() {
 		element.tooltip().tooltip( "destroy" );
-	});
+	} );
 
 	// Make sure that open tooltips are removed on destroy
 	assert.domEqual( "#tooltipped1", function() {
 		element
 			.tooltip()
-			.tooltip( "open", $.Event( "mouseover", { target: element[0] }) )
+			.tooltip( "open", $.Event( "mouseover", { target: element[ 0 ] } ) )
 			.tooltip( "destroy" );
-	});
+	} );
 	equal( $( ".ui-tooltip" ).length, 0 );
-});
+} );
 
 test( "open/close", function() {
 	expect( 3 );
@@ -37,14 +37,14 @@ test( "open/close", function() {
 	element.tooltip( "close" );
 	ok( tooltip.is( ":hidden" ) );
 	$.fx.off = false;
-});
+} );
 
 // #8626 - Calling open() without an event
 test( "open/close with tracking", function() {
 	expect( 3 );
 	$.fx.off = true;
 	var tooltip,
-		element = $( "#tooltipped1" ).tooltip({ track: true });
+		element = $( "#tooltipped1" ).tooltip( { track: true } );
 	equal( $( ".ui-tooltip" ).length, 0, "no tooltip on init" );
 
 	element.tooltip( "open" );
@@ -54,7 +54,7 @@ test( "open/close with tracking", function() {
 	element.tooltip( "close" );
 	ok( tooltip.is( ":hidden" ) );
 	$.fx.off = false;
-});
+} );
 
 test( "enable/disable", function( assert ) {
 	expect( 11 );
@@ -91,7 +91,7 @@ test( "enable/disable", function( assert ) {
 	tooltip = $( "#" + element.data( "ui-tooltip-id" ) );
 	ok( tooltip.is( ":visible" ) );
 	$.fx.off = false;
-});
+} );
 
 test( "widget", function() {
 	expect( 2 );
@@ -99,7 +99,7 @@ test( "widget", function() {
 		widgetElement = element.tooltip( "widget" );
 	equal( widgetElement.length, 1, "one element" );
 	strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
-});
+} );
 
 test( "preserve changes to title attributes on close and destroy", function() {
 	expect( 6 );
@@ -110,14 +110,19 @@ test( "preserve changes to title attributes on close and destroy", function() {
 
 	// 1. Changes to title attribute are preserved on close()
 	tests[ 0 ] = { title: changed, expected: changed, method: "close" };
+
 	// 2. Changes to title attribute are preserved on destroy()
-	tests[ 1 ] = { title: changed, expected: changed , method: "destroy" };
+	tests[ 1 ] = { title: changed, expected: changed, method: "destroy" };
+
 	// 3. Changes to title attribute are NOT preserved when set to empty string on close()
 	tests[ 2 ] = { title: "", expected: original, method: "close" };
+
 	// 4. Changes to title attribute are NOT preserved when set to empty string on destroy()
 	tests[ 3 ] = { title: "", expected: original, method: "destroy" };
+
 	// 5. Changes to title attribute NOT preserved when attribute has been removed on close()
 	tests[ 4 ] = { expected: original, method: "close" };
+
 	// 6. Changes to title attribute NOT preserved when attribute has been removed on destroy()
 	tests[ 5 ] = { expected: original, method: "destroy" };
 
@@ -134,6 +139,6 @@ test( "preserve changes to title attributes on close and destroy", function() {
 		equal( $( "#tooltipped1" ).attr( "title" ), test.expected );
 
 	} );
-});
+} );
 
 } );
diff --git a/tests/unit/tooltip/options.js b/tests/unit/tooltip/options.js
index 2833e68ddb6..a35d140fbd9 100644
--- a/tests/unit/tooltip/options.js
+++ b/tests/unit/tooltip/options.js
@@ -7,17 +7,17 @@ module( "tooltip: options" );
 
 test( "disabled: true", function() {
 	expect( 1 );
-	$( "#tooltipped1" ).tooltip({
+	$( "#tooltipped1" ).tooltip( {
 		disabled: true
-	}).tooltip( "open" );
+	} ).tooltip( "open" );
 	equal( $( ".ui-tooltip" ).length, 0 );
-});
+} );
 
 test( "content: default", function() {
 	expect( 1 );
 	var element = $( "#tooltipped1" ).tooltip().tooltip( "open" );
 	deepEqual( $( "#" + element.data( "ui-tooltip-id" ) ).text(), "anchortitle" );
-});
+} );
 
 test( "content: default; HTML escaping", function() {
 	expect( 2 );
@@ -31,130 +31,130 @@ test( "content: default; HTML escaping", function() {
 	equal( $.ui.tooltip.hacked, false, "script did not execute" );
 	deepEqual( $( "#" + element.data( "ui-tooltip-id" ) ).text(), scriptText,
 		"correct tooltip text" );
-});
+} );
 
 test( "content: return string", function() {
 	expect( 1 );
-	var element = $( "#tooltipped1" ).tooltip({
+	var element = $( "#tooltipped1" ).tooltip( {
 		content: function() {
 			return "customstring";
 		}
-	}).tooltip( "open" );
+	} ).tooltip( "open" );
 	deepEqual( $( "#" + element.data( "ui-tooltip-id" ) ).text(), "customstring" );
-});
+} );
 
 test( "content: return jQuery", function() {
 	expect( 2 );
-	var element = $( "#tooltipped1" ).tooltip({
+	var element = $( "#tooltipped1" ).tooltip( {
 		content: function() {
 			return $( "<div id='unique'>" ).html( "cu<b id='bold'>s</b>tomstring" );
 		}
-	}).tooltip( "open" ),
+	} ).tooltip( "open" ),
 	liveRegion = element.tooltip( "instance" ).liveRegion;
 	deepEqual( $( "#" + element.data( "ui-tooltip-id" ) ).text(), "customstring" );
 	equal( liveRegion.children().last().html().toLowerCase(), "<div>cu<b>s</b>tomstring</div>",
 		"The accessibility live region will strip the ids but keep the structure" );
-});
+} );
 
 asyncTest( "content: sync + async callback", function() {
 	expect( 2 );
-	var element = $( "#tooltipped1" ).tooltip({
+	var element = $( "#tooltipped1" ).tooltip( {
 		content: function( response ) {
-			setTimeout(function() {
-				deepEqual( $( "#" + element.data("ui-tooltip-id") ).text(), "loading..." );
+			setTimeout( function() {
+				deepEqual( $( "#" + element.data( "ui-tooltip-id" ) ).text(), "loading..." );
 
 				response( "customstring2" );
-				setTimeout(function() {
-					deepEqual( $( "#" + element.data("ui-tooltip-id") ).text(), "customstring2" );
+				setTimeout( function() {
+					deepEqual( $( "#" + element.data( "ui-tooltip-id" ) ).text(), "customstring2" );
 					start();
 				}, 13 );
 			}, 13 );
 			return "loading...";
 		}
-	}).tooltip( "open" );
-});
+	} ).tooltip( "open" );
+} );
 
 // http://bugs.jqueryui.com/ticket/8740
 asyncTest( "content: async callback loses focus before load", function() {
 	expect( 1 );
 
-	var element = $( "#tooltipped1" ).tooltip({
+	var element = $( "#tooltipped1" ).tooltip( {
 		content: function( response ) {
-			setTimeout(function() {
+			setTimeout( function() {
 				element.trigger( "mouseleave" );
-				setTimeout(function() {
+				setTimeout( function() {
 					response( "sometext" );
-					setTimeout(function() {
+					setTimeout( function() {
 						ok( !$( "#" + element.data( "ui-tooltip-id" ) ).is( ":visible" ),
 							"Tooltip should not display" );
 						start();
-					});
-				});
-			});
+					} );
+				} );
+			} );
 		}
-	});
+	} );
 	element.trigger( "mouseover" );
-});
+} );
 
 test( "content: change while open", function() {
 	expect( 2 ) ;
-	var element = $( "#tooltipped1" ).tooltip({
+	var element = $( "#tooltipped1" ).tooltip( {
 		content: function() {
 			return "old";
 		}
-	});
+	} );
 
 	element.one( "tooltipopen", function( event, ui ) {
 		equal( ui.tooltip.text(), "old", "original content" );
 		element.tooltip( "option", "content", function() {
 			return "new";
-		});
+		} );
 		equal( ui.tooltip.text(), "new", "updated content" );
-	});
+	} );
 
 	element.tooltip( "open" );
-});
+} );
 
 test( "content: string", function() {
 	expect( 1 );
-	$( "#tooltipped1" ).tooltip({
+	$( "#tooltipped1" ).tooltip( {
 		content: "just a string",
 		open: function( event, ui ) {
 			equal( ui.tooltip.text(), "just a string" );
 		}
-	}).tooltip( "open" );
-});
+	} ).tooltip( "open" );
+} );
 
 test( "content: element", function() {
 	expect( 1 );
 	var content = "<p>this is a <i>test</i> of the emergency broadcast system.</p>",
 		element = $( content )[ 0 ];
-	$( "#tooltipped1" ).tooltip({
+	$( "#tooltipped1" ).tooltip( {
 		content: element,
 		open: function( event, ui ) {
 			equal( ui.tooltip.children().html().toLowerCase(), content );
 		}
-	}).tooltip( "open" );
-});
+	} ).tooltip( "open" );
+} );
 
 test( "content: jQuery", function() {
 	expect( 1 );
 	var content = "<p>this is a <i>test</i> of the emergency broadcast system.</p>",
 		element = $( content );
-	$( "#tooltipped1" ).tooltip({
+	$( "#tooltipped1" ).tooltip( {
 		content: element,
 		open: function( event, ui ) {
 			equal( ui.tooltip.children().html().toLowerCase(), content );
 		}
-	}).tooltip( "open" );
-});
+	} ).tooltip( "open" );
+} );
 
 test( "items", function() {
 	expect( 2 );
 	var event,
-		element = $( "#qunit-fixture" ).tooltip({
+		element = $( "#qunit-fixture" ).tooltip( {
 			items: "#fixture-span"
-		});
+		} );
 
 	event = $.Event( "mouseenter" );
 	event.target = $( "#fixture-span" )[ 0 ];
@@ -167,7 +167,7 @@ test( "items", function() {
 	deepEqual( $( "#tooltipped1" ).data( "ui-tooltip-id" ), undefined );
 
 	element.tooltip( "destroy" );
-});
+} );
 
 test( "track + show delay", function() {
 	expect( 2 );
@@ -175,7 +175,7 @@ test( "track + show delay", function() {
 		leftVal = 314,
 		topVal = 159,
 		offsetVal = 26,
-		element = $( "#tooltipped1" ).tooltip({
+		element = $( "#tooltipped1" ).tooltip( {
 			track: true,
 			show: {
 				delay: 1
@@ -184,7 +184,7 @@ test( "track + show delay", function() {
 				my: "left+" + offsetVal + " top+" + offsetVal,
 				at: "right bottom"
 			}
-		});
+		} );
 
 	event = $.Event( "mouseover" );
 	event.target = $( "#tooltipped1" )[ 0 ];
@@ -202,14 +202,14 @@ test( "track + show delay", function() {
 
 	equal( $( ".ui-tooltip" ).css( "left" ), leftVal + offsetVal + "px" );
 	equal( $( ".ui-tooltip" ).css( "top" ), topVal + offsetVal + "px" );
-});
+} );
 
 test( "track and programmatic focus", function() {
 	expect( 1 );
-	$( "#qunit-fixture div input" ).tooltip({
+	$( "#qunit-fixture div input" ).tooltip( {
 		track: true
-	}).trigger( "focus" );
+	} ).trigger( "focus" );
 	equal( "inputtitle", $( ".ui-tooltip" ).text() );
-});
+} );
 
 } );
diff --git a/ui/widgets/tooltip.js b/ui/widgets/tooltip.js
index 6c4493052d7..512224050f4 100644
--- a/ui/widgets/tooltip.js
+++ b/ui/widgets/tooltip.js
@@ -42,13 +42,16 @@ $.widget( "ui.tooltip", {
 			"ui-tooltip": "ui-corner-all ui-widget-shadow"
 		},
 		content: function() {
+
 			// support: IE<9, Opera in jQuery <1.7
 			// .text() can't accept undefined, so coerce to a string
 			var title = $( this ).attr( "title" ) || "";
+
 			// Escape title, since we're going from an attribute to raw HTML
 			return $( "<a>" ).text( title ).html();
 		},
 		hide: true,
+
 		// Disabled elements have inconsistent behavior across browsers (#8661)
 		items: "[title]:not([disabled])",
 		position: {
@@ -123,6 +126,7 @@ $.widget( "ui.tooltip", {
 		if ( key === "disabled" ) {
 			this[ value ? "_disable" : "_enable" ]();
 			this.options[ key ] = value;
+
 			// disable element style changes
 			return;
 		}
@@ -158,6 +162,7 @@ $.widget( "ui.tooltip", {
 	},
 
 	_enable: function() {
+
 		// restore title attributes
 		this.element.find( this.options.items ).addBack().each( function() {
 			var element = $( this );
@@ -170,6 +175,7 @@ $.widget( "ui.tooltip", {
 	open: function( event ) {
 		var that = this,
 			target = $( event ? event.target : this.element )
+
 				// we need closest here due to mouseover bubbling,
 				// but always pointing at the same event target
 				.closest( this.options.items );
@@ -304,6 +310,7 @@ $.widget( "ui.tooltip", {
 			this._on( this.document, {
 				mousemove: position
 			} );
+
 			// trigger once to override element-relative positioning
 			position( event );
 		} else {
@@ -315,6 +322,7 @@ $.widget( "ui.tooltip", {
 		tooltip.hide();
 
 		this._show( tooltip, this.options.show );
+
 		// Handle tracking tooltips that are shown with a delay (#8644). As soon
 		// as the tooltip is visible, position the tooltip using the most recent
 		// event.
@@ -464,6 +472,7 @@ $.widget( "ui.tooltip", {
 
 		// Close open tooltips
 		$.each( this.tooltips, function( id, tooltipData ) {
+
 			// Delegate to close method to handle common cleanup
 			var event = $.Event( "blur" ),
 				element = tooltipData.element;
@@ -476,6 +485,7 @@ $.widget( "ui.tooltip", {
 
 			// Restore the title
 			if ( element.data( "ui-tooltip-title" ) ) {
+
 				// If the title attribute has changed since open(), don't restore
 				if ( !element.attr( "title" ) ) {
 					element.attr( "title", element.data( "ui-tooltip-title" ) );

From 2c98903076679074f4ddbd390caa1cf5b1462e09 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 08:57:25 -0400
Subject: [PATCH 03/27] Tabs: Style updates

Ref #14246
---
 tests/unit/tabs/common.js  |   2 +-
 tests/unit/tabs/core.js    |  68 +++++++++++-----------
 tests/unit/tabs/events.js  |  67 +++++++++++----------
 tests/unit/tabs/helper.js  |  17 +++---
 tests/unit/tabs/methods.js |  74 +++++++++++++----------
 tests/unit/tabs/options.js | 116 ++++++++++++++++++-------------------
 ui/widgets/tabs.js         |  22 +++++++
 7 files changed, 202 insertions(+), 164 deletions(-)

diff --git a/tests/unit/tabs/common.js b/tests/unit/tabs/common.js
index 40c899847be..ae4adde5a54 100644
--- a/tests/unit/tabs/common.js
+++ b/tests/unit/tabs/common.js
@@ -26,6 +26,6 @@ common.testWidget( "tabs", {
 		create: null,
 		load: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/tabs/core.js b/tests/unit/tabs/core.js
index 9c62817eba4..a2b41e24c8c 100644
--- a/tests/unit/tabs/core.js
+++ b/tests/unit/tabs/core.js
@@ -40,9 +40,9 @@ test( "markup structure", function( assert ) {
 	assert.hasClasses( panels[ 1 ], "ui-tabs-panel ui-widget-content" );
 	assert.hasClasses( panels[ 2 ], "ui-tabs-panel ui-widget-content" );
 	equal( panels.length, 3, "There are exactly 3 tab panels" );
-});
+} );
 
-$.each({
+$.each( {
 	"deep ul": "#tabs3",
 	"multiple lists, ul first": "#tabs4",
 	"multiple lists, ol first": "#tabs5",
@@ -53,8 +53,8 @@ $.each({
 		var element = $( selector ).tabs();
 		assert.hasClasses( element, "ui-tabs" );
 		assert.hasClasses( $( selector + "-list" ), "ui-tabs-nav" );
-	});
-});
+	} );
+} );
 
 // #5893 - Sublist in the tab list are considered as tab
 test( "nested list", function() {
@@ -62,7 +62,7 @@ test( "nested list", function() {
 
 	var element = $( "#tabs6" ).tabs();
 	equal( element.tabs( "instance" ).anchors.length, 2, "should contain 2 tab" );
-});
+} );
 
 test( "disconnected from DOM", function() {
 	expect( 2 );
@@ -70,7 +70,7 @@ test( "disconnected from DOM", function() {
 	var element = $( "#tabs1" ).remove().tabs();
 	equal( element.find( ".ui-tabs-nav" ).length, 1, "should initialize nav" );
 	equal( element.find( ".ui-tabs-panel" ).length, 3, "should initialize panels" );
-});
+} );
 
 test( "non-tab list items", function() {
 	expect( 2 );
@@ -79,17 +79,17 @@ test( "non-tab list items", function() {
 	equal( element.tabs( "option", "active" ), 0, "defaults to first tab" );
 	equal( element.find( ".ui-tabs-nav li.ui-state-active" ).index(), 1,
 		"first actual tab is active" );
-});
+} );
 
 test( "aria-controls", function() {
 	expect( 7 );
 	var element = $( "#tabs1" ).tabs(),
 		tabs = element.find( ".ui-tabs-nav li" );
-	tabs.each(function() {
+	tabs.each( function() {
 		var tab = $( this ),
 			anchor = tab.find( ".ui-tabs-anchor" );
 		equal( anchor.prop( "hash" ).substring( 1 ), tab.attr( "aria-controls" ) );
-	});
+	} );
 
 	element = $( "#tabs2" ).tabs();
 	tabs = element.find( ".ui-tabs-nav li" );
@@ -97,20 +97,20 @@ test( "aria-controls", function() {
 	equal( tabs.eq( 1 ).attr( "aria-controls" ), "inline-style" );
 	ok( /^ui-id-\d+$/.test( tabs.eq( 2 ).attr( "aria-controls" ) ), "generated id" );
 	equal( tabs.eq( 3 ).attr( "aria-controls" ), "custom-id" );
-});
+} );
 
 test( "accessibility", function() {
 	expect( 49 );
-	var element = $( "#tabs1" ).tabs({
+	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 ) {
+	tabs.each( function( index ) {
 		var tab = tabs.eq( index ),
 			anchor = anchors.eq( index ),
 			anchorId = anchor.attr( "id" ),
@@ -121,7 +121,7 @@ test( "accessibility", function() {
 		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" );
@@ -155,7 +155,7 @@ test( "accessibility", function() {
 	equal( tabs.eq( 2 ).attr( "aria-disabled" ), "true", "disabled tab has aria-disabled=true" );
 	equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded=false" );
 	equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "inactive panel has aria-hidden=true" );
-});
+} );
 
 asyncTest( "accessibility - ajax", function( assert ) {
 	expect( 6 );
@@ -169,19 +169,19 @@ asyncTest( "accessibility - ajax", function( assert ) {
 	assert.hasClasses( tab, "ui-tabs-loading" );
 	equal( panel.attr( "aria-busy" ), "true", "panel has aria-busy during load" );
 	element.one( "tabsload", function() {
-		setTimeout(function() {
+		setTimeout( function() {
 			equal( panel.attr( "aria-busy" ), null, "panel does not have aria-busy after load" );
 			assert.lacksClasses( tab, "ui-tabs-loading" );
 			start();
 		}, 1 );
-	});
-});
+	} );
+} );
 
 asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER", function( assert ) {
 	expect( 92 );
-	var element = $( "#tabs1" ).tabs({
+	var element = $( "#tabs1" ).tabs( {
 			collapsible: true
-		}),
+		} ),
 		tabs = element.find( ".ui-tabs-nav li" ),
 		panels = element.find( ".ui-tabs-panel" ),
 		keyCode = $.ui.keyCode;
@@ -328,10 +328,10 @@ asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER",
 	}
 
 	setTimeout( step1 );
-});
+} );
 
 // Navigation with CTRL and COMMAND (both behave the same)
-$.each({
+$.each( {
 	ctrl: "CTRL",
 	meta: "COMMAND"
 }, function( modifier, label ) {
@@ -547,8 +547,8 @@ $.each({
 		}
 
 		setTimeout( step1 );
-	});
-});
+	} );
+} );
 
 asyncTest( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP", function( assert ) {
 	expect( 50 );
@@ -640,34 +640,34 @@ asyncTest( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP", function( a
 	}
 
 	setTimeout( step1 );
-});
+} );
 
 test( "#3627 - Ajax tab with url containing a fragment identifier fails to load", function() {
 	expect( 1 );
 
-	$( "#tabs2" ).tabs({
+	$( "#tabs2" ).tabs( {
 		active: 2,
 		beforeLoad: function( event, ui ) {
 			event.preventDefault();
 			ok( /test.html$/.test( ui.ajaxSettings.url ), "should ignore fragment identifier" );
 		}
-	});
-});
+	} );
+} );
 
 test( "#4033 - IE expands hash to full url and misinterprets tab as ajax", function() {
 	expect( 2 );
 
-	var element = $("<div><ul><li><a href='#tab'>Tab</a></li></ul><div id='tab'></div></div>");
-	element.appendTo("#qunit-fixture");
-	element.tabs({
+	var element = $( "<div><ul><li><a href='#tab'>Tab</a></li></ul><div id='tab'></div></div>" );
+	element.appendTo( "#qunit-fixture" );
+	element.tabs( {
 		beforeLoad: function() {
 			event.preventDefault();
 			ok( false, "should not be an ajax tab" );
 		}
-	});
+	} );
 
-	equal( element.find(".ui-tabs-nav li").attr("aria-controls"), "tab", "aria-contorls attribute is correct" );
+	equal( element.find( ".ui-tabs-nav li" ).attr( "aria-controls" ), "tab", "aria-contorls attribute is correct" );
 	state( element, 1 );
-});
+} );
 
 } );
diff --git a/tests/unit/tabs/events.js b/tests/unit/tabs/events.js
index 307e110fdbe..736fda503a7 100644
--- a/tests/unit/tabs/events.js
+++ b/tests/unit/tabs/events.js
@@ -15,17 +15,17 @@ test( "create", function() {
 		tabs = element.find( "ul li" ),
 		panels = element.children( "div" );
 
-	element.tabs({
+	element.tabs( {
 		create: function( event, ui ) {
 			equal( ui.tab.length, 1, "tab length" );
 			strictEqual( ui.tab[ 0 ], tabs[ 0 ], "tab" );
 			equal( ui.panel.length, 1, "panel length" );
 			strictEqual( ui.panel[ 0 ], panels[ 0 ], "panel" );
 		}
-	});
+	} );
 	element.tabs( "destroy" );
 
-	element.tabs({
+	element.tabs( {
 		active: 2,
 		create: function( event, ui ) {
 			equal( ui.tab.length, 1, "tab length" );
@@ -33,27 +33,27 @@ test( "create", function() {
 			equal( ui.panel.length, 1, "panel length" );
 			strictEqual( ui.panel[ 0 ], panels[ 2 ], "panel" );
 		}
-	});
+	} );
 	element.tabs( "destroy" );
 
-	element.tabs({
+	element.tabs( {
 		active: false,
 		collapsible: true,
 		create: function( event, ui ) {
 			equal( ui.tab.length, 0, "tab length" );
 			equal( ui.panel.length, 0, "panel length" );
 		}
-	});
+	} );
 	element.tabs( "destroy" );
-});
+} );
 
 test( "beforeActivate", function() {
 	expect( 38 );
 
-	var element = $( "#tabs1" ).tabs({
+	var element = $( "#tabs1" ).tabs( {
 			active: false,
 			collapsible: true
-		}),
+		} ),
 		tabs = element.find( ".ui-tabs-nav li" ),
 		anchors = tabs.find( ".ui-tabs-anchor" ),
 		panels = element.find( ".ui-tabs-panel" );
@@ -68,7 +68,7 @@ test( "beforeActivate", function() {
 		equal( ui.newPanel.length, 1, "newPanel length" );
 		strictEqual( ui.newPanel[ 0 ], panels[ 0 ], "newPanel" );
 		state( element, 0, 0, 0 );
-	});
+	} );
 	element.tabs( "option", "active", 0 );
 	state( element, 1, 0, 0 );
 
@@ -84,7 +84,7 @@ test( "beforeActivate", function() {
 		equal( ui.newPanel.length, 1, "newPanel length" );
 		strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
 		state( element, 1, 0, 0 );
-	});
+	} );
 	anchors.eq( 1 ).trigger( "click" );
 	state( element, 0, 1, 0 );
 
@@ -98,7 +98,7 @@ test( "beforeActivate", function() {
 		equal( ui.newTab.length, 0, "newTab length" );
 		equal( ui.newPanel.length, 0, "newPanel length" );
 		state( element, 0, 1, 0 );
-	});
+	} );
 	element.tabs( "option", "active", false );
 	state( element, 0, 0, 0 );
 
@@ -113,18 +113,18 @@ test( "beforeActivate", function() {
 		strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
 		event.preventDefault();
 		state( element, 0, 0, 0 );
-	});
+	} );
 	element.tabs( "option", "active", 1 );
 	state( element, 0, 0, 0 );
-});
+} );
 
 test( "activate", function() {
 	expect( 30 );
 
-	var element = $( "#tabs1" ).tabs({
+	var element = $( "#tabs1" ).tabs( {
 			active: false,
 			collapsible: true
-		}),
+		} ),
 		tabs = element.find( ".ui-tabs-nav li" ),
 		anchors = element.find( ".ui-tabs-anchor" ),
 		panels = element.find( ".ui-tabs-panel" );
@@ -139,7 +139,7 @@ test( "activate", function() {
 		equal( ui.newPanel.length, 1, "newPanel length" );
 		strictEqual( ui.newPanel[ 0 ], panels[ 0 ], "newPanel" );
 		state( element, 1, 0, 0 );
-	});
+	} );
 	element.tabs( "option", "active", 0 );
 	state( element, 1, 0, 0 );
 
@@ -155,7 +155,7 @@ test( "activate", function() {
 		equal( ui.newPanel.length, 1, "newPanel length" );
 		strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
 		state( element, 0, 1, 0 );
-	});
+	} );
 	anchors.eq( 1 ).trigger( "click" );
 	state( element, 0, 1, 0 );
 
@@ -169,7 +169,7 @@ test( "activate", function() {
 		equal( ui.newTab.length, 0, "newTab length" );
 		equal( ui.newPanel.length, 0, "newPanel length" );
 		state( element, 0, 0, 0 );
-	});
+	} );
 	element.tabs( "option", "active", false );
 	state( element, 0, 0, 0 );
 
@@ -177,12 +177,12 @@ test( "activate", function() {
 	element.one( "tabsbeforeactivate", function( event ) {
 		ok( true, "tabsbeforeactivate" );
 		event.preventDefault();
-	});
+	} );
 	element.one( "tabsactivate", function() {
 		ok( false, "tabsactivate" );
-	});
+	} );
 	element.tabs( "option", "active", 1 );
-});
+} );
 
 test( "beforeLoad", function() {
 	expect( 32 );
@@ -206,8 +206,8 @@ test( "beforeLoad", function() {
 		equal( ui.panel.html(), "", "panel html" );
 		event.preventDefault();
 		state( element, 0, 0, 1, 0, 0 );
-	});
-	element.tabs({ active: 2 });
+	} );
+	element.tabs( { active: 2 } );
 	state( element, 0, 0, 1, 0, 0 );
 	equal( panel.html(), "", "panel html after" );
 	element.tabs( "destroy" );
@@ -228,7 +228,7 @@ test( "beforeLoad", function() {
 		equal( ui.panel.html(), "", "panel html" );
 		event.preventDefault();
 		state( element, 1, 0, 0, 0, 0 );
-	});
+	} );
 	element.tabs();
 	element.tabs( "option", "active", 2 );
 	state( element, 0, 0, 1, 0, 0 );
@@ -250,12 +250,13 @@ test( "beforeLoad", function() {
 		ui.panel.html( "<p>testing</p>" );
 		event.preventDefault();
 		state( element, 0, 0, 1, 0, 0 );
-	});
+	} );
 	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 3 ).trigger( "click" );
 	state( element, 0, 0, 0, 1, 0 );
+
 	// .toLowerCase() is needed to convert <P> to <p> in old IEs
 	equal( panel.html().toLowerCase(), "<p>testing</p>", "panel html after" );
-});
+} );
 
 asyncTest( "load", function() {
 	expect( 21 );
@@ -277,10 +278,11 @@ asyncTest( "load", function() {
 		equal( ui.panel.find( "p" ).length, 1, "panel html" );
 		state( element, 0, 0, 1, 0, 0 );
 		tabsload1();
-	});
-	element.tabs({ active: 2 });
+	} );
+	element.tabs( { active: 2 } );
 
 	function tabsload1() {
+
 		// .option()
 		element.one( "tabsload", function( event, ui ) {
 			tab = element.find( ".ui-tabs-nav li" ).eq( 3 );
@@ -295,11 +297,12 @@ asyncTest( "load", function() {
 			equal( ui.panel.find( "p" ).length, 1, "panel html" );
 			state( element, 0, 0, 0, 1, 0 );
 			tabsload2();
-		});
+		} );
 		element.tabs( "option", "active", 3 );
 	}
 
 	function tabsload2() {
+
 		// click, change panel content
 		element.one( "tabsload", function( event, ui ) {
 			tab = element.find( ".ui-tabs-nav li" ).eq( 4 );
@@ -314,9 +317,9 @@ asyncTest( "load", function() {
 			equal( ui.panel.find( "p" ).length, 1, "panel html" );
 			state( element, 0, 0, 0, 0, 1 );
 			start();
-		});
+		} );
 		element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 4 ).trigger( "click" );
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/tabs/helper.js b/tests/unit/tabs/helper.js
index 132061753df..073895f5ff3 100644
--- a/tests/unit/tabs/helper.js
+++ b/tests/unit/tabs/helper.js
@@ -15,7 +15,7 @@ return $.extend( helper, {
 		if ( internalState === true ) {
 			internalState = $.map( new Array( tabs.find( ".ui-tabs-nav li" ).length ), function( _, index ) {
 				return index;
-			});
+			} );
 		}
 
 		expected = $.map( new Array( tabs.find ( ".ui-tabs-nav li" ).length ), function( _, index ) {
@@ -24,9 +24,9 @@ return $.extend( helper, {
 			} else {
 				return $.inArray( index, state ) !== -1 ? 1 : 0;
 			}
-		});
+		} );
 
-		actual = tabs.find( ".ui-tabs-nav li" ).map(function( index ) {
+		actual = tabs.find( ".ui-tabs-nav li" ).map( function( index ) {
 			var tab = $( this ),
 				tabIsDisabled = tab.hasClass( "ui-state-disabled" );
 
@@ -36,23 +36,24 @@ return $.extend( helper, {
 			if ( !tabIsDisabled && $.inArray( index, internalState ) === -1 ) {
 				return 0;
 			}
+
 			// mixed state - invalid
 			return -1;
-		}).get();
+		} ).get();
 
 		deepEqual( tabs.tabs( "option", "disabled" ), state );
 		deepEqual( actual, expected );
 	},
 
 	equalHeight: function( tabs, height ) {
-		tabs.find( ".ui-tabs-panel" ).each(function() {
+		tabs.find( ".ui-tabs-panel" ).each( function() {
 			equal( $( this ).outerHeight(), height );
-		});
+		} );
 	},
 
 	state: function( tabs ) {
 		var expected = $.makeArray( arguments ).slice( 1 ),
-			actual = tabs.find( ".ui-tabs-nav li" ).map(function() {
+			actual = tabs.find( ".ui-tabs-nav li" ).map( function() {
 				var tab = $( this ),
 					panel = $( $.ui.tabs.prototype._sanitizeSelector(
 						"#" + tab.attr( "aria-controls" ) ) ),
@@ -66,7 +67,7 @@ return $.extend( helper, {
 					return 0;
 				}
 				return -1; // mixed state - invalid
-			}).get();
+			} ).get();
 		deepEqual( actual, expected );
 	}
 } );
diff --git a/tests/unit/tabs/methods.js b/tests/unit/tabs/methods.js
index d904ac53040..ef7c09ba78d 100644
--- a/tests/unit/tabs/methods.js
+++ b/tests/unit/tabs/methods.js
@@ -13,95 +13,103 @@ test( "destroy", function( assert ) {
 	expect( 2 );
 	assert.domEqual( "#tabs1", function() {
 		$( "#tabs1" ).tabs().tabs( "destroy" );
-	});
+	} );
 	assert.domEqual( "#tabs2", function() {
 		$( "#tabs2" ).tabs().tabs( "destroy" );
-	});
-});
+	} );
+} );
 
 asyncTest( "destroy - ajax", function( assert ) {
 	expect( 1 );
 	assert.domEqual( "#tabs2", function( done ) {
-		var element = $( "#tabs2" ).tabs({
+		var element = $( "#tabs2" ).tabs( {
 			load: function() {
-				setTimeout(function() {
+				setTimeout( function() {
 					element.tabs( "destroy" );
 					done();
 					start();
-				});
+				} );
 			}
-		});
+		} );
 		element.tabs( "option", "active", 2 );
-	});
-});
+	} );
+} );
 
 test( "enable", function() {
 	expect( 8 );
 
-	var element = $( "#tabs1" ).tabs({ disabled: true });
+	var element = $( "#tabs1" ).tabs( { disabled: true } );
 	disabled( element, true );
 	element.tabs( "enable" );
 	disabled( element, false );
 	element.tabs( "destroy" );
 
-	element.tabs({ disabled: [ 0, 1 ] });
+	element.tabs( { disabled: [ 0, 1 ] } );
 	disabled( element, [ 0, 1 ] );
 	element.tabs( "enable" );
 	disabled( element, false );
-});
+} );
 
 test( "enable( index )", function() {
 	expect( 10 );
 
-	var element = $( "#tabs1" ).tabs({ disabled: true });
+	var element = $( "#tabs1" ).tabs( { disabled: true } );
 	disabled( element, true );
+
 	// fully disabled -> partially disabled
 	element.tabs( "enable", 1 );
 	disabled( element, [ 0, 2 ] );
+
 	// partially disabled -> partially disabled
 	element.tabs( "enable", 2 );
 	disabled( element, [ 0 ] );
+
 	// already enabled tab, no change
 	element.tabs( "enable", 2 );
 	disabled( element, [ 0 ] );
+
 	// partially disabled -> fully enabled
 	element.tabs( "enable", 0 );
 	disabled( element, false );
-});
+} );
 
 test( "disable", function() {
 	expect( 8 );
 
-	var element = $( "#tabs1" ).tabs({ disabled: false });
+	var element = $( "#tabs1" ).tabs( { disabled: false } );
 	disabled( element, false );
 	element.tabs( "disable" );
 	disabled( element, true );
 	element.tabs( "destroy" );
 
-	element.tabs({ disabled: [ 0, 1 ] });
+	element.tabs( { disabled: [ 0, 1 ] } );
 	disabled( element, [ 0, 1 ] );
 	element.tabs( "disable" );
 	disabled( element, true );
-});
+} );
 
 test( "disable( index )", function() {
 	expect( 10 );
 
-	var element = $( "#tabs1" ).tabs({ disabled: false });
+	var element = $( "#tabs1" ).tabs( { disabled: false } );
 	disabled( element, false );
+
 	// fully enabled -> partially disabled
 	element.tabs( "disable", 1 );
 	disabled( element, [ 1 ] );
+
 	// partially disabled -> partially disabled
 	element.tabs( "disable", 2 );
 	disabled( element, [ 1, 2 ] );
+
 	// already disabled tab, no change
 	element.tabs( "disable", 2 );
 	disabled( element, [ 1, 2 ] );
+
 	// partially disabled -> fully disabled
 	element.tabs( "disable", 0 );
 	disabled( element, true );
-});
+} );
 
 test( "refresh", function() {
 	expect( 27 );
@@ -170,15 +178,15 @@ test( "refresh", function() {
 	element.tabs( "refresh" );
 	state( element, 1 );
 	disabled( element, false );
-});
+} );
 
 test( "refresh - looping", function() {
 	expect( 6 );
 
-	var element = $( "#tabs1" ).tabs({
+	var element = $( "#tabs1" ).tabs( {
 		disabled: [ 0 ],
 		active: 1
-	});
+	} );
 	state( element, 0, 1, 0 );
 	disabled( element, [ 0 ] );
 
@@ -190,7 +198,7 @@ test( "refresh - looping", function() {
 	element.tabs( "refresh" );
 	state( element, 0, 1 );
 	disabled( element, [ 0 ] );
-});
+} );
 
 asyncTest( "load", function() {
 	expect( 30 );
@@ -210,8 +218,9 @@ asyncTest( "load", function() {
 		equal( ui.panel.length, 1, "panel length" );
 		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 		state( element, 1, 0, 0, 0, 0 );
-	});
+	} );
 	element.one( "tabsload", function( event, ui ) {
+
 		// TODO: remove wrapping in 2.0
 		var uiTab = $( ui.tab ),
 			uiPanel = $( ui.panel ),
@@ -227,24 +236,26 @@ asyncTest( "load", function() {
 		equal( uiPanel.find( "p" ).length, 1, "panel html" );
 		state( element, 1, 0, 0, 0, 0 );
 		setTimeout( tabsload1 );
-	});
+	} );
 	element.tabs( "load", 3 );
 	state( element, 1, 0, 0, 0, 0 );
 
 	function tabsload1() {
+
 		// no need to test details of event (tested in events tests)
 		element.one( "tabsbeforeload", function() {
 			ok( true, "tabsbeforeload invoked" );
-		});
+		} );
 		element.one( "tabsload", function() {
 			ok( true, "tabsload invoked" );
 			setTimeout( tabsload2 );
-		});
+		} );
 		element.tabs( "option", "active", 3 );
 		state( element, 0, 0, 0, 1, 0 );
 	}
 
 	function tabsload2() {
+
 		// reload content of active tab
 		element.one( "tabsbeforeload", function( event, ui ) {
 			var tab = element.find( ".ui-tabs-nav li" ).eq( 3 ),
@@ -257,8 +268,9 @@ asyncTest( "load", function() {
 			equal( ui.panel.length, 1, "panel length" );
 			strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 			state( element, 0, 0, 0, 1, 0 );
-		});
+		} );
 		element.one( "tabsload", function( event, ui ) {
+
 			// TODO: remove wrapping in 2.0
 			var uiTab = $( ui.tab ),
 				uiPanel = $( ui.panel ),
@@ -273,11 +285,11 @@ asyncTest( "load", function() {
 			strictEqual( uiPanel[ 0 ], panel[ 0 ], "panel" );
 			state( element, 0, 0, 0, 1, 0 );
 			start();
-		});
+		} );
 		element.tabs( "load", 3 );
 		state( element, 0, 0, 0, 1, 0 );
 	}
-});
+} );
 
 test( "widget", function() {
 	expect( 2 );
@@ -285,6 +297,6 @@ test( "widget", function() {
 		widgetElement = element.tabs( "widget" );
 	equal( widgetElement.length, 1, "one element" );
 	strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
-});
+} );
 
 } );
diff --git a/tests/unit/tabs/options.js b/tests/unit/tabs/options.js
index f615e165ee7..f9d9857b12a 100644
--- a/tests/unit/tabs/options.js
+++ b/tests/unit/tabs/options.js
@@ -30,15 +30,15 @@ test( "{ active: default }", function() {
 	state( element, 0, 0, 0, 1, 0 );
 	element.tabs( "destroy" );
 	location.hash = "#";
-});
+} );
 
 test( "{ active: false }", function() {
 	expect( 7 );
 
-	var element = $( "#tabs1" ).tabs({
+	var element = $( "#tabs1" ).tabs( {
 		active: false,
 		collapsible: true
-	});
+	} );
 	state( element, 0, 0, 0 );
 	equal( element.find( ".ui-tabs-nav .ui-state-active" ).length, 0, "no tabs selected" );
 	strictEqual( element.tabs( "option", "active" ), false );
@@ -48,19 +48,19 @@ test( "{ active: false }", function() {
 	equal( element.tabs( "option", "active" ), 0 );
 
 	element.tabs( "destroy" );
-	element.tabs({
+	element.tabs( {
 		active: false
-	});
+	} );
 	state( element, 1, 0, 0 );
 	strictEqual( element.tabs( "option", "active" ), 0 );
-});
+} );
 
 test( "{ active: Number }", function() {
 	expect( 8 );
 
-	var element = $( "#tabs1" ).tabs({
+	var element = $( "#tabs1" ).tabs( {
 		active: 2
-	});
+	} );
 	equal( element.tabs( "option", "active" ), 2 );
 	state( element, 0, 0, 1 );
 
@@ -75,14 +75,14 @@ test( "{ active: Number }", function() {
 	element.tabs( "option", "active", 10 );
 	equal( element.tabs( "option", "active" ), 1 );
 	state( element, 0, 1, 0 );
-});
+} );
 
 test( "{ active: -Number }", function() {
 	expect( 8 );
 
-	var element = $( "#tabs1" ).tabs({
+	var element = $( "#tabs1" ).tabs( {
 		active: -1
-	});
+	} );
 	equal( element.tabs( "option", "active" ), 2 );
 	state( element, 0, 0, 1 );
 
@@ -97,7 +97,7 @@ test( "{ active: -Number }", function() {
 	element.tabs( "option", "active", -3 );
 	equal( element.tabs( "option", "active" ), 0 );
 	state( element, 1, 0, 0 );
-});
+} );
 
 test( "active - mismatched tab/panel order", function() {
 	expect( 3 );
@@ -109,15 +109,15 @@ test( "active - mismatched tab/panel order", function() {
 	element.tabs( "option", "active", 0 );
 	state( element, 1, 0 );
 	location.hash = "#";
-});
+} );
 
 test( "collapsible", function( assert ) {
 	expect( 13 );
 
-	var element = $( "#tabs1" ).tabs({
+	var element = $( "#tabs1" ).tabs( {
 		active: 1,
 		collapsible: true
-	});
+	} );
 	assert.hasClasses( element, "ui-tabs-collapsible" );
 	element.tabs( "option", "active", false );
 	equal( element.tabs( "option", "active" ), false );
@@ -138,10 +138,10 @@ test( "collapsible", function( assert ) {
 
 	assert.hasClasses( element, "ui-tabs-collapsible" );
 
-	element.tabs({
+	element.tabs( {
 		active: 1,
 		collapsible: false
-	});
+	} );
 	element.tabs( "option", "active", false );
 	equal( element.tabs( "option", "active" ), 1 );
 	state( element, 0, 1, 0 );
@@ -150,7 +150,7 @@ test( "collapsible", function( assert ) {
 	equal( element.tabs( "option", "active" ), 1 );
 	state( element, 0, 1, 0 );
 
-});
+} );
 
 test( "disabled", function( assert ) {
 	expect( 23 );
@@ -195,14 +195,14 @@ test( "disabled", function( assert ) {
 	// Enable all tabs
 	element.tabs( "option", "disabled", [] );
 	disabled( element, false );
-});
+} );
 
 test( "{ event: null }", function() {
 	expect( 5 );
 
-	var element = $( "#tabs1" ).tabs({
+	var element = $( "#tabs1" ).tabs( {
 		event: null
-	});
+	} );
 	state( element, 1, 0, 0 );
 
 	element.tabs( "option", "active", 1 );
@@ -213,14 +213,14 @@ test( "{ event: null }", function() {
 	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 2 ).trigger( "click" );
 	equal( element.tabs( "option", "active" ), 1 );
 	state( element, 0, 1, 0 );
-});
+} );
 
 test( "{ event: custom }", function() {
 	expect( 11 );
 
-	var element = $( "#tabs1" ).tabs({
+	var element = $( "#tabs1" ).tabs( {
 		event: "custom1 custom2"
-	});
+	} );
 	state( element, 1, 0, 0 );
 
 	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 1 ).trigger( "custom1" );
@@ -246,88 +246,88 @@ test( "{ event: custom }", function() {
 	element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 1 ).trigger( "custom3" );
 	equal( element.tabs( "option", "active" ), 1 );
 	state( element, 0, 1, 0 );
-});
+} );
 
 test( "{ heightStyle: 'auto' }", function() {
 	expect( 2 );
-	var element = $( "#tabs8" ).tabs({ heightStyle: "auto" });
+	var element = $( "#tabs8" ).tabs( { heightStyle: "auto" } );
 	equalHeight( element, 45 );
-});
+} );
 
 test( "{ heightStyle: 'content' }", function() {
 	expect( 2 );
-	var element = $( "#tabs8" ).tabs({ heightStyle: "content" }),
-		sizes = element.find( ".ui-tabs-panel" ).map(function() {
+	var element = $( "#tabs8" ).tabs( { heightStyle: "content" } ),
+		sizes = element.find( ".ui-tabs-panel" ).map( function() {
 			return $( this ).height();
-		}).get();
+		} ).get();
 	equal( sizes[ 0 ], 45 );
 	equal( sizes[ 1 ], 15 );
-});
+} );
 
 test( "{ heightStyle: 'fill' }", function() {
 	expect( 4 );
 	$( "#tabs8Wrapper" ).height( 500 );
-	var element = $( "#tabs8" ).tabs({ heightStyle: "fill" });
+	var element = $( "#tabs8" ).tabs( { heightStyle: "fill" } );
 	equalHeight( element, 485 );
 	element.tabs( "destroy" );
 
-	element = $( "#tabs8" ).css({
+	element = $( "#tabs8" ).css( {
 		"border": "1px solid black",
 		"padding": "1px 0"
-	});
-	element.tabs({ heightStyle: "fill" });
+	} );
+	element.tabs( { heightStyle: "fill" } );
 	equalHeight( element, 481 );
-});
+} );
 
 test( "{ heightStyle: 'fill' } with sibling", function() {
 	expect( 2 );
 	$( "#tabs8Wrapper" ).height( 500 );
 	$( "<p>Lorem Ipsum</p>" )
-		.css({
+		.css( {
 			height: 50,
 			marginTop: 20,
 			marginBottom: 30
-		})
+		} )
 		.prependTo( "#tabs8Wrapper" );
-	var element = $( "#tabs8" ).tabs({ heightStyle: "fill" });
+	var element = $( "#tabs8" ).tabs( { heightStyle: "fill" } );
 	equalHeight( element, 385 );
-});
+} );
 
 test( "{ heightStyle: 'fill' } with multiple siblings", function() {
 	expect( 2 );
 	$( "#tabs8Wrapper" ).height( 500 );
 	$( "<p>Lorem Ipsum</p>" )
-		.css({
+		.css( {
 			height: 50,
 			marginTop: 20,
 			marginBottom: 30
-		})
+		} )
 		.prependTo( "#tabs8Wrapper" );
 	$( "<p>Lorem Ipsum</p>" )
-		.css({
+		.css( {
 			height: 50,
 			marginTop: 20,
 			marginBottom: 30,
 			position: "absolute"
-		})
+		} )
 		.prependTo( "#tabs8Wrapper" );
 	$( "<p>Lorem Ipsum</p>" )
-		.css({
+		.css( {
 			height: 25,
 			marginTop: 10,
 			marginBottom: 15
-		})
+		} )
 		.prependTo( "#tabs8Wrapper" );
-	var element = $( "#tabs8" ).tabs({ heightStyle: "fill" });
+	var element = $( "#tabs8" ).tabs( { heightStyle: "fill" } );
 	equalHeight( element, 335 );
-});
+} );
 
 test( "hide and show: false", function() {
 	expect( 3 );
-	var element = $( "#tabs1" ).tabs({
+	var element = $( "#tabs1" ).tabs( {
 			show: false,
 			hide: false
-		}),
+		} ),
 		widget = element.tabs( "instance" ),
 		panels = element.find( ".ui-tabs-panel" );
 	widget._show = function() {
@@ -341,34 +341,34 @@ test( "hide and show: false", function() {
 	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({
+	var element = $( "#tabs1" ).tabs( {
 			show: "drop",
 			hide: 2000
-		}),
+		} ),
 		widget = element.tabs( "instance" ),
 		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() {
+		setTimeout( function() {
 			callback();
-		});
+		} );
 	};
 	widget._hide = function( element, options, callback ) {
 		strictEqual( element[ 0 ], panels[ 0 ], "correct element in _hide()" );
 		equal( options, 2000, "correct options in _hide()" );
-		setTimeout(function() {
+		setTimeout( function() {
 			callback();
 			start();
-		});
+		} );
 	};
 
 	ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" );
 	element.tabs( "option", "active", 1 );
-});
+} );
 
 } );
diff --git a/ui/widgets/tabs.js b/ui/widgets/tabs.js
index 034dcc3aa16..ff3a64ec8c0 100644
--- a/ui/widgets/tabs.js
+++ b/ui/widgets/tabs.js
@@ -123,6 +123,7 @@ $.widget( "ui.tabs", {
 			locationHash = location.hash.substring( 1 );
 
 		if ( active === null ) {
+
 			// check the fragment identifier in the URL
 			if ( locationHash ) {
 				this.tabs.each( function( i, tab ) {
@@ -193,15 +194,18 @@ $.widget( "ui.tabs", {
 			selectedIndex = 0;
 			break;
 		case $.ui.keyCode.SPACE:
+
 			// Activate only, no collapsing
 			event.preventDefault();
 			clearTimeout( this.activating );
 			this._activate( selectedIndex );
 			return;
 		case $.ui.keyCode.ENTER:
+
 			// Toggle (cancel delayed activation, allow collapsing)
 			event.preventDefault();
 			clearTimeout( this.activating );
+
 			// Determine if we should collapse or activate
 			this._activate( selectedIndex === this.options.active ? false : selectedIndex );
 			return;
@@ -281,12 +285,14 @@ $.widget( "ui.tabs", {
 
 	_setOption: function( key, value ) {
 		if ( key === "active" ) {
+
 			// _activate() will handle invalid values and update this.options
 			this._activate( value );
 			return;
 		}
 
 		if ( key === "disabled" ) {
+
 			// don't use the widget factory's disabled handling
 			this._setupDisabled( value );
 			return;
@@ -332,18 +338,23 @@ $.widget( "ui.tabs", {
 		if ( options.active === false || !this.anchors.length ) {
 			options.active = false;
 			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
 			} 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
 			options.active = this.tabs.index( this.active );
 		}
@@ -445,8 +456,10 @@ $.widget( "ui.tabs", {
 				selector = anchor.hash;
 				panelId = selector.substring( 1 );
 				panel = that.element.find( that._sanitizeSelector( selector ) );
+
 			// remote tab
 			} else {
+
 				// If the tab doesn't already have aria-controls,
 				// generate an id by using a throw-away element
 				panelId = tab.attr( "aria-controls" ) || $( {} ).uniqueId()[ 0 ].id;
@@ -529,6 +542,7 @@ $.widget( "ui.tabs", {
 		}
 
 		this._off( this.anchors.add( this.tabs ).add( this.panels ) );
+
 		// Always prevent the default action, even when disabled
 		this._on( true, this.anchors, {
 			click: function( event ) {
@@ -597,12 +611,16 @@ $.widget( "ui.tabs", {
 		event.preventDefault();
 
 		if ( tab.hasClass( "ui-state-disabled" ) ||
+
 				// tab is already loading
 				tab.hasClass( "ui-tabs-loading" ) ||
+
 				// can't switch durning an animation
 				this.running ||
+
 				// click on active header, but not collapsible
 				( clickedIsActive && !options.collapsible ) ||
+
 				// allow canceling activation
 				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
 			return;
@@ -668,6 +686,7 @@ $.widget( "ui.tabs", {
 			"aria-selected": "false",
 			"aria-expanded": "false"
 		} );
+
 		// If we're switching tabs, remove the old tab from the tab order.
 		// If we're opening from collapsed state, remove the previous tab from the tab order.
 		// If we're collapsing, then keep the collapsing tab in the tab order.
@@ -715,6 +734,7 @@ $.widget( "ui.tabs", {
 	},
 
 	_getIndex: function( index ) {
+
 		// meta-function to give users option to provide a href string instead of a numerical index.
 		if ( typeof index === "string" ) {
 			index = this.anchors.index( this.anchors.filter( "[href$='" + $.ui.escapeSelector( index ) + "']" ) );
@@ -848,6 +868,7 @@ $.widget( "ui.tabs", {
 
 			this.xhr
 				.done( function( response, status, jqXHR ) {
+
 					// support: jQuery <1.8
 					// http://bugs.jquery.com/ticket/11778
 					setTimeout( function() {
@@ -858,6 +879,7 @@ $.widget( "ui.tabs", {
 					}, 1 );
 				} )
 				.fail( function( jqXHR, status ) {
+
 					// support: jQuery <1.8
 					// http://bugs.jquery.com/ticket/11778
 					setTimeout( function() {

From 801875f8cc418ccf23cfd1d5132ecc8fe728a0bb Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 08:57:40 -0400
Subject: [PATCH 04/27] Spinner: Style updates

Ref #14246
---
 tests/unit/spinner/common-deprecated.js |  2 +-
 tests/unit/spinner/common.js            |  2 +-
 tests/unit/spinner/core.js              | 72 +++++++++---------
 tests/unit/spinner/events.js            | 42 +++++------
 tests/unit/spinner/methods.js           | 52 ++++++-------
 tests/unit/spinner/options.js           | 98 ++++++++++++-------------
 ui/widgets/spinner.js                   |  8 ++
 7 files changed, 142 insertions(+), 134 deletions(-)

diff --git a/tests/unit/spinner/common-deprecated.js b/tests/unit/spinner/common-deprecated.js
index ece9adeace8..9ffc473af2c 100644
--- a/tests/unit/spinner/common-deprecated.js
+++ b/tests/unit/spinner/common-deprecated.js
@@ -30,6 +30,6 @@ common.testWidget( "spinner", {
 		start: null,
 		stop: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/spinner/common.js b/tests/unit/spinner/common.js
index ece9adeace8..9ffc473af2c 100644
--- a/tests/unit/spinner/common.js
+++ b/tests/unit/spinner/common.js
@@ -30,6 +30,6 @@ common.testWidget( "spinner", {
 		start: null,
 		stop: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/spinner/core.js b/tests/unit/spinner/core.js
index 64824e1282c..23df35da475 100644
--- a/tests/unit/spinner/core.js
+++ b/tests/unit/spinner/core.js
@@ -21,14 +21,14 @@ test( "markup structure", function( assert ) {
 	equal( up.length, 1, "Spinner contains exactly one up button" );
 	assert.hasClasses( down, "ui-spinner-button ui-spinner-down ui-widget" );
 	equal( down.length, 1, "Spinner contains exactly one down button" );
-});
+} );
 
 test( "keydown UP on input, increases value not greater than max", function() {
 	expect( 5 );
-	var element = $( "#spin" ).val( 70 ).spinner({
+	var element = $( "#spin" ).val( 70 ).spinner( {
 		max: 100,
 		step: 10
-	});
+	} );
 
 	simulateKeyDownUp( element, $.ui.keyCode.UP );
 	equal( element.val(), 80 );
@@ -40,14 +40,14 @@ test( "keydown UP on input, increases value not greater than max", function() {
 	equal( element.val(), 100 );
 	simulateKeyDownUp( element, $.ui.keyCode.UP );
 	equal( element.val(), 100 );
-});
+} );
 
 test( "keydown DOWN on input, decreases value not less than min", function() {
 	expect( 5 );
-	var element = $( "#spin" ).val( 50 ).spinner({
+	var element = $( "#spin" ).val( 50 ).spinner( {
 		min: 20,
 		step: 10
-	});
+	} );
 
 	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
 	equal( element.val(), 40 );
@@ -59,14 +59,14 @@ test( "keydown DOWN on input, decreases value not less than min", function() {
 	equal( element.val(), 20 );
 	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
 	equal( element.val(), 20 );
-});
+} );
 
 test( "keydown PAGE_UP on input, increases value not greater than max", function() {
 	expect( 5 );
-	var element = $( "#spin" ).val( 70 ).spinner({
+	var element = $( "#spin" ).val( 70 ).spinner( {
 		max: 100,
 		page: 10
-	});
+	} );
 
 	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
 	equal( element.val(), 80 );
@@ -78,14 +78,14 @@ test( "keydown PAGE_UP on input, increases value not greater than max", function
 	equal( element.val(), 100 );
 	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
 	equal( element.val(), 100 );
-});
+} );
 
 test( "keydown PAGE_DOWN on input, decreases value not less than min", function() {
 	expect( 5 );
-	var element = $( "#spin" ).val( 50 ).spinner({
+	var element = $( "#spin" ).val( 50 ).spinner( {
 		min: 20,
 		page: 10
-	});
+	} );
 
 	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
 	equal( element.val(), 40 );
@@ -97,7 +97,7 @@ test( "keydown PAGE_DOWN on input, decreases value not less than min", function(
 	equal( element.val(), 20 );
 	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
 	equal( element.val(), 20 );
-});
+} );
 
 asyncTest( "blur input while spinning with UP", function() {
 	expect( 3 );
@@ -117,7 +117,7 @@ asyncTest( "blur input while spinning with UP", function() {
 		element.on( "blur", function() {
 			value = element.val();
 			setTimeout( step3, 750 );
-		})[ 0 ].blur();
+		} )[ 0 ].blur();
 	}
 
 	function step3() {
@@ -127,13 +127,13 @@ asyncTest( "blur input while spinning with UP", function() {
 
 	element[ 0 ].focus();
 	setTimeout( step1 );
-});
+} );
 
 test( "mouse click on up button, increases value not greater than max", function() {
 	expect( 3 );
-	var element = $( "#spin" ).val( 18 ).spinner({
+	var element = $( "#spin" ).val( 18 ).spinner( {
 			max: 20
-		}),
+		} ),
 		button = element.spinner( "widget" ).find( ".ui-spinner-up" );
 
 	button.trigger( "mousedown" ).trigger( "mouseup" );
@@ -142,13 +142,13 @@ test( "mouse click on up button, increases value not greater than max", function
 	equal( element.val(), 20 );
 	button.trigger( "mousedown" ).trigger( "mouseup" );
 	equal( element.val(), 20 );
-});
+} );
 
 test( "mouse click on up button, increases value not greater than max", function() {
 	expect( 3 );
-	var element = $( "#spin" ).val( 2 ).spinner({
+	var element = $( "#spin" ).val( 2 ).spinner( {
 		min: 0
-	}),
+	} ),
 	button = element.spinner( "widget" ).find( ".ui-spinner-down" );
 
 	button.trigger( "mousedown" ).trigger( "mouseup" );
@@ -157,14 +157,14 @@ test( "mouse click on up button, increases value not greater than max", function
 	equal( element.val(), 0 );
 	button.trigger( "mousedown" ).trigger( "mouseup" );
 	equal( element.val(), 0 );
-});
+} );
 
 test( "mousewheel on input", function() {
 	expect( 4 );
 
-	var element = $( "#spin" ).val( 0 ).spinner({
+	var element = $( "#spin" ).val( 0 ).spinner( {
 		step: 2
-	});
+	} );
 
 	element.trigger( "mousewheel" );
 	equal( element.val(), 0, "mousewheel event without delta does not change value" );
@@ -176,8 +176,8 @@ test( "mousewheel on input", function() {
 	equal( element.val(), 0 );
 
 	element.trigger( "mousewheel", -15 );
-	equal(element.val(), -2 );
-});
+	equal( element.val(), -2 );
+} );
 
 test( "reading HTML5 attributes", function() {
 	expect( 6 );
@@ -187,19 +187,19 @@ test( "reading HTML5 attributes", function() {
 	equal( element.spinner( "option", "max" ), 100, "max from markup" );
 	equal( element.spinner( "option", "step" ), 2, "step from markup" );
 
-	element = $( markup ).spinner({
+	element = $( markup ).spinner( {
 		min: -200,
 		max: 200,
 		step: 5
-	});
+	} );
 	equal( element.spinner( "option", "min" ), -200, "min from options" );
 	equal( element.spinner( "option", "max" ), 200, "max from options" );
 	equal( element.spinner( "option", "step" ), 5, "stop from options" );
-});
+} );
 
 test( "ARIA attributes", function() {
 	expect( 9 );
-	var element = $( "#spin" ).val( 2 ).spinner({ min: -5, max: 5 });
+	var element = $( "#spin" ).val( 2 ).spinner( { min: -5, max: 5 } );
 
 	equal( element.attr( "role" ), "spinbutton", "role" );
 	equal( element.attr( "aria-valuemin" ), "-5", "aria-valuemin" );
@@ -220,7 +220,7 @@ test( "ARIA attributes", function() {
 
 	element.spinner( "option", "max", null );
 	equal( element.attr( "aria-valuemax" ), undefined, "aria-valuemax not set when no max" );
-});
+} );
 
 test( "focus text field when pressing button", function() {
 	expect( 2 );
@@ -229,29 +229,29 @@ test( "focus text field when pressing button", function() {
 	ok( element[ 0 ] !== document.activeElement, "not focused before" );
 	element.spinner( "widget" ).find( ".ui-spinner-up" ).trigger( "mousedown" );
 	ok( element[ 0 ] === document.activeElement, "focused after" );
-});
+} );
 
 test( "don't clear invalid value on blur", function() {
 	expect( 1 );
 	var element = $( "#spin" ).spinner();
 	element.trigger( "focus" ).val( "a" ).trigger( "blur" );
 	equal( element.val(), "a" );
-});
+} );
 
 test( "precision", function() {
 	expect( 2 );
-	var element = $( "#spin" ).val( 0.05 ).spinner({
+	var element = $( "#spin" ).val( 0.05 ).spinner( {
 		step: 0.0001
-	});
+	} );
 	element.spinner( "stepUp" );
 	equal( element.val(), "0.0501", "precision from step" );
 
 	element.val( 1.05 ).spinner( "option", {
 		step: 1,
 		min: -9.95
-	});
+	} );
 	element.spinner( "stepDown" );
 	equal( element.val(), "0.05", "precision from min" );
-});
+} );
 
 } );
diff --git a/tests/unit/spinner/events.js b/tests/unit/spinner/events.js
index 8fa409b991b..7f88d063a21 100644
--- a/tests/unit/spinner/events.js
+++ b/tests/unit/spinner/events.js
@@ -15,7 +15,7 @@ test( "start", function() {
 	function shouldStart( expectation, msg ) {
 		element.spinner( "option", "start", function() {
 			ok( expectation, msg );
-		});
+		} );
 	}
 
 	shouldStart( true, "key UP" );
@@ -45,7 +45,7 @@ test( "start", function() {
 
 	shouldStart( false, "value" );
 	element.spinner( "value", 999 );
-});
+} );
 
 test( "spin", function() {
 	expect( 10 );
@@ -54,7 +54,7 @@ test( "spin", function() {
 	function shouldSpin( expectation, msg ) {
 		element.spinner( "option", "spin", function() {
 			ok( expectation, msg );
-		});
+		} );
 	}
 
 	shouldSpin( true, "key UP" );
@@ -84,7 +84,7 @@ test( "spin", function() {
 
 	shouldSpin( false, "value" );
 	element.spinner( "value", 999 );
-});
+} );
 
 test( "stop", function() {
 	expect( 10 );
@@ -93,7 +93,7 @@ test( "stop", function() {
 	function shouldStop( expectation, msg ) {
 		element.spinner( "option", "stop", function() {
 			ok( expectation, msg );
-		});
+		} );
 	}
 
 	shouldStop( true, "key UP" );
@@ -123,7 +123,7 @@ test( "stop", function() {
 
 	shouldStop( false, "value" );
 	element.spinner( "value", 999 );
-});
+} );
 
 asyncTest( "change", function() {
 	expect( 12 );
@@ -132,22 +132,22 @@ asyncTest( "change", function() {
 	function shouldChange( expectation, msg ) {
 		element.spinner( "option", "change", function() {
 			ok( expectation, msg );
-		});
+		} );
 	}
 
 	function focusWrap( fn, next ) {
-		element[0].focus();
+		element[ 0 ].focus();
 		setTimeout( function() {
 			fn();
-			setTimeout(function() {
-				element[0].blur();
+			setTimeout( function() {
+				element[ 0 ].blur();
 				setTimeout( next );
-			});
-		});
+			} );
+		} );
 	}
 
 	function step1() {
-		focusWrap(function() {
+		focusWrap( function() {
 			shouldChange( false, "key UP, before blur" );
 			simulateKeyDownUp( element, $.ui.keyCode.UP );
 			shouldChange( true, "blur after key UP" );
@@ -155,7 +155,7 @@ asyncTest( "change", function() {
 	}
 
 	function step2() {
-		focusWrap(function() {
+		focusWrap( function() {
 			shouldChange( false, "key DOWN, before blur" );
 			simulateKeyDownUp( element, $.ui.keyCode.DOWN );
 			shouldChange( true, "blur after key DOWN" );
@@ -163,7 +163,7 @@ asyncTest( "change", function() {
 	}
 
 	function step3() {
-		focusWrap(function() {
+		focusWrap( function() {
 			shouldChange( false, "key PAGE_UP, before blur" );
 			simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
 			shouldChange( true, "blur after key PAGE_UP" );
@@ -171,7 +171,7 @@ asyncTest( "change", function() {
 	}
 
 	function step4() {
-		focusWrap(function() {
+		focusWrap( function() {
 			shouldChange( false, "key PAGE_DOWN, before blur" );
 			simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
 			shouldChange( true, "blur after key PAGE_DOWN" );
@@ -179,7 +179,7 @@ asyncTest( "change", function() {
 	}
 
 	function step5() {
-		focusWrap(function() {
+		focusWrap( function() {
 			shouldChange( false, "many keys, before blur" );
 			simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
 			simulateKeyDownUp( element, $.ui.keyCode.UP );
@@ -191,7 +191,7 @@ asyncTest( "change", function() {
 	}
 
 	function step6() {
-		focusWrap(function() {
+		focusWrap( function() {
 			shouldChange( false, "many keys, same final value, before blur" );
 			simulateKeyDownUp( element, $.ui.keyCode.UP );
 			simulateKeyDownUp( element, $.ui.keyCode.UP );
@@ -206,7 +206,7 @@ asyncTest( "change", function() {
 	}
 
 	function step7() {
-		focusWrap(function() {
+		focusWrap( function() {
 			shouldChange( false, "button down, before blur" );
 			element.spinner( "widget" ).find( ".ui-spinner-down" ).trigger( "mousedown" ).trigger( "mouseup" );
 			shouldChange( true, "blur after button down" );
@@ -214,7 +214,7 @@ asyncTest( "change", function() {
 	}
 
 	function step8() {
-		focusWrap(function() {
+		focusWrap( function() {
 			shouldChange( false, "many buttons, same final value, before blur" );
 			element.spinner( "widget" ).find( ".ui-spinner-up" ).trigger( "mousedown" ).trigger( "mouseup" );
 			element.spinner( "widget" ).find( ".ui-spinner-up" ).trigger( "mousedown" ).trigger( "mouseup" );
@@ -258,6 +258,6 @@ asyncTest( "change", function() {
 	}
 
 	setTimeout( step1 );
-});
+} );
 
 } );
diff --git a/tests/unit/spinner/methods.js b/tests/unit/spinner/methods.js
index 6f165b93657..3b039ff3945 100644
--- a/tests/unit/spinner/methods.js
+++ b/tests/unit/spinner/methods.js
@@ -12,8 +12,8 @@ test( "destroy", function( assert ) {
 	expect( 1 );
 	assert.domEqual( "#spin", function() {
 		$( "#spin" ).spinner().spinner( "destroy" );
-	});
-});
+	} );
+} );
 
 test( "disable", function( assert ) {
 	expect( 15 );
@@ -26,7 +26,7 @@ test( "disable", function( assert ) {
 	element.spinner( "disable" );
 	assert.hasClasses( wrapper, "ui-state-disabled ui-spinner-disabled" );
 	ok( !wrapper.attr( "aria-disabled" ), "after: wrapper does not have aria-disabled attr" );
-	ok( element.is( ":disabled"), "after: input has disabled attribute" );
+	ok( element.is( ":disabled" ), "after: input has disabled attribute" );
 
 	simulateKeyDownUp( element, $.ui.keyCode.UP );
 	equal( 2, element.val(), "keyboard - value does not change on key UP" );
@@ -47,7 +47,7 @@ test( "disable", function( assert ) {
 	equal( 2, element.val(), "mouse - value does not change on clicking down button" );
 
 	element.spinner( "stepUp", 6 );
-	equal( 8, element.val(), "script - stepUp 6 steps changes value");
+	equal( 8, element.val(), "script - stepUp 6 steps changes value" );
 
 	element.spinner( "stepDown" );
 	equal( 7, element.val(), "script - stepDown 1 step changes value" );
@@ -57,11 +57,11 @@ test( "disable", function( assert ) {
 
 	element.spinner( "pageDown" );
 	equal( 7, element.val(), "script - pageDown 1 page changes value" );
-});
+} );
 
 test( "enable", function( assert ) {
 	expect( 5 );
-	var element = $( "#spin" ).val( 1 ).spinner({ disabled: true }),
+	var element = $( "#spin" ).val( 1 ).spinner( { disabled: true } ),
 		wrapper = element.spinner( "widget" );
 
 	assert.hasClasses( wrapper, "ui-spinner-disabled" );
@@ -74,15 +74,15 @@ test( "enable", function( assert ) {
 
 	simulateKeyDownUp( element, $.ui.keyCode.UP );
 	equal( 2, element.val(), "keyboard - value changes on key UP" );
-});
+} );
 
 test( "isValid", function() {
 	expect( 8 );
-	var element = $( "#spin" ).spinner({
+	var element = $( "#spin" ).spinner( {
 			min: 0,
 			max: 10,
 			step: 2
-		}),
+		} ),
 		spinner = element.spinner( "instance" );
 	ok( !spinner.isValid(), "initial state is invalid" );
 
@@ -106,14 +106,14 @@ test( "isValid", function() {
 
 	element.val( "1" );
 	ok( !spinner.isValid(), "step mismatch is invalid" );
-});
+} );
 
 test( "pageDown", function() {
 	expect( 4 );
-	var element = $( "#spin" ).val( -12 ).spinner({
+	var element = $( "#spin" ).val( -12 ).spinner( {
 		page: 20,
 		min: -100
-	});
+	} );
 
 	element.spinner( "pageDown" );
 	equal( element.val(), -32, "pageDown 1 page" );
@@ -126,14 +126,14 @@ test( "pageDown", function() {
 
 	element.spinner( "pageDown", 10 );
 	equal( element.val(), -100, "value at min and pageDown 10 pages" );
-});
+} );
 
 test( "pageUp", function() {
 	expect( 4 );
-	var element = $( "#spin" ).val( 12 ).spinner({
+	var element = $( "#spin" ).val( 12 ).spinner( {
 		page: 20,
 		max: 100
-	});
+	} );
 
 	element.spinner( "pageUp" );
 	equal( element.val(), 32, "pageUp 1 page" );
@@ -146,14 +146,14 @@ test( "pageUp", function() {
 
 	element.spinner( "pageUp", 10 );
 	equal( element.val(), 100, "value at max and pageUp 10 pages" );
-});
+} );
 
 test( "stepDown", function() {
 	expect( 4 );
-	var element = $( "#spin" ).val( 0 ).spinner({
+	var element = $( "#spin" ).val( 0 ).spinner( {
 		step: 2,
 		min: -15
-	});
+	} );
 
 	element.spinner( "stepDown" );
 	equal( element.val(), "-1", "stepDown 1 step" );
@@ -166,14 +166,14 @@ test( "stepDown", function() {
 
 	element.spinner( "stepDown" );
 	equal( element.val(), "-15", "at min and stepDown 1 step" );
-});
+} );
 
 test( "stepUp", function() {
 	expect( 4 );
-	var element = $( "#spin" ).val( 0 ).spinner({
+	var element = $( "#spin" ).val( 0 ).spinner( {
 		step: 2,
 		max: 16
-	});
+	} );
 
 	element.spinner( "stepUp" );
 	equal( element.val(), 2, "stepUp 1 step" );
@@ -186,19 +186,19 @@ test( "stepUp", function() {
 
 	element.spinner( "stepUp" );
 	equal( element.val(), 16, "at max and stepUp 1 step" );
-});
+} );
 
 test( "value", function() {
 	expect( 2 );
-	var element = $( "#spin" ).val( 0 ).spinner({
+	var element = $( "#spin" ).val( 0 ).spinner( {
 		step: 3
-	});
+	} );
 
 	element.spinner( "value", 10 );
 	equal( element.val(), 9, "change value via value method" );
 
 	equal( element.spinner( "value" ), 9, "get value via value method" );
-});
+} );
 
 test( "widget", function() {
 	expect( 2 );
@@ -206,6 +206,6 @@ test( "widget", function() {
 		widgetElement = element.spinner( "widget" );
 	equal( widgetElement.length, 1, "one element" );
 	strictEqual( widgetElement[ 0 ], element.parent()[ 0 ], "parent element" );
-});
+} );
 
 } );
diff --git a/tests/unit/spinner/options.js b/tests/unit/spinner/options.js
index c3a9f74a288..8ad5caeaaa1 100644
--- a/tests/unit/spinner/options.js
+++ b/tests/unit/spinner/options.js
@@ -20,43 +20,43 @@ test( "icons: default ", function( assert ) {
 	element.spinner( "option", "icons", {
 		up: "ui-icon-caret-1-n",
 		down: "ui-icon-caret-1-s"
-	});
+	} );
 	assert.hasClasses( element.spinner( "widget" ).find( ".ui-icon:first" ),
 		"ui-icon ui-icon-caret-1-n" );
 	assert.hasClasses( element.spinner( "widget" ).find( ".ui-icon:last" ),
 		"ui-icon ui-icon-caret-1-s" );
-});
+} );
 
 test( "icons: custom ", function( assert ) {
 	expect( 2 );
-	var element = $( "#spin" ).val( 0 ).spinner({
+	var element = $( "#spin" ).val( 0 ).spinner( {
 		icons: {
 			down: "custom-down",
 			up: "custom-up"
 		}
-	}).spinner( "widget" );
+	} ).spinner( "widget" );
 	assert.hasClasses( element.find( ".ui-icon:first" ), "ui-icon custom-up" );
 	assert.hasClasses( element.find( ".ui-icon:last" ), "ui-icon custom-down" );
-});
+} );
 
 test( "incremental, false", function() {
 	expect( 100 );
 
 	var i,
 		prev = 0,
-		element = $( "#spin" ).val( prev ).spinner({
+		element = $( "#spin" ).val( prev ).spinner( {
 			incremental: false,
 			spin: function( event, ui ) {
 				equal( ui.value - prev, 1 );
 				prev = ui.value;
 			}
-		});
+		} );
 
 	for ( i = 0; i < 100; i++ ) {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 	}
 	element.simulate( "keyup", { keyCode: $.ui.keyCode.UP } );
-});
+} );
 
 test( "incremental, true", function() {
 	expect( 100 );
@@ -64,7 +64,7 @@ test( "incremental, true", function() {
 	function fill( num, val ) {
 		return $.map( new Array( num ), function() {
 			return val;
-		});
+		} );
 	}
 
 	var i,
@@ -72,26 +72,26 @@ test( "incremental, true", function() {
 		expected = [].concat( fill( 18, 1 ), fill( 37, 2 ), fill( 14, 3 ),
 			fill( 9, 4 ), fill( 6, 5 ), fill( 5, 6 ), fill ( 5, 7 ),
 			fill( 4, 8 ), fill( 2, 9 ) ),
-		element = $( "#spin" ).val( prev ).spinner({
+		element = $( "#spin" ).val( prev ).spinner( {
 			incremental: true,
 			spin: function( event, ui ) {
 				equal( ui.value - prev, expected[ i ] );
 				prev = ui.value;
 			}
-		});
+		} );
 
 	for ( i = 0; i < 100; i++ ) {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 	}
 	element.simulate( "keyup", { keyCode: $.ui.keyCode.UP } );
-});
+} );
 
 test( "incremental, function", function() {
 	expect( 100 );
 
 	var i,
 		prev = 0,
-		element = $( "#spin" ).val( prev ).spinner({
+		element = $( "#spin" ).val( prev ).spinner( {
 			incremental: function( i ) {
 				return i;
 			},
@@ -99,83 +99,83 @@ test( "incremental, function", function() {
 				equal( ui.value - prev, i + 1 );
 				prev = ui.value;
 			}
-		});
+		} );
 
 	for ( i = 0; i < 100; i++ ) {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 	}
 	element.simulate( "keyup", { keyCode: $.ui.keyCode.UP } );
-});
+} );
 
 test( "numberFormat, number", function() {
 	expect( 2 );
-	var element = $( "#spin" ).val( 0 ).spinner({ numberFormat: "n" });
+	var element = $( "#spin" ).val( 0 ).spinner( { numberFormat: "n" } );
 	equal( element.val(), "0.00", "formatted on init" );
 	element.spinner( "stepUp" );
 	equal( element.val(), "1.00", "formatted after step" );
-});
+} );
 
 test( "numberFormat, number, simple", function() {
 	expect( 2 );
-	var element = $( "#spin" ).val( 0 ).spinner({ numberFormat: "n0" });
+	var element = $( "#spin" ).val( 0 ).spinner( { numberFormat: "n0" } );
 	equal( element.val(), "0", "formatted on init" );
 	element.spinner( "stepUp" );
 	equal( element.val(), "1", "formatted after step" );
-});
+} );
 
 test( "numberFormat, currency", function() {
 	expect( 2 );
-	var element = $( "#spin" ).val( 0 ).spinner({ numberFormat: "C" });
+	var element = $( "#spin" ).val( 0 ).spinner( { numberFormat: "C" } );
 	equal( element.val(), "$0.00", "formatted on init" );
 	element.spinner( "stepUp" );
 	equal( element.val(), "$1.00", "formatted after step" );
-});
+} );
 
 test( "numberFormat, change", function() {
 	expect( 2 );
-	var element = $( "#spin" ).val( 5 ).spinner({ numberFormat: "n1" });
+	var element = $( "#spin" ).val( 5 ).spinner( { numberFormat: "n1" } );
 	equal( element.val(), "5.0", "formatted on init" );
 	element.spinner( "option", "numberFormat", "c" );
 	equal( element.val(), "$5.00", "formatted after change" );
-});
+} );
 
 test( "culture, null", function() {
 	expect( 2 );
 	Globalize.culture( "ja-JP" );
-	var element = $( "#spin" ).val( 0 ).spinner({ numberFormat: "C" });
+	var element = $( "#spin" ).val( 0 ).spinner( { numberFormat: "C" } );
 	equal( element.val(), "¥0", "formatted on init" );
 	element.spinner( "stepUp" );
 	equal( element.val(), "¥1", "formatted after step" );
 
 	// Reset culture
 	Globalize.culture( "default" );
-});
+} );
 
 test( "currency, ja-JP", function() {
 	expect( 2 );
-	var element = $( "#spin" ).val( 0 ).spinner({
+	var element = $( "#spin" ).val( 0 ).spinner( {
 		numberFormat: "C",
 		culture: "ja-JP"
-	});
+	} );
 	equal( element.val(), "¥0", "formatted on init" );
 	element.spinner( "stepUp" );
 	equal( element.val(), "¥1", "formatted after step" );
-});
+} );
 
 test( "currency, change", function() {
 	expect( 2 );
-	var element = $( "#spin" ).val( 5 ).spinner({
+	var element = $( "#spin" ).val( 5 ).spinner( {
 		numberFormat: "C",
 		culture: "ja-JP"
-	});
+	} );
 	equal( element.val(), "¥5", "formatted on init" );
 	element.spinner( "option", "culture", "en" );
 	equal( element.val(), "$5.00", "formatted after change" );
-});
+} );
 
 test( "max", function() {
 	expect( 3 );
-	var element = $( "#spin" ).val( 1000 ).spinner({ max: 100 });
+	var element = $( "#spin" ).val( 1000 ).spinner( { max: 100 } );
 	equal( element.val(), 1000, "value not constrained on init" );
 
 	element.spinner( "value", 1000 );
@@ -183,27 +183,27 @@ test( "max", function() {
 
 	element.val( 1000 ).trigger( "blur" );
 	equal( element.val(), 1000, "max not constrained if manual entry" );
-});
+} );
 
 test( "max, string", function() {
 	expect( 3 );
 	var element = $( "#spin" )
 		.val( 1000 )
-		.spinner({
+		.spinner( {
 			max: "$100.00",
 			numberFormat: "C",
 			culture: "en"
-		});
+		} );
 	equal( element.val(), "$1,000.00", "value not constrained on init" );
 	equal( element.spinner( "option", "max" ), 100, "option converted to number" );
 
 	element.spinner( "value", 1000 );
 	equal( element.val(), "$100.00", "max constrained in value method" );
-});
+} );
 
 test( "min", function() {
 	expect( 3 );
-	var element = $( "#spin" ).val( -1000 ).spinner({ min: -100 });
+	var element = $( "#spin" ).val( -1000 ).spinner( { min: -100 } );
 	equal( element.val(), -1000, "value not constrained on init" );
 
 	element.spinner( "value", -1000 );
@@ -211,27 +211,27 @@ test( "min", function() {
 
 	element.val( -1000 ).trigger( "blur" );
 	equal( element.val(), -1000, "min not constrained if manual entry" );
-});
+} );
 
 test( "min, string", function() {
 	expect( 3 );
 	var element = $( "#spin" )
 		.val( -1000 )
-		.spinner({
+		.spinner( {
 			min: "-$100.00",
 			numberFormat: "C",
 			culture: "en"
-		});
+		} );
 	equal( element.val(), "($1,000.00)", "value not constrained on init" );
 	equal( element.spinner( "option", "min" ), -100, "option converted to number" );
 
 	element.spinner( "value", -1000 );
 	equal( element.val(), "($100.00)", "min constrained in value method" );
-});
+} );
 
 test( "step, 2", function() {
 	expect( 3 );
-	var element = $( "#spin" ).val( 0 ).spinner({ step: 2 });
+	var element = $( "#spin" ).val( 0 ).spinner( { step: 2 } );
 
 	element.spinner( "stepUp" );
 	equal( element.val(), "2", "stepUp" );
@@ -242,30 +242,30 @@ test( "step, 2", function() {
 	element.val( "4.5" );
 	element.spinner( "stepUp" );
 	equal( element.val(), "6", "stepUp" );
-});
+} );
 
 test( "step, 0.7", function() {
 	expect( 1 );
-	var element = $("#spin").val( 0 ).spinner({
+	var element = $( "#spin" ).val( 0 ).spinner( {
 		step: 0.7
-	});
+	} );
 
 	element.spinner( "stepUp" );
 	equal( element.val(), "0.7", "stepUp" );
-});
+} );
 
 test( "step, string", function() {
 	expect( 2 );
-	var element = $("#spin").val( 0 ).spinner({
+	var element = $( "#spin" ).val( 0 ).spinner( {
 		step: "$0.70",
 		numberFormat: "C",
 		culture: "en"
-	});
+	} );
 
 	equal( element.spinner( "option", "step" ), 0.7, "option converted to number" );
 
 	element.spinner( "stepUp" );
 	equal( element.val(), "$0.70", "stepUp" );
-});
+} );
 
 } );
diff --git a/ui/widgets/spinner.js b/ui/widgets/spinner.js
index 712d99bad8c..a64d46c76bf 100644
--- a/ui/widgets/spinner.js
+++ b/ui/widgets/spinner.js
@@ -75,6 +75,7 @@ $.widget( "ui.spinner", {
 	},
 
 	_create: function() {
+
 		// handle string values that need to be parsed
 		this._setOption( "max", this.options.max );
 		this._setOption( "min", this.options.min );
@@ -83,6 +84,7 @@ $.widget( "ui.spinner", {
 		// Only format if there is a value, prevents the field from being marked
 		// as invalid in Firefox, see #9573.
 		if ( this.value() !== "" ) {
+
 			// Format the value, but don't constrain.
 			this._value( this.element.val(), true );
 		}
@@ -169,6 +171,7 @@ $.widget( "ui.spinner", {
 				if ( !isActive ) {
 					this.element.trigger( "focus" );
 					this.previous = previous;
+
 					// support: IE
 					// IE sets focus asynchronously, so we need to check if focus
 					// moved off of the input because the user clicked on the button.
@@ -200,6 +203,7 @@ $.widget( "ui.spinner", {
 		},
 		"mouseup .ui-spinner-button": "_stop",
 		"mouseenter .ui-spinner-button": function( event ) {
+
 			// button will add ui-state-active if mouse was down while mouseleave and kept down
 			if ( !$( event.currentTarget ).hasClass( "ui-state-active" ) ) {
 				return;
@@ -210,6 +214,7 @@ $.widget( "ui.spinner", {
 			}
 			this._repeat( null, $( event.currentTarget ).hasClass( "ui-spinner-up" ) ? 1 : -1, event );
 		},
+
 		// TODO: do we really want to consider this a stop?
 		// shouldn't we just stop the repeater and wait until mouseup before
 		// we trigger the stop event?
@@ -364,8 +369,10 @@ $.widget( "ui.spinner", {
 		// - find out where we are relative to the base (min or 0)
 		base = options.min !== null ? options.min : 0;
 		aboveMin = value - base;
+
 		// - round to the nearest step
 		aboveMin = Math.round( aboveMin / options.step ) * options.step;
+
 		// - rounding is based on 0, so adjust back to our base
 		value = base + aboveMin;
 
@@ -453,6 +460,7 @@ $.widget( "ui.spinner", {
 		this.element.attr( {
 			"aria-valuemin": this.options.min,
 			"aria-valuemax": this.options.max,
+
 			// TODO: what should we do with values that can't be parsed?
 			"aria-valuenow": this._parse( this.element.val() )
 		} );

From a718275e0d49573e4a400ecbda98e384a9a307c5 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 08:57:53 -0400
Subject: [PATCH 05/27] Sortable: Style updates

Ref #14246
---
 tests/unit/sortable/common.js  |   2 +-
 tests/unit/sortable/core.js    |   8 +-
 tests/unit/sortable/events.js  | 279 ++++++-------
 tests/unit/sortable/helper.js  |   2 +-
 tests/unit/sortable/methods.js | 108 ++---
 tests/unit/sortable/options.js | 110 ++---
 ui/widgets/sortable.js         | 733 ++++++++++++++++-----------------
 7 files changed, 621 insertions(+), 621 deletions(-)

diff --git a/tests/unit/sortable/common.js b/tests/unit/sortable/common.js
index a28c2511aa3..dd22c04331f 100644
--- a/tests/unit/sortable/common.js
+++ b/tests/unit/sortable/common.js
@@ -48,6 +48,6 @@ common.testWidget( "sortable", {
 		stop: null,
 		update: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/sortable/core.js b/tests/unit/sortable/core.js
index 68f2756040b..d12416f0903 100644
--- a/tests/unit/sortable/core.js
+++ b/tests/unit/sortable/core.js
@@ -9,12 +9,12 @@ module( "sortable: core" );
 test( "#9314: Sortable: Items cannot be dragged directly into bottom position", function() {
 	expect( 1 );
 
-	var el = $( ".connectWith" ).sortable({
+	var el = $( ".connectWith" ).sortable( {
 			connectWith: ".connectWith"
-		});
+		} );
 
 	testHelper.sort( $( "li", el[ 1 ] )[ 0 ], 0, -12, 5, "Dragging the sortable into connected sortable" );
-});
+} );
 
 test( "ui-sortable-handle applied to appropriate element", function( assert ) {
 	expect( 8 );
@@ -37,6 +37,6 @@ test( "ui-sortable-handle applied to appropriate element", function( assert ) {
 
 	el.sortable( "destroy" );
 	equal( el.find( ".ui-sortable-handle" ).length, 0, "class name removed on destroy" );
-});
+} );
 
 } );
diff --git a/tests/unit/sortable/events.js b/tests/unit/sortable/events.js
index 74f10dfebca..d2416fbc4ca 100644
--- a/tests/unit/sortable/events.js
+++ b/tests/unit/sortable/events.js
@@ -5,223 +5,223 @@ define( [
 	"ui/widgets/draggable"
 ], function( $, testHelper ) {
 
-module("sortable: events");
+module( "sortable: events" );
 
-test("start", function() {
+test( "start", function() {
 	expect( 7 );
 
 	var hash;
-	$("#sortable").sortable({
+	$( "#sortable" ).sortable( {
 		start: function( e, ui ) {
 			hash = ui;
 		}
-	}).find("li:eq(0)").simulate( "drag", {
+	} ).find( "li:eq(0)" ).simulate( "drag", {
 		dy: 10
-	});
+	} );
 
-	ok(hash, "start event triggered");
-	ok(hash.helper, "UI hash includes: helper");
-	ok(hash.placeholder, "UI hash includes: placeholder");
-	ok(hash.item, "UI hash includes: item");
-	ok(!hash.sender, "UI hash does not include: sender");
+	ok( hash, "start event triggered" );
+	ok( hash.helper, "UI hash includes: helper" );
+	ok( hash.placeholder, "UI hash includes: placeholder" );
+	ok( hash.item, "UI hash includes: item" );
+	ok( !hash.sender, "UI hash does not include: sender" );
 
 	// Todo: see if these events should actually have sane values in them
-	ok("position" in hash, "UI hash includes: position");
-	ok("offset" in hash, "UI hash includes: offset");
-});
+	ok( "position" in hash, "UI hash includes: position" );
+	ok( "offset" in hash, "UI hash includes: offset" );
+} );
 
-test("sort", function() {
+test( "sort", function() {
 	expect( 7 );
 
 	var hash;
-	$("#sortable").sortable({
+	$( "#sortable" ).sortable( {
 		sort: function( e, ui ) {
 			hash = ui;
 		}
-	}).find("li:eq(0)").simulate( "drag", {
+	} ).find( "li:eq(0)" ).simulate( "drag", {
 		dy: 10
-	});
+	} );
 
-	ok(hash, "sort event triggered");
-	ok(hash.helper, "UI hash includes: helper");
-	ok(hash.placeholder, "UI hash includes: placeholder");
-	ok(hash.position && ("top" in hash.position && "left" in hash.position), "UI hash includes: position");
-	ok(hash.offset && (hash.offset.top && hash.offset.left), "UI hash includes: offset");
-	ok(hash.item, "UI hash includes: item");
-	ok(!hash.sender, "UI hash does not include: sender");
+	ok( hash, "sort event triggered" );
+	ok( hash.helper, "UI hash includes: helper" );
+	ok( hash.placeholder, "UI hash includes: placeholder" );
+	ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
+	ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
+	ok( hash.item, "UI hash includes: item" );
+	ok( !hash.sender, "UI hash does not include: sender" );
 
-});
+} );
 
-test("change", function() {
+test( "change", function() {
 	expect( 8 );
 
 	var hash;
-	$("#sortable").sortable({
+	$( "#sortable" ).sortable( {
 		change: function( e, ui ) {
 			hash = ui;
 		}
-	}).find("li:eq(0)").simulate( "drag", {
+	} ).find( "li:eq(0)" ).simulate( "drag", {
 		dx: 1,
 		dy: 1
-	});
+	} );
 
-	ok(!hash, "1px drag, change event should not be triggered");
+	ok( !hash, "1px drag, change event should not be triggered" );
 
-	$("#sortable").sortable({
+	$( "#sortable" ).sortable( {
 		change: function( e, ui ) {
 			hash = ui;
 		}
-	}).find("li:eq(0)").simulate( "drag", {
+	} ).find( "li:eq(0)" ).simulate( "drag", {
 		dy: 22
-	});
+	} );
 
-	ok(hash, "change event triggered");
-	ok(hash.helper, "UI hash includes: helper");
-	ok(hash.placeholder, "UI hash includes: placeholder");
-	ok(hash.position && ("top" in hash.position && "left" in hash.position), "UI hash includes: position");
-	ok(hash.offset && (hash.offset.top && hash.offset.left), "UI hash includes: offset");
-	ok(hash.item, "UI hash includes: item");
-	ok(!hash.sender, "UI hash does not include: sender");
+	ok( hash, "change event triggered" );
+	ok( hash.helper, "UI hash includes: helper" );
+	ok( hash.placeholder, "UI hash includes: placeholder" );
+	ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
+	ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
+	ok( hash.item, "UI hash includes: item" );
+	ok( !hash.sender, "UI hash does not include: sender" );
 
-});
+} );
 
-test("beforeStop", function() {
+test( "beforeStop", function() {
 	expect( 7 );
 
 	var hash;
-	$("#sortable").sortable({
+	$( "#sortable" ).sortable( {
 		beforeStop: function( e, ui ) {
 			hash = ui;
 		}
-	}).find("li:eq(0)").simulate( "drag", {
+	} ).find( "li:eq(0)" ).simulate( "drag", {
 		dy: 20
-	});
+	} );
 
-	ok(hash, "beforeStop event triggered");
-	ok(hash.helper, "UI hash includes: helper");
-	ok(hash.placeholder, "UI hash includes: placeholder");
-	ok(hash.position && ("top" in hash.position && "left" in hash.position), "UI hash includes: position");
-	ok(hash.offset && (hash.offset.top && hash.offset.left), "UI hash includes: offset");
-	ok(hash.item, "UI hash includes: item");
-	ok(!hash.sender, "UI hash does not include: sender");
+	ok( hash, "beforeStop event triggered" );
+	ok( hash.helper, "UI hash includes: helper" );
+	ok( hash.placeholder, "UI hash includes: placeholder" );
+	ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
+	ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
+	ok( hash.item, "UI hash includes: item" );
+	ok( !hash.sender, "UI hash does not include: sender" );
 
-});
+} );
 
-test("stop", function() {
+test( "stop", function() {
 	expect( 7 );
 
 	var hash;
-	$("#sortable").sortable({
+	$( "#sortable" ).sortable( {
 		stop: function( e, ui ) {
 			hash = ui;
 		}
-	}).find("li:eq(0)").simulate( "drag", {
+	} ).find( "li:eq(0)" ).simulate( "drag", {
 		dy: 20
-	});
+	} );
 
-	ok(hash, "stop event triggered");
-	ok(!hash.helper, "UI should not include: helper");
-	ok(hash.placeholder, "UI hash includes: placeholder");
-	ok(hash.position && ("top" in hash.position && "left" in hash.position), "UI hash includes: position");
-	ok(hash.offset && (hash.offset.top && hash.offset.left), "UI hash includes: offset");
-	ok(hash.item, "UI hash includes: item");
-	ok(!hash.sender, "UI hash does not include: sender");
+	ok( hash, "stop event triggered" );
+	ok( !hash.helper, "UI should not include: helper" );
+	ok( hash.placeholder, "UI hash includes: placeholder" );
+	ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
+	ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
+	ok( hash.item, "UI hash includes: item" );
+	ok( !hash.sender, "UI hash does not include: sender" );
 
-});
+} );
 
-test("update", function() {
+test( "update", function() {
 	expect( 8 );
 
 	var hash;
-	$("#sortable").sortable({
+	$( "#sortable" ).sortable( {
 		update: function( e, ui ) {
 			hash = ui;
 		}
-	}).find("li:eq(0)").simulate( "drag", {
+	} ).find( "li:eq(0)" ).simulate( "drag", {
 		dx: 1,
 		dy: 1
-	});
+	} );
 
-	ok(!hash, "1px drag, update event should not be triggered");
+	ok( !hash, "1px drag, update event should not be triggered" );
 
-	$("#sortable").sortable({
+	$( "#sortable" ).sortable( {
 		update: function( e, ui ) {
 			hash = ui;
 		}
-	}).find("li:eq(0)").simulate( "drag", {
+	} ).find( "li:eq(0)" ).simulate( "drag", {
 		dy: 22
-	});
+	} );
 
-	ok(hash, "update event triggered");
-	ok(!hash.helper, "UI hash should not include: helper");
-	ok(hash.placeholder, "UI hash includes: placeholder");
-	ok(hash.position && ("top" in hash.position && "left" in hash.position), "UI hash includes: position");
-	ok(hash.offset && (hash.offset.top && hash.offset.left), "UI hash includes: offset");
-	ok(hash.item, "UI hash includes: item");
-	ok(!hash.sender, "UI hash does not include: sender");
+	ok( hash, "update event triggered" );
+	ok( !hash.helper, "UI hash should not include: helper" );
+	ok( hash.placeholder, "UI hash includes: placeholder" );
+	ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
+	ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
+	ok( hash.item, "UI hash includes: item" );
+	ok( !hash.sender, "UI hash does not include: sender" );
 
-});
+} );
 
-test("#3019: Stop fires too early", function() {
-	expect(2);
+test( "#3019: Stop fires too early", function() {
+	expect( 2 );
 
 	var helper = null,
-		el = $("#sortable").sortable({
-			stop: function(event, ui) {
+		el = $( "#sortable" ).sortable( {
+			stop: function( event, ui ) {
 				helper = ui.helper;
 			}
-		});
+		} );
 
-	testHelper.sort($("li", el)[0], 0, 44, 2, "Dragging the sortable");
-	equal(helper, null, "helper should be false");
+	testHelper.sort( $( "li", el )[ 0 ], 0, 44, 2, "Dragging the sortable" );
+	equal( helper, null, "helper should be false" );
 
-});
+} );
 
-test("#4752: link event firing on sortable with connect list", function () {
+test( "#4752: link event firing on sortable with connect list", function() {
 	expect( 10 );
 
 	var fired = {},
-		hasFired = function (type) { return (type in fired) && (true === fired[type]); };
+		hasFired = function( type ) { return ( type in fired ) && ( true === fired[ type ] ); };
 
-	$("#sortable").clone().attr("id", "sortable2").insertAfter("#sortable");
+	$( "#sortable" ).clone().attr( "id", "sortable2" ).insertAfter( "#sortable" );
 
-	$("#qunit-fixture ul").sortable({
+	$( "#qunit-fixture ul" ).sortable( {
 		connectWith: "#qunit-fixture ul",
-		change: function () {
+		change: function() {
 			fired.change = true;
 		},
-		receive: function () {
+		receive: function() {
 			fired.receive = true;
 		},
-		remove: function () {
+		remove: function() {
 			fired.remove = true;
 		}
-	});
+	} );
 
-	$("#qunit-fixture ul").on("click.ui-sortable-test", function () {
+	$( "#qunit-fixture ul" ).on( "click.ui-sortable-test", function() {
 		fired.click = true;
-	});
+	} );
 
-	$("#sortable li:eq(0)").simulate("click");
-	ok(!hasFired("change"), "Click only, change event should not have fired");
-	ok(hasFired("click"), "Click event should have fired");
+	$( "#sortable li:eq(0)" ).simulate( "click" );
+	ok( !hasFired( "change" ), "Click only, change event should not have fired" );
+	ok( hasFired( "click" ), "Click event should have fired" );
 
 	// Drag an item within the first list
 	fired = {};
-	$("#sortable li:eq(0)").simulate("drag", { dx: 0, dy: 40 });
-	ok(hasFired("change"), "40px drag, change event should have fired");
-	ok(!hasFired("receive"), "Receive event should not have fired");
-	ok(!hasFired("remove"), "Remove event should not have fired");
-	ok(!hasFired("click"), "Click event should not have fired");
+	$( "#sortable li:eq(0)" ).simulate( "drag", { dx: 0, dy: 40 } );
+	ok( hasFired( "change" ), "40px drag, change event should have fired" );
+	ok( !hasFired( "receive" ), "Receive event should not have fired" );
+	ok( !hasFired( "remove" ), "Remove event should not have fired" );
+	ok( !hasFired( "click" ), "Click event should not have fired" );
 
 	// Drag an item from the first list to the second, connected list
 	fired = {};
-	$("#sortable li:eq(0)").simulate("drag", { dx: 0, dy: 150 });
-	ok(hasFired("change"), "150px drag, change event should have fired");
-	ok(hasFired("receive"), "Receive event should have fired");
-	ok(hasFired("remove"), "Remove event should have fired");
-	ok(!hasFired("click"), "Click event should not have fired");
-});
+	$( "#sortable li:eq(0)" ).simulate( "drag", { dx: 0, dy: 150 } );
+	ok( hasFired( "change" ), "150px drag, change event should have fired" );
+	ok( hasFired( "receive" ), "Receive event should have fired" );
+	ok( hasFired( "remove" ), "Remove event should have fired" );
+	ok( !hasFired( "click" ), "Click event should not have fired" );
+} );
 
 /*
 test("receive", function() {
@@ -239,14 +239,14 @@ test( "over", function() {
 	var hash,
 		overCount = 0;
 
-	$( "#sortable" ).sortable({
+	$( "#sortable" ).sortable( {
 		over: function( e, ui ) {
 			hash = ui;
 			overCount++;
 		}
-	}).find( "li:eq(0)" ).simulate( "drag", {
+	} ).find( "li:eq(0)" ).simulate( "drag", {
 		dy: 20
-	});
+	} );
 
 	ok( hash, "over event triggered" );
 	ok( hash.helper, "UI includes: helper" );
@@ -256,7 +256,7 @@ test( "over", function() {
 	ok( hash.item, "UI hash includes: item" );
 	ok( hash.sender, "UI hash includes: sender" );
 	equal( overCount, 1, "over fires only once" );
-});
+} );
 
 // http://bugs.jqueryui.com/ticket/9335
 // Sortable: over & out events does not consistently fire
@@ -267,25 +267,25 @@ test( "over, fires with draggable connected to sortable", function() {
 		overCount = 0,
 		item = $( "<div></div>" ).text( "6" ).insertAfter( "#sortable" );
 
-	item.draggable({
+	item.draggable( {
 		connectToSortable: "#sortable"
-	});
-	$( ".connectWith" ).sortable({
+	} );
+	$( ".connectWith" ).sortable( {
 		connectWith: ".connectWith",
 		over: function( event, ui ) {
 			hash = ui;
 			overCount++;
 		}
-	});
+	} );
 
 	item.simulate( "drag", {
 		dy: -20
-	});
+	} );
 
 	ok( hash, "over event triggered" );
 	ok( !hash.sender, "UI should not include: sender" );
 	equal( overCount, 1, "over fires only once" );
-});
+} );
 
 test( "over, with connected sortable", function() {
 	expect( 3 );
@@ -293,21 +293,21 @@ test( "over, with connected sortable", function() {
 	var hash,
 		overCount = 0;
 
-	$( ".connectWith" ).sortable({
+	$( ".connectWith" ).sortable( {
 		connectWith: ".connectWith"
-	});
+	} );
 	$( "#sortable2" ).on( "sortover", function( event, ui ) {
 		hash = ui;
 		overCount++;
-	});
+	} );
 	$( "#sortable" ).find( "li:eq(0)" ).simulate( "drag", {
 		dy: 102
-	});
+	} );
 
 	ok( hash, "over event triggered" );
-	equal( hash.sender[ 0 ], $(" #sortable" )[ 0 ], "UI includes: sender" );
+	equal( hash.sender[ 0 ], $( " #sortable" )[ 0 ], "UI includes: sender" );
 	equal( overCount, 1, "over fires only once" );
-});
+} );
 
 /*
 test("out", function() {
@@ -321,20 +321,20 @@ test( "out, with connected sortable", function() {
 	var hash,
 		outCount = 0;
 
-	$( ".connectWith" ).sortable({
+	$( ".connectWith" ).sortable( {
 		connectWith: ".connectWith"
-	});
+	} );
 	$( "#sortable" ).on( "sortout", function( event, ui ) {
 		hash = ui;
 		outCount++;
-	});
+	} );
 	$( "#sortable" ).find( "li:last" ).simulate( "drag", {
 		dy: 40
-	});
+	} );
 
 	ok( hash, "out event triggered" );
 	equal( outCount, 1, "out fires only once" );
-});
+} );
 
 test( "repeated out & over between connected sortables", function() {
 	expect( 2 );
@@ -342,28 +342,29 @@ test( "repeated out & over between connected sortables", function() {
 	var outCount = 0,
 		overCount = 0;
 
-	$( ".connectWith" ).sortable({
+	$( ".connectWith" ).sortable( {
 		connectWith: ".connectWith",
 		over: function() {
 			overCount++;
 		},
 		out: function( event, ui ) {
+
 			// Ignore events that trigger when an item has dropped
 			// checking for the presence of the helper.
 			if ( !ui.helper ) {
 				outCount++;
 			}
 		}
-	});
+	} );
 	$( "#sortable" ).find( "li:last" ).simulate( "drag", {
 		dy: 40
-	}).simulate( "drag", {
+	} ).simulate( "drag", {
 		dy: -40
-	});
+	} );
 
 	equal( outCount, 2, "out fires twice" );
 	equal( overCount, 4, "over fires four times" );
-});
+} );
 
 /*
 test("activate", function() {
diff --git a/tests/unit/sortable/helper.js b/tests/unit/sortable/helper.js
index 76545022ee2..c1c0b6e74f8 100644
--- a/tests/unit/sortable/helper.js
+++ b/tests/unit/sortable/helper.js
@@ -8,7 +8,7 @@ return $.extend( helper, {
 		$( handle ).simulate( "drag", {
 			dx: dx,
 			dy: dy
-		});
+		} );
 		equal( $( handle ).parent().children().index( handle ), index, msg );
 	}
 } );
diff --git a/tests/unit/sortable/methods.js b/tests/unit/sortable/methods.js
index f58ac052d0d..1d2fda8ff35 100644
--- a/tests/unit/sortable/methods.js
+++ b/tests/unit/sortable/methods.js
@@ -4,72 +4,72 @@ define( [
 	"ui/widgets/sortable"
 ], function( $, testHelper ) {
 
-module("sortable: methods");
+module( "sortable: methods" );
 
-test("init", function() {
-	expect(5);
+test( "init", function() {
+	expect( 5 );
 
-	$("<div></div>").appendTo("body").sortable().remove();
-	ok(true, ".sortable() called on element");
+	$( "<div></div>" ).appendTo( "body" ).sortable().remove();
+	ok( true, ".sortable() called on element" );
 
-	$([]).sortable();
-	ok(true, ".sortable() called on empty collection");
+	$( [] ).sortable();
+	ok( true, ".sortable() called on empty collection" );
 
-	$("<div></div>").sortable();
-	ok(true, ".sortable() called on disconnected DOMElement");
+	$( "<div></div>" ).sortable();
+	ok( true, ".sortable() called on disconnected DOMElement" );
 
-	$("<div></div>").sortable().sortable("option", "foo");
-	ok(true, "arbitrary option getter after init");
+	$( "<div></div>" ).sortable().sortable( "option", "foo" );
+	ok( true, "arbitrary option getter after init" );
 
-	$("<div></div>").sortable().sortable("option", "foo", "bar");
-	ok(true, "arbitrary option setter after init");
-});
+	$( "<div></div>" ).sortable().sortable( "option", "foo", "bar" );
+	ok( true, "arbitrary option setter after init" );
+} );
 
-test("destroy", function() {
-	expect(4);
-	$("<div></div>").appendTo("body").sortable().sortable("destroy").remove();
-	ok(true, ".sortable('destroy') called on element");
+test( "destroy", function() {
+	expect( 4 );
+	$( "<div></div>" ).appendTo( "body" ).sortable().sortable( "destroy" ).remove();
+	ok( true, ".sortable('destroy') called on element" );
 
-	$([]).sortable().sortable("destroy");
-	ok(true, ".sortable('destroy') called on empty collection");
+	$( [] ).sortable().sortable( "destroy" );
+	ok( true, ".sortable('destroy') called on empty collection" );
 
-	$("<div></div>").sortable().sortable("destroy");
-	ok(true, ".sortable('destroy') called on disconnected DOMElement");
+	$( "<div></div>" ).sortable().sortable( "destroy" );
+	ok( true, ".sortable('destroy') called on disconnected DOMElement" );
 
-	var expected = $("<div></div>").sortable(),
-		actual = expected.sortable("destroy");
-	equal(actual, expected, "destroy is chainable");
-});
+	var expected = $( "<div></div>" ).sortable(),
+		actual = expected.sortable( "destroy" );
+	equal( actual, expected, "destroy is chainable" );
+} );
 
-test("enable", function() {
-	expect(5);
+test( "enable", function() {
+	expect( 5 );
 
 	var el, actual, expected;
 
-	el = $("#sortable").sortable({ disabled: true });
+	el = $( "#sortable" ).sortable( { disabled: true } );
 
-	testHelper.sort($("li", el)[0], 0, 44, 0, ".sortable({ disabled: true })");
+	testHelper.sort( $( "li", el )[ 0 ], 0, 44, 0, ".sortable({ disabled: true })" );
 
-	el.sortable("enable");
-	equal(el.sortable("option", "disabled"), false, "disabled option getter");
+	el.sortable( "enable" );
+	equal( el.sortable( "option", "disabled" ), false, "disabled option getter" );
 
-	el.sortable("destroy");
-	el.sortable({ disabled: true });
-	el.sortable("option", "disabled", false);
-	equal(el.sortable("option", "disabled"), false, "disabled option setter");
+	el.sortable( "destroy" );
+	el.sortable( { disabled: true } );
+	el.sortable( "option", "disabled", false );
+	equal( el.sortable( "option", "disabled" ), false, "disabled option setter" );
 
-	testHelper.sort($("li", el)[0], 0, 44, 2, ".sortable('option', 'disabled', false)");
+	testHelper.sort( $( "li", el )[ 0 ], 0, 44, 2, ".sortable('option', 'disabled', false)" );
 
-	expected = $("<div></div>").sortable(),
-	actual = expected.sortable("enable");
-	equal(actual, expected, "enable is chainable");
-});
+	expected = $( "<div></div>" ).sortable(),
+	actual = expected.sortable( "enable" );
+	equal( actual, expected, "enable is chainable" );
+} );
 
 test( "disable", function( assert ) {
 	expect( 9 );
 
 	var chainable,
-		element = $( "#sortable" ).sortable({ disabled: false });
+		element = $( "#sortable" ).sortable( { disabled: false } );
 
 	testHelper.sort( $( "li", element )[ 0 ], 0, 44, 2, ".sortable({ disabled: false })" );
 
@@ -78,18 +78,18 @@ test( "disable", function( assert ) {
 
 	element.sortable( "destroy" );
 
-	element.sortable({ disabled: false });
+	element.sortable( { disabled: false } );
 	testHelper.sort( $( "li", element )[ 0 ], 0, 44, 2, ".sortable({ disabled: false })" );
-	element.sortable( "option", "disabled", true);
+	element.sortable( "option", "disabled", true );
 	equal( element.sortable( "option", "disabled" ), true, "disabled option setter" );
 
 	assert.lacksClasses( element.sortable( "widget" ), "ui-state-disabled" );
 	ok( !element.sortable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
 	assert.hasClasses( element.sortable( "widget" ), "ui-sortable-disabled" );
 
-	testHelper.sort($( "li", element )[ 0 ], 0, 44, 0, ".sortable('option', 'disabled', true)" );
+	testHelper.sort( $( "li", element )[ 0 ], 0, 44, 0, ".sortable('option', 'disabled', true)" );
 	equal( chainable, element, "disable is chainable" );
-});
+} );
 
 test( "refresh() should update the positions of initially empty lists (see #7498)", function() {
 	expect( 1 );
@@ -98,22 +98,22 @@ test( "refresh() should update the positions of initially empty lists (see #7498
 		element = $( "#qunit-fixture" ).html( "<ul></ul>" ).find( "ul" );
 
 	element
-		.css({
+		.css( {
 			"float": "left",
 			width: "100px"
-		})
-		.sortable({
+		} )
+		.sortable( {
 			change: function() {
 				changeCount++;
 			}
-		})
+		} )
 		.append( "<li>a</li><li>a</li>" )
 		.find( "li" )
-			.css({
+			.css( {
 				"float": "left",
 				width: "50px",
 				height: "50px"
-			});
+			} );
 
 	element.sortable( "refresh" );
 
@@ -121,9 +121,9 @@ test( "refresh() should update the positions of initially empty lists (see #7498
 	element.find( "li" ).eq( 0 ).simulate( "drag", {
 		dx: 55,
 		moves: 15
-	});
+	} );
 
 	equal( changeCount, 1 );
-});
+} );
 
 } );
diff --git a/tests/unit/sortable/options.js b/tests/unit/sortable/options.js
index 5d24a3606f1..cdb932af3b4 100644
--- a/tests/unit/sortable/options.js
+++ b/tests/unit/sortable/options.js
@@ -3,7 +3,7 @@ define( [
 	"ui/widgets/sortable"
 ], function( $ ) {
 
-module("sortable: options");
+module( "sortable: options" );
 
 /*
 test("{ appendTo: 'parent' }, default", function() {
@@ -19,14 +19,14 @@ test( "{ axis: false }, default", function() {
 	expect( 2 );
 
 	var offsetAfter,
-		element = $( "#sortable" ).sortable({
+		element = $( "#sortable" ).sortable( {
 			axis: false,
 			change: function() {
 				offsetAfter = item.offset();
 				notEqual( offsetAfter.left, offsetBefore.left, "x axis not constrained when axis: false" );
 				notEqual( offsetAfter.top, offsetBefore.top, "y axis not constrained when axis: false" );
 			}
-		}),
+		} ),
 		item = element.find( "li" ).eq( 0 ),
 		offsetBefore = item.offset();
 
@@ -34,21 +34,21 @@ test( "{ axis: false }, default", function() {
 		dx: 50,
 		dy: 25,
 		moves: 1
-	});
-});
+	} );
+} );
 
 test( "{ axis: 'x' }", function() {
 	expect( 2 );
 
 	var offsetAfter,
-		element = $( "#sortable" ).sortable({
+		element = $( "#sortable" ).sortable( {
 			axis: "x",
 			change: function() {
 				offsetAfter = item.offset();
 				notEqual( offsetAfter.left, offsetBefore.left, "x axis not constrained when axis: x" );
 				equal( offsetAfter.top, offsetBefore.top, "y axis constrained when axis: x" );
 			}
-		}),
+		} ),
 		item = element.find( "li" ).eq( 0 ),
 		offsetBefore = item.offset();
 
@@ -56,21 +56,21 @@ test( "{ axis: 'x' }", function() {
 		dx: 50,
 		dy: 25,
 		moves: 1
-	});
-});
+	} );
+} );
 
 test( "{ axis: 'y' }", function() {
 	expect( 2 );
 
 	var offsetAfter,
-		element = $( "#sortable" ).sortable({
+		element = $( "#sortable" ).sortable( {
 			axis: "y",
 			change: function() {
 				offsetAfter = item.offset();
 				equal( offsetAfter.left, offsetBefore.left, "x axis constrained when axis: y" );
 				notEqual( offsetAfter.top, offsetBefore.top, "y axis not constrained when axis: y" );
 			}
-		}),
+		} ),
 		item = element.find( "li" ).eq( 0 ),
 		offsetBefore = item.offset();
 
@@ -78,33 +78,33 @@ test( "{ axis: 'y' }", function() {
 		dx: 50,
 		dy: 25,
 		moves: 1
-	});
-});
+	} );
+} );
 
 asyncTest( "#7415: Incorrect revert animation with axis: 'y'", function() {
   expect( 2 );
 	var expectedLeft,
-		element = $( "#sortable" ).sortable({
+		element = $( "#sortable" ).sortable( {
 			axis: "y",
 			revert: true,
 			stop: start,
 			sort: function() {
 				expectedLeft = item.css( "left" );
 			}
-		}),
+		} ),
 		item = element.find( "li" ).eq( 0 );
 
 	item.simulate( "drag", {
 		dy: 300,
 		dx: 50
-	});
+	} );
 
-	setTimeout(function() {
+	setTimeout( function() {
 		var top = parseFloat( item.css( "top" ) );
 		equal( item.css( "left" ), expectedLeft, "left not animated" );
 		ok( top > 0 && top < 300, "top is animated" );
 	}, 100 );
-});
+} );
 
 /*
 test("{ cancel: 'input,textarea,button,select,option' }, default", function() {
@@ -124,15 +124,15 @@ test( "#8792: issues with floated items in connected lists", function() {
 
 	$( "#qunit-fixture" )
 		.html( "<ul class='c'><li>a</li><li>a</li></ul><ul class='c'><li>a</li><li>a</li></ul>" )
-		.find( "ul" ).css({ "float": "left", width: "100px" }).end()
-		.find( "li" ).css({ "float": "left", width: "50px", height: "50px" });
+		.find( "ul" ).css( { "float": "left", width: "100px" } ).end()
+		.find( "li" ).css( { "float": "left", width: "50px", height: "50px" } );
 
-	$( "#qunit-fixture .c" ).sortable({
+	$( "#qunit-fixture .c" ).sortable( {
 		connectWith: "#qunit-fixture .c",
 		change: function() {
 			changeCount++;
 		}
-	});
+	} );
 
 	element = $( "#qunit-fixture li:eq(0)" );
 
@@ -140,7 +140,7 @@ test( "#8792: issues with floated items in connected lists", function() {
 	element.simulate( "drag", {
 		dx: 55,
 		moves: 15
-	});
+	} );
 
 	equal( changeCount, 1, "change fired only once (no jitters) when dragging a floated sortable in it's own container" );
 
@@ -149,37 +149,37 @@ test( "#8792: issues with floated items in connected lists", function() {
 	element.simulate( "drag", {
 		dx: 100,
 		moves: 15
-	});
+	} );
 
 	equal( changeCount, 3, "change fired once for each expected change when dragging a floated sortable to a connected container" );
-});
+} );
 
 test( "#8301: single axis with connected list", function() {
 	expect( 1 );
 
-	var element = $( "#sortable" ).sortable({
+	var element = $( "#sortable" ).sortable( {
 		axis: "y",
 		tolerance: "pointer",
 		connectWith: ".connected"
-	});
+	} );
 
 	$( "<ul class='connected'><li>Item 7</li><li>Item 8</li></ul>" )
-		.sortable({
+		.sortable( {
 			axis: "y",
 			tolerance: "pointer",
 			connectWith: "#sortable",
 			receive: function() {
 				ok( true, "connected list received item" );
 			}
-		})
+		} )
 		.insertAfter( element );
 
 	element.find( "li" ).eq( 0 ).simulate( "drag", {
 		handle: "corner",
 		dy: 120,
 		moves: 1
-	});
-});
+	} );
+} );
 
 /*
 test("{ connectWith: false }, default", function() {
@@ -330,44 +330,44 @@ test("{ placeholder: false }, default", function() {
 test( "{ placeholder: false } img", function() {
 	expect( 3 );
 
-	var element = $( "#sortable-images" ).sortable({
+	var element = $( "#sortable-images" ).sortable( {
 		start: function( event, ui ) {
 			ok( ui.placeholder.attr( "src" ).indexOf( "images/jqueryui_32x32.png" ) > 0, "placeholder img has correct src" );
 			equal( ui.placeholder.height(), 32, "placeholder has correct height" );
 			equal( ui.placeholder.width(), 32, "placeholder has correct width" );
 		}
-	});
+	} );
 
 	element.find( "img" ).eq( 0 ).simulate( "drag", {
 		dy: 1
-	});
-});
+	} );
+} );
 
 test( "{ placeholder: String }", function( assert ) {
 	expect( 1 );
 
-	var element = $( "#sortable" ).sortable({
+	var element = $( "#sortable" ).sortable( {
 		placeholder: "test",
 		start: function( event, ui ) {
 			assert.hasClasses( ui.placeholder, "test" );
 		}
-	});
+	} );
 
 	element.find( "li" ).eq( 0 ).simulate( "drag", {
 		dy: 1
-	});
-});
+	} );
+} );
 
 test( "{ placholder: String } tr", function( assert ) {
 	expect( 4 );
 
 	var originalWidths,
-		element = $( "#sortable-table tbody" ).sortable({
+		element = $( "#sortable-table tbody" ).sortable( {
 			placeholder: "test",
 			start: function( event, ui ) {
-				var currentWidths = otherRow.children().map(function() {
+				var currentWidths = otherRow.children().map( function() {
 					return $( this ).width();
-				}).get();
+				} ).get();
 				assert.hasClasses( ui.placeholder, "test" );
 				deepEqual( currentWidths, originalWidths, "table cells maintian size" );
 				equal( ui.placeholder.children().length, dragRow.children().length,
@@ -375,29 +375,29 @@ test( "{ placholder: String } tr", function( assert ) {
 				equal( ui.placeholder.children().html(), $( "<span>&#160;</span>" ).html(),
 					"placeholder td has content for forced dimensions" );
 			}
-		}),
+		} ),
 		rows = element.children( "tr" ),
 		dragRow = rows.eq( 0 ),
 		otherRow = rows.eq( 1 );
 
-	originalWidths = otherRow.children().map(function() {
+	originalWidths = otherRow.children().map( function() {
 		return $( this ).width();
-	}).get();
+	} ).get();
 	dragRow.simulate( "drag", {
 		dy: 1
-	});
-});
+	} );
+} );
 
 test( "{ placholder: String } tbody", function() {
 	expect( 6 );
 
 	var originalWidths,
-		element = $( "#sortable-table" ).sortable({
+		element = $( "#sortable-table" ).sortable( {
 			placeholder: "test",
 			start: function( event, ui ) {
-				var currentWidths = otherBody.children().map(function() {
+				var currentWidths = otherBody.children().map( function() {
 					return $( this ).width();
-				}).get();
+				} ).get();
 				ok( ui.placeholder.hasClass( "test" ), "placeholder has class" );
 				deepEqual( currentWidths, originalWidths, "table cells maintain size" );
 				equal( ui.placeholder.children().length, 1,
@@ -411,18 +411,18 @@ test( "{ placholder: String } tbody", function() {
 					$( "<span>&#160;</span>" ).html(),
 					"placeholder td has content for forced dimensions" );
 			}
-		}),
+		} ),
 		bodies = element.children( "tbody" ),
 		dragBody = bodies.eq( 0 ),
 		otherBody = bodies.eq( 1 );
 
-	originalWidths = otherBody.children().map(function() {
+	originalWidths = otherBody.children().map( function() {
 		return $( this ).width();
-	}).get();
+	} ).get();
 	dragBody.simulate( "drag", {
 		dy: 1
-	});
-});
+	} );
+} );
 
 /*
 test("{ revert: false }, default", function() {
diff --git a/ui/widgets/sortable.js b/ui/widgets/sortable.js
index bea58defd86..423bb81f8e8 100644
--- a/ui/widgets/sortable.js
+++ b/ui/widgets/sortable.js
@@ -14,11 +14,11 @@
 //>>demos: http://jqueryui.com/sortable/
 //>>css.structure: ../themes/base/sortable.css
 
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([
+		define( [
 			"jquery",
 			"./mouse",
 			"../data",
@@ -32,9 +32,9 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}(function( $ ) {
+}( function( $ ) {
 
-return $.widget("ui.sortable", $.ui.mouse, {
+return $.widget( "ui.sortable", $.ui.mouse, {
 	version: "@VERSION",
 	widgetEventPrefix: "sort",
 	ready: false,
@@ -82,7 +82,7 @@ return $.widget("ui.sortable", $.ui.mouse, {
 	},
 
 	_isFloating: function( item ) {
-		return (/left|right/).test(item.css("float")) || (/inline|table-cell/).test(item.css("display"));
+		return ( /left|right/ ).test( item.css( "float" ) ) || ( /inline|table-cell/ ).test( item.css( "display" ) );
 	},
 
 	_create: function() {
@@ -123,56 +123,56 @@ return $.widget("ui.sortable", $.ui.mouse, {
 					this.item,
 				"ui-sortable-handle"
 			);
-		});
+		} );
 	},
 
 	_destroy: function() {
 		this._mouseDestroy();
 
 		for ( var i = this.items.length - 1; i >= 0; i-- ) {
-			this.items[i].item.removeData(this.widgetName + "-item");
+			this.items[ i ].item.removeData( this.widgetName + "-item" );
 		}
 
 		return this;
 	},
 
-	_mouseCapture: function(event, overrideHandle) {
+	_mouseCapture: function( event, overrideHandle ) {
 		var currentItem = null,
 			validHandle = false,
 			that = this;
 
-		if (this.reverting) {
+		if ( this.reverting ) {
 			return false;
 		}
 
-		if(this.options.disabled || this.options.type === "static") {
+		if ( this.options.disabled || this.options.type === "static" ) {
 			return false;
 		}
 
 		//We have to refresh the items data once first
-		this._refreshItems(event);
+		this._refreshItems( event );
 
 		//Find out if the clicked node (or one of its parents) is a actual item in this.items
-		$(event.target).parents().each(function() {
-			if($.data(this, that.widgetName + "-item") === that) {
-				currentItem = $(this);
+		$( event.target ).parents().each( function() {
+			if ( $.data( this, that.widgetName + "-item" ) === that ) {
+				currentItem = $( this );
 				return false;
 			}
-		});
-		if($.data(event.target, that.widgetName + "-item") === that) {
-			currentItem = $(event.target);
+		} );
+		if ( $.data( event.target, that.widgetName + "-item" ) === that ) {
+			currentItem = $( event.target );
 		}
 
-		if(!currentItem) {
+		if ( !currentItem ) {
 			return false;
 		}
-		if(this.options.handle && !overrideHandle) {
-			$(this.options.handle, currentItem).find("*").addBack().each(function() {
-				if(this === event.target) {
+		if ( this.options.handle && !overrideHandle ) {
+			$( this.options.handle, currentItem ).find( "*" ).addBack().each( function() {
+				if ( this === event.target ) {
 					validHandle = true;
 				}
-			});
-			if(!validHandle) {
+			} );
+			if ( !validHandle ) {
 				return false;
 			}
 		}
@@ -183,7 +183,7 @@ return $.widget("ui.sortable", $.ui.mouse, {
 
 	},
 
-	_mouseStart: function(event, overrideHandle, noActivation) {
+	_mouseStart: function( event, overrideHandle, noActivation ) {
 
 		var i, body,
 			o = this.options;
@@ -194,7 +194,7 @@ return $.widget("ui.sortable", $.ui.mouse, {
 		this.refreshPositions();
 
 		//Create and append the visible helper
-		this.helper = this._createHelper(event);
+		this.helper = this._createHelper( event );
 
 		//Cache the helper size
 		this._cacheHelperProportions();
@@ -217,33 +217,33 @@ return $.widget("ui.sortable", $.ui.mouse, {
 			left: this.offset.left - this.margins.left
 		};
 
-		$.extend(this.offset, {
+		$.extend( this.offset, {
 			click: { //Where the click happened, relative to the element
 				left: event.pageX - this.offset.left,
 				top: event.pageY - this.offset.top
 			},
 			parent: this._getParentOffset(),
 			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
-		});
+		} );
 
 		// Only after we got the offset, we can change the helper's position to absolute
 		// TODO: Still need to figure out a way to make relative sorting possible
-		this.helper.css("position", "absolute");
-		this.cssPosition = this.helper.css("position");
+		this.helper.css( "position", "absolute" );
+		this.cssPosition = this.helper.css( "position" );
 
 		//Generate the original position
-		this.originalPosition = this._generatePosition(event);
+		this.originalPosition = this._generatePosition( event );
 		this.originalPageX = event.pageX;
 		this.originalPageY = event.pageY;
 
 		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
-		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+		( o.cursorAt && this._adjustOffsetFromHelper( o.cursorAt ) );
 
 		//Cache the former DOM position
-		this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
+		this.domPosition = { prev: this.currentItem.prev()[ 0 ], parent: this.currentItem.parent()[ 0 ] };
 
 		//If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
-		if(this.helper[0] !== this.currentItem[0]) {
+		if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
 			this.currentItem.hide();
 		}
 
@@ -251,141 +251,140 @@ return $.widget("ui.sortable", $.ui.mouse, {
 		this._createPlaceholder();
 
 		//Set a containment if given in the options
-		if(o.containment) {
+		if ( o.containment ) {
 			this._setContainment();
 		}
 
-		if( o.cursor && o.cursor !== "auto" ) { // cursor option
+		if ( o.cursor && o.cursor !== "auto" ) { // cursor option
 			body = this.document.find( "body" );
 
 			// Support: IE
 			this.storedCursor = body.css( "cursor" );
 			body.css( "cursor", o.cursor );
 
-			this.storedStylesheet = $( "<style>*{ cursor: "+o.cursor+" !important; }</style>" ).appendTo( body );
+			this.storedStylesheet = $( "<style>*{ cursor: " + o.cursor + " !important; }</style>" ).appendTo( body );
 		}
 
-		if(o.opacity) { // opacity option
-			if (this.helper.css("opacity")) {
-				this._storedOpacity = this.helper.css("opacity");
+		if ( o.opacity ) { // opacity option
+			if ( this.helper.css( "opacity" ) ) {
+				this._storedOpacity = this.helper.css( "opacity" );
 			}
-			this.helper.css("opacity", o.opacity);
+			this.helper.css( "opacity", o.opacity );
 		}
 
-		if(o.zIndex) { // zIndex option
-			if (this.helper.css("zIndex")) {
-				this._storedZIndex = this.helper.css("zIndex");
+		if ( o.zIndex ) { // zIndex option
+			if ( this.helper.css( "zIndex" ) ) {
+				this._storedZIndex = this.helper.css( "zIndex" );
 			}
-			this.helper.css("zIndex", o.zIndex);
+			this.helper.css( "zIndex", o.zIndex );
 		}
 
 		//Prepare scrolling
-		if(this.scrollParent[0] !== this.document[0] && this.scrollParent[0].tagName !== "HTML") {
+		if ( this.scrollParent[ 0 ] !== this.document[ 0 ] && this.scrollParent[ 0 ].tagName !== "HTML" ) {
 			this.overflowOffset = this.scrollParent.offset();
 		}
 
 		//Call callbacks
-		this._trigger("start", event, this._uiHash());
+		this._trigger( "start", event, this._uiHash() );
 
 		//Recache the helper size
-		if(!this._preserveHelperProportions) {
+		if ( !this._preserveHelperProportions ) {
 			this._cacheHelperProportions();
 		}
 
-
 		//Post "activate" events to possible containers
-		if( !noActivation ) {
+		if ( !noActivation ) {
 			for ( i = this.containers.length - 1; i >= 0; i-- ) {
 				this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) );
 			}
 		}
 
 		//Prepare possible droppables
-		if($.ui.ddmanager) {
+		if ( $.ui.ddmanager ) {
 			$.ui.ddmanager.current = this;
 		}
 
-		if ($.ui.ddmanager && !o.dropBehaviour) {
-			$.ui.ddmanager.prepareOffsets(this, event);
+		if ( $.ui.ddmanager && !o.dropBehaviour ) {
+			$.ui.ddmanager.prepareOffsets( this, event );
 		}
 
 		this.dragging = true;
 
 		this._addClass( this.helper, "ui-sortable-helper" );
-		this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+		this._mouseDrag( event ); //Execute the drag once - this causes the helper not to be visible before getting its correct position
 		return true;
 
 	},
 
-	_mouseDrag: function(event) {
+	_mouseDrag: function( event ) {
 		var i, item, itemElement, intersection,
 			o = this.options,
 			scrolled = false;
 
 		//Compute the helpers position
-		this.position = this._generatePosition(event);
-		this.positionAbs = this._convertPositionTo("absolute");
+		this.position = this._generatePosition( event );
+		this.positionAbs = this._convertPositionTo( "absolute" );
 
-		if (!this.lastPositionAbs) {
+		if ( !this.lastPositionAbs ) {
 			this.lastPositionAbs = this.positionAbs;
 		}
 
 		//Do scrolling
-		if(this.options.scroll) {
-			if(this.scrollParent[0] !== this.document[0] && this.scrollParent[0].tagName !== "HTML") {
+		if ( this.options.scroll ) {
+			if ( this.scrollParent[ 0 ] !== this.document[ 0 ] && this.scrollParent[ 0 ].tagName !== "HTML" ) {
 
-				if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
-					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
-				} else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity) {
-					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
+				if ( ( this.overflowOffset.top + this.scrollParent[ 0 ].offsetHeight ) - event.pageY < o.scrollSensitivity ) {
+					this.scrollParent[ 0 ].scrollTop = scrolled = this.scrollParent[ 0 ].scrollTop + o.scrollSpeed;
+				} else if ( event.pageY - this.overflowOffset.top < o.scrollSensitivity ) {
+					this.scrollParent[ 0 ].scrollTop = scrolled = this.scrollParent[ 0 ].scrollTop - o.scrollSpeed;
 				}
 
-				if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
-					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
-				} else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity) {
-					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
+				if ( ( this.overflowOffset.left + this.scrollParent[ 0 ].offsetWidth ) - event.pageX < o.scrollSensitivity ) {
+					this.scrollParent[ 0 ].scrollLeft = scrolled = this.scrollParent[ 0 ].scrollLeft + o.scrollSpeed;
+				} else if ( event.pageX - this.overflowOffset.left < o.scrollSensitivity ) {
+					this.scrollParent[ 0 ].scrollLeft = scrolled = this.scrollParent[ 0 ].scrollLeft - o.scrollSpeed;
 				}
 
 			} else {
 
-				if(event.pageY - this.document.scrollTop() < o.scrollSensitivity) {
-					scrolled = this.document.scrollTop(this.document.scrollTop() - o.scrollSpeed);
-				} else if(this.window.height() - (event.pageY - this.document.scrollTop()) < o.scrollSensitivity) {
-					scrolled = this.document.scrollTop(this.document.scrollTop() + o.scrollSpeed);
+				if ( event.pageY - this.document.scrollTop() < o.scrollSensitivity ) {
+					scrolled = this.document.scrollTop( this.document.scrollTop() - o.scrollSpeed );
+				} else if ( this.window.height() - ( event.pageY - this.document.scrollTop() ) < o.scrollSensitivity ) {
+					scrolled = this.document.scrollTop( this.document.scrollTop() + o.scrollSpeed );
 				}
 
-				if(event.pageX - this.document.scrollLeft() < o.scrollSensitivity) {
-					scrolled = this.document.scrollLeft(this.document.scrollLeft() - o.scrollSpeed);
-				} else if(this.window.width() - (event.pageX - this.document.scrollLeft()) < o.scrollSensitivity) {
-					scrolled = this.document.scrollLeft(this.document.scrollLeft() + o.scrollSpeed);
+				if ( event.pageX - this.document.scrollLeft() < o.scrollSensitivity ) {
+					scrolled = this.document.scrollLeft( this.document.scrollLeft() - o.scrollSpeed );
+				} else if ( this.window.width() - ( event.pageX - this.document.scrollLeft() ) < o.scrollSensitivity ) {
+					scrolled = this.document.scrollLeft( this.document.scrollLeft() + o.scrollSpeed );
 				}
 
 			}
 
-			if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
-				$.ui.ddmanager.prepareOffsets(this, event);
+			if ( scrolled !== false && $.ui.ddmanager && !o.dropBehaviour ) {
+				$.ui.ddmanager.prepareOffsets( this, event );
 			}
 		}
 
 		//Regenerate the absolute position used for position checks
-		this.positionAbs = this._convertPositionTo("absolute");
+		this.positionAbs = this._convertPositionTo( "absolute" );
 
 		//Set the helper position
-		if(!this.options.axis || this.options.axis !== "y") {
-			this.helper[0].style.left = this.position.left+"px";
+		if ( !this.options.axis || this.options.axis !== "y" ) {
+			this.helper[ 0 ].style.left = this.position.left + "px";
 		}
-		if(!this.options.axis || this.options.axis !== "x") {
-			this.helper[0].style.top = this.position.top+"px";
+		if ( !this.options.axis || this.options.axis !== "x" ) {
+			this.helper[ 0 ].style.top = this.position.top + "px";
 		}
 
 		//Rearrange
-		for (i = this.items.length - 1; i >= 0; i--) {
+		for ( i = this.items.length - 1; i >= 0; i-- ) {
 
 			//Cache variables and intersection, continue if no intersection
-			item = this.items[i];
-			itemElement = item.item[0];
-			intersection = this._intersectsWithPointer(item);
-			if (!intersection) {
+			item = this.items[ i ];
+			itemElement = item.item[ 0 ];
+			intersection = this._intersectsWithPointer( item );
+			if ( !intersection ) {
 				continue;
 			}
 
@@ -396,77 +395,77 @@ return $.widget("ui.sortable", $.ui.mouse, {
 			//
 			// Without this, moving items in "sub-sortables" can cause
 			// the placeholder to jitter between the outer and inner container.
-			if (item.instance !== this.currentContainer) {
+			if ( item.instance !== this.currentContainer ) {
 				continue;
 			}
 
 			// Cannot intersect with itself
 			// no useless actions that have been done before
 			// no action if the item moved is the parent of the item checked
-			if (itemElement !== this.currentItem[0] &&
-				this.placeholder[intersection === 1 ? "next" : "prev"]()[0] !== itemElement &&
-				!$.contains(this.placeholder[0], itemElement) &&
-				(this.options.type === "semi-dynamic" ? !$.contains(this.element[0], itemElement) : true)
+			if ( itemElement !== this.currentItem[ 0 ] &&
+				this.placeholder[ intersection === 1 ? "next" : "prev" ]()[ 0 ] !== itemElement &&
+				!$.contains( this.placeholder[ 0 ], itemElement ) &&
+				( this.options.type === "semi-dynamic" ? !$.contains( this.element[ 0 ], itemElement ) : true )
 			) {
 
 				this.direction = intersection === 1 ? "down" : "up";
 
-				if (this.options.tolerance === "pointer" || this._intersectsWithSides(item)) {
-					this._rearrange(event, item);
+				if ( this.options.tolerance === "pointer" || this._intersectsWithSides( item ) ) {
+					this._rearrange( event, item );
 				} else {
 					break;
 				}
 
-				this._trigger("change", event, this._uiHash());
+				this._trigger( "change", event, this._uiHash() );
 				break;
 			}
 		}
 
 		//Post events to containers
-		this._contactContainers(event);
+		this._contactContainers( event );
 
 		//Interconnect with droppables
-		if($.ui.ddmanager) {
-			$.ui.ddmanager.drag(this, event);
+		if ( $.ui.ddmanager ) {
+			$.ui.ddmanager.drag( this, event );
 		}
 
 		//Call callbacks
-		this._trigger("sort", event, this._uiHash());
+		this._trigger( "sort", event, this._uiHash() );
 
 		this.lastPositionAbs = this.positionAbs;
 		return false;
 
 	},
 
-	_mouseStop: function(event, noPropagation) {
+	_mouseStop: function( event, noPropagation ) {
 
-		if(!event) {
+		if ( !event ) {
 			return;
 		}
 
 		//If we are using droppables, inform the manager about the drop
-		if ($.ui.ddmanager && !this.options.dropBehaviour) {
-			$.ui.ddmanager.drop(this, event);
+		if ( $.ui.ddmanager && !this.options.dropBehaviour ) {
+			$.ui.ddmanager.drop( this, event );
 		}
 
-		if(this.options.revert) {
+		if ( this.options.revert ) {
 			var that = this,
 				cur = this.placeholder.offset(),
 				axis = this.options.axis,
 				animation = {};
 
 			if ( !axis || axis === "x" ) {
-				animation.left = cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === this.document[0].body ? 0 : this.offsetParent[0].scrollLeft);
+				animation.left = cur.left - this.offset.parent.left - this.margins.left + ( this.offsetParent[ 0 ] === this.document[ 0 ].body ? 0 : this.offsetParent[ 0 ].scrollLeft );
 			}
 			if ( !axis || axis === "y" ) {
-				animation.top = cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === this.document[0].body ? 0 : this.offsetParent[0].scrollTop);
+				animation.top = cur.top - this.offset.parent.top - this.margins.top + ( this.offsetParent[ 0 ] === this.document[ 0 ].body ? 0 : this.offsetParent[ 0 ].scrollTop );
 			}
 			this.reverting = true;
-			$(this.helper).animate( animation, parseInt(this.options.revert, 10) || 500, function() {
-				that._clear(event);
-			});
+			$( this.helper ).animate( animation, parseInt( this.options.revert, 10 ) || 500, function() {
+				that._clear( event );
+			} );
 		} else {
-			this._clear(event, noPropagation);
+			this._clear( event, noPropagation );
 		}
 
 		return false;
@@ -475,11 +474,11 @@ return $.widget("ui.sortable", $.ui.mouse, {
 
 	cancel: function() {
 
-		if(this.dragging) {
+		if ( this.dragging ) {
 
-			this._mouseUp({ target: null });
+			this._mouseUp( { target: null } );
 
-			if(this.options.helper === "original") {
+			if ( this.options.helper === "original" ) {
 				this.currentItem.css( this._storedCSS );
 				this._removeClass( this.currentItem, "ui-sortable-helper" );
 			} else {
@@ -487,36 +486,37 @@ return $.widget("ui.sortable", $.ui.mouse, {
 			}
 
 			//Post deactivating events to containers
-			for (var i = this.containers.length - 1; i >= 0; i--){
-				this.containers[i]._trigger("deactivate", null, this._uiHash(this));
-				if(this.containers[i].containerCache.over) {
-					this.containers[i]._trigger("out", null, this._uiHash(this));
-					this.containers[i].containerCache.over = 0;
+			for ( var i = this.containers.length - 1; i >= 0; i-- ) {
+				this.containers[ i ]._trigger( "deactivate", null, this._uiHash( this ) );
+				if ( this.containers[ i ].containerCache.over ) {
+					this.containers[ i ]._trigger( "out", null, this._uiHash( this ) );
+					this.containers[ i ].containerCache.over = 0;
 				}
 			}
 
 		}
 
-		if (this.placeholder) {
+		if ( this.placeholder ) {
+
 			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
-			if(this.placeholder[0].parentNode) {
-				this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+			if ( this.placeholder[ 0 ].parentNode ) {
+				this.placeholder[ 0 ].parentNode.removeChild( this.placeholder[ 0 ] );
 			}
-			if(this.options.helper !== "original" && this.helper && this.helper[0].parentNode) {
+			if ( this.options.helper !== "original" && this.helper && this.helper[ 0 ].parentNode ) {
 				this.helper.remove();
 			}
 
-			$.extend(this, {
+			$.extend( this, {
 				helper: null,
 				dragging: false,
 				reverting: false,
 				_noFinalSort: null
-			});
+			} );
 
-			if(this.domPosition.prev) {
-				$(this.domPosition.prev).after(this.currentItem);
+			if ( this.domPosition.prev ) {
+				$( this.domPosition.prev ).after( this.currentItem );
 			} else {
-				$(this.domPosition.parent).prepend(this.currentItem);
+				$( this.domPosition.parent ).prepend( this.currentItem );
 			}
 		}
 
@@ -524,41 +524,41 @@ return $.widget("ui.sortable", $.ui.mouse, {
 
 	},
 
-	serialize: function(o) {
+	serialize: function( o ) {
 
-		var items = this._getItemsAsjQuery(o && o.connected),
+		var items = this._getItemsAsjQuery( o && o.connected ),
 			str = [];
 		o = o || {};
 
-		$(items).each(function() {
-			var res = ($(o.item || this).attr(o.attribute || "id") || "").match(o.expression || (/(.+)[\-=_](.+)/));
-			if (res) {
-				str.push((o.key || res[1]+"[]")+"="+(o.key && o.expression ? res[1] : res[2]));
+		$( items ).each( function() {
+			var res = ( $( o.item || this ).attr( o.attribute || "id" ) || "" ).match( o.expression || ( /(.+)[\-=_](.+)/ ) );
+			if ( res ) {
+				str.push( ( o.key || res[ 1 ] + "[]" ) + "=" + ( o.key && o.expression ? res[ 1 ] : res[ 2 ] ) );
 			}
-		});
+		} );
 
-		if(!str.length && o.key) {
-			str.push(o.key + "=");
+		if ( !str.length && o.key ) {
+			str.push( o.key + "=" );
 		}
 
-		return str.join("&");
+		return str.join( "&" );
 
 	},
 
-	toArray: function(o) {
+	toArray: function( o ) {
 
-		var items = this._getItemsAsjQuery(o && o.connected),
+		var items = this._getItemsAsjQuery( o && o.connected ),
 			ret = [];
 
 		o = o || {};
 
-		items.each(function() { ret.push($(o.item || this).attr(o.attribute || "id") || ""); });
+		items.each( function() { ret.push( $( o.item || this ).attr( o.attribute || "id" ) || "" ); } );
 		return ret;
 
 	},
 
 	/* Be careful with the following core functions */
-	_intersectsWith: function(item) {
+	_intersectsWith: function( item ) {
 
 		var x1 = this.positionAbs.left,
 			x2 = x1 + this.helperProportions.width,
@@ -576,27 +576,27 @@ return $.widget("ui.sortable", $.ui.mouse, {
 
 		if ( this.options.tolerance === "pointer" ||
 			this.options.forcePointerForContainers ||
-			(this.options.tolerance !== "pointer" && this.helperProportions[this.floating ? "width" : "height"] > item[this.floating ? "width" : "height"])
+			( this.options.tolerance !== "pointer" && this.helperProportions[ this.floating ? "width" : "height" ] > item[ this.floating ? "width" : "height" ] )
 		) {
 			return isOverElement;
 		} else {
 
-			return (l < x1 + (this.helperProportions.width / 2) && // Right Half
-				x2 - (this.helperProportions.width / 2) < r && // Left Half
-				t < y1 + (this.helperProportions.height / 2) && // Bottom Half
-				y2 - (this.helperProportions.height / 2) < b ); // Top Half
+			return ( l < x1 + ( this.helperProportions.width / 2 ) && // Right Half
+				x2 - ( this.helperProportions.width / 2 ) < r && // Left Half
+				t < y1 + ( this.helperProportions.height / 2 ) && // Bottom Half
+				y2 - ( this.helperProportions.height / 2 ) < b ); // Top Half
 
 		}
 	},
 
-	_intersectsWithPointer: function(item) {
+	_intersectsWithPointer: function( item ) {
 
 		var verticalDirection, horizontalDirection,
-			isOverElementHeight = (this.options.axis === "x") || this._isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
-			isOverElementWidth = (this.options.axis === "y") || this._isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
+			isOverElementHeight = ( this.options.axis === "x" ) || this._isOverAxis( this.positionAbs.top + this.offset.click.top, item.top, item.height ),
+			isOverElementWidth = ( this.options.axis === "y" ) || this._isOverAxis( this.positionAbs.left + this.offset.click.left, item.left, item.width ),
 			isOverElement = isOverElementHeight && isOverElementWidth;
 
-		if (!isOverElement) {
+		if ( !isOverElement ) {
 			return false;
 		}
 
@@ -604,38 +604,38 @@ return $.widget("ui.sortable", $.ui.mouse, {
 		horizontalDirection = this._getDragHorizontalDirection();
 
 		return this.floating ?
-			( (horizontalDirection === "right" || verticalDirection === "down") ? 2 : 1 )
-			: ( verticalDirection && (verticalDirection === "down" ? 2 : 1) );
+			( ( horizontalDirection === "right" || verticalDirection === "down" ) ? 2 : 1 )
+			: ( verticalDirection && ( verticalDirection === "down" ? 2 : 1 ) );
 
 	},
 
-	_intersectsWithSides: function(item) {
+	_intersectsWithSides: function( item ) {
 
-		var isOverBottomHalf = this._isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
-			isOverRightHalf = this._isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
+		var isOverBottomHalf = this._isOverAxis( this.positionAbs.top + this.offset.click.top, item.top + ( item.height / 2 ), item.height ),
+			isOverRightHalf = this._isOverAxis( this.positionAbs.left + this.offset.click.left, item.left + ( item.width / 2 ), item.width ),
 			verticalDirection = this._getDragVerticalDirection(),
 			horizontalDirection = this._getDragHorizontalDirection();
 
-		if (this.floating && horizontalDirection) {
-			return ((horizontalDirection === "right" && isOverRightHalf) || (horizontalDirection === "left" && !isOverRightHalf));
+		if ( this.floating && horizontalDirection ) {
+			return ( ( horizontalDirection === "right" && isOverRightHalf ) || ( horizontalDirection === "left" && !isOverRightHalf ) );
 		} else {
-			return verticalDirection && ((verticalDirection === "down" && isOverBottomHalf) || (verticalDirection === "up" && !isOverBottomHalf));
+			return verticalDirection && ( ( verticalDirection === "down" && isOverBottomHalf ) || ( verticalDirection === "up" && !isOverBottomHalf ) );
 		}
 
 	},
 
 	_getDragVerticalDirection: function() {
 		var delta = this.positionAbs.top - this.lastPositionAbs.top;
-		return delta !== 0 && (delta > 0 ? "down" : "up");
+		return delta !== 0 && ( delta > 0 ? "down" : "up" );
 	},
 
 	_getDragHorizontalDirection: function() {
 		var delta = this.positionAbs.left - this.lastPositionAbs.left;
-		return delta !== 0 && (delta > 0 ? "right" : "left");
+		return delta !== 0 && ( delta > 0 ? "right" : "left" );
 	},
 
-	refresh: function(event) {
-		this._refreshItems(event);
+	refresh: function( event ) {
+		this._refreshItems( event );
 		this._setHandleClassName();
 		this.refreshPositions();
 		return this;
@@ -643,100 +643,100 @@ return $.widget("ui.sortable", $.ui.mouse, {
 
 	_connectWith: function() {
 		var options = this.options;
-		return options.connectWith.constructor === String ? [options.connectWith] : options.connectWith;
+		return options.connectWith.constructor === String ? [ options.connectWith ] : options.connectWith;
 	},
 
-	_getItemsAsjQuery: function(connected) {
+	_getItemsAsjQuery: function( connected ) {
 
 		var i, j, cur, inst,
 			items = [],
 			queries = [],
 			connectWith = this._connectWith();
 
-		if(connectWith && connected) {
-			for (i = connectWith.length - 1; i >= 0; i--){
-				cur = $(connectWith[i], this.document[0]);
-				for ( j = cur.length - 1; j >= 0; j--){
-					inst = $.data(cur[j], this.widgetFullName);
-					if(inst && inst !== this && !inst.options.disabled) {
-						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), inst]);
+		if ( connectWith && connected ) {
+			for ( i = connectWith.length - 1; i >= 0; i-- ) {
+				cur = $( connectWith[ i ], this.document[ 0 ] );
+				for ( j = cur.length - 1; j >= 0; j-- ) {
+					inst = $.data( cur[ j ], this.widgetFullName );
+					if ( inst && inst !== this && !inst.options.disabled ) {
+						queries.push( [ $.isFunction( inst.options.items ) ? inst.options.items.call( inst.element ) : $( inst.options.items, inst.element ).not( ".ui-sortable-helper" ).not( ".ui-sortable-placeholder" ), inst ] );
 					}
 				}
 			}
 		}
 
-		queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), this]);
+		queries.push( [ $.isFunction( this.options.items ) ? this.options.items.call( this.element, null, { options: this.options, item: this.currentItem } ) : $( this.options.items, this.element ).not( ".ui-sortable-helper" ).not( ".ui-sortable-placeholder" ), this ] );
 
 		function addItems() {
 			items.push( this );
 		}
-		for (i = queries.length - 1; i >= 0; i--){
-			queries[i][0].each( addItems );
+		for ( i = queries.length - 1; i >= 0; i-- ) {
+			queries[ i ][ 0 ].each( addItems );
 		}
 
-		return $(items);
+		return $( items );
 
 	},
 
 	_removeCurrentsFromItems: function() {
 
-		var list = this.currentItem.find(":data(" + this.widgetName + "-item)");
+		var list = this.currentItem.find( ":data(" + this.widgetName + "-item)" );
 
-		this.items = $.grep(this.items, function (item) {
-			for (var j=0; j < list.length; j++) {
-				if(list[j] === item.item[0]) {
+		this.items = $.grep( this.items, function( item ) {
+			for ( var j = 0; j < list.length; j++ ) {
+				if ( list[ j ] === item.item[ 0 ] ) {
 					return false;
 				}
 			}
 			return true;
-		});
+		} );
 
 	},
 
-	_refreshItems: function(event) {
+	_refreshItems: function( event ) {
 
 		this.items = [];
-		this.containers = [this];
+		this.containers = [ this ];
 
 		var i, j, cur, inst, targetData, _queries, item, queriesLength,
 			items = this.items,
-			queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]],
+			queries = [ [ $.isFunction( this.options.items ) ? this.options.items.call( this.element[ 0 ], event, { item: this.currentItem } ) : $( this.options.items, this.element ), this ] ],
 			connectWith = this._connectWith();
 
-		if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
-			for (i = connectWith.length - 1; i >= 0; i--){
-				cur = $(connectWith[i], this.document[0]);
-				for (j = cur.length - 1; j >= 0; j--){
-					inst = $.data(cur[j], this.widgetFullName);
-					if(inst && inst !== this && !inst.options.disabled) {
-						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
-						this.containers.push(inst);
+		if ( connectWith && this.ready ) { //Shouldn't be run the first time through due to massive slow-down
+			for ( i = connectWith.length - 1; i >= 0; i-- ) {
+				cur = $( connectWith[ i ], this.document[ 0 ] );
+				for ( j = cur.length - 1; j >= 0; j-- ) {
+					inst = $.data( cur[ j ], this.widgetFullName );
+					if ( inst && inst !== this && !inst.options.disabled ) {
+						queries.push( [ $.isFunction( inst.options.items ) ? inst.options.items.call( inst.element[ 0 ], event, { item: this.currentItem } ) : $( inst.options.items, inst.element ), inst ] );
+						this.containers.push( inst );
 					}
 				}
 			}
 		}
 
-		for (i = queries.length - 1; i >= 0; i--) {
-			targetData = queries[i][1];
-			_queries = queries[i][0];
+		for ( i = queries.length - 1; i >= 0; i-- ) {
+			targetData = queries[ i ][ 1 ];
+			_queries = queries[ i ][ 0 ];
 
-			for (j=0, queriesLength = _queries.length; j < queriesLength; j++) {
-				item = $(_queries[j]);
+			for ( j = 0, queriesLength = _queries.length; j < queriesLength; j++ ) {
+				item = $( _queries[ j ] );
 
-				item.data(this.widgetName + "-item", targetData); // Data for target checking (mouse manager)
+				item.data( this.widgetName + "-item", targetData ); // Data for target checking (mouse manager)
 
-				items.push({
+				items.push( {
 					item: item,
 					instance: targetData,
 					width: 0, height: 0,
 					left: 0, top: 0
-				});
+				} );
 			}
 		}
 
 	},
 
-	refreshPositions: function(fast) {
+	refreshPositions: function( fast ) {
 
 		// Determine whether items are being displayed horizontally
 		this.floating = this.items.length ?
@@ -744,23 +744,23 @@ return $.widget("ui.sortable", $.ui.mouse, {
 			false;
 
 		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
-		if(this.offsetParent && this.helper) {
+		if ( this.offsetParent && this.helper ) {
 			this.offset.parent = this._getParentOffset();
 		}
 
 		var i, item, t, p;
 
-		for (i = this.items.length - 1; i >= 0; i--){
-			item = this.items[i];
+		for ( i = this.items.length - 1; i >= 0; i-- ) {
+			item = this.items[ i ];
 
 			//We ignore calculating positions of all connected containers when we're not over them
-			if(item.instance !== this.currentContainer && this.currentContainer && item.item[0] !== this.currentItem[0]) {
+			if ( item.instance !== this.currentContainer && this.currentContainer && item.item[ 0 ] !== this.currentItem[ 0 ] ) {
 				continue;
 			}
 
-			t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
+			t = this.options.toleranceElement ? $( this.options.toleranceElement, item.item ) : item.item;
 
-			if (!fast) {
+			if ( !fast ) {
 				item.width = t.outerWidth();
 				item.height = t.outerHeight();
 			}
@@ -770,33 +770,33 @@ return $.widget("ui.sortable", $.ui.mouse, {
 			item.top = p.top;
 		}
 
-		if(this.options.custom && this.options.custom.refreshContainers) {
-			this.options.custom.refreshContainers.call(this);
+		if ( this.options.custom && this.options.custom.refreshContainers ) {
+			this.options.custom.refreshContainers.call( this );
 		} else {
-			for (i = this.containers.length - 1; i >= 0; i--){
-				p = this.containers[i].element.offset();
-				this.containers[i].containerCache.left = p.left;
-				this.containers[i].containerCache.top = p.top;
-				this.containers[i].containerCache.width = this.containers[i].element.outerWidth();
-				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
+			for ( i = this.containers.length - 1; i >= 0; i-- ) {
+				p = this.containers[ i ].element.offset();
+				this.containers[ i ].containerCache.left = p.left;
+				this.containers[ i ].containerCache.top = p.top;
+				this.containers[ i ].containerCache.width = this.containers[ i ].element.outerWidth();
+				this.containers[ i ].containerCache.height = this.containers[ i ].element.outerHeight();
 			}
 		}
 
 		return this;
 	},
 
-	_createPlaceholder: function(that) {
+	_createPlaceholder: function( that ) {
 		that = that || this;
 		var className,
 			o = that.options;
 
-		if(!o.placeholder || o.placeholder.constructor === String) {
+		if ( !o.placeholder || o.placeholder.constructor === String ) {
 			className = o.placeholder;
 			o.placeholder = {
 				element: function() {
 
-					var nodeName = that.currentItem[0].nodeName.toLowerCase(),
-						element = $( "<" + nodeName + ">", that.document[0] );
+					var nodeName = that.currentItem[ 0 ].nodeName.toLowerCase(),
+						element = $( "<" + nodeName + ">", that.document[ 0 ] );
 
 						that._addClass( element, "ui-sortable-placeholder",
 								className || that.currentItem[ 0 ].className )
@@ -819,105 +819,106 @@ return $.widget("ui.sortable", $.ui.mouse, {
 
 					return element;
 				},
-				update: function(container, p) {
+				update: function( container, p ) {
 
 					// 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
 					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
-					if(className && !o.forcePlaceholderSize) {
+					if ( className && !o.forcePlaceholderSize ) {
 						return;
 					}
 
 					//If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
-					if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css("paddingTop")||0, 10) - parseInt(that.currentItem.css("paddingBottom")||0, 10)); }
-					if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css("paddingLeft")||0, 10) - parseInt(that.currentItem.css("paddingRight")||0, 10)); }
+					if ( !p.height() ) { p.height( that.currentItem.innerHeight() - parseInt( that.currentItem.css( "paddingTop" ) || 0, 10 ) - parseInt( that.currentItem.css( "paddingBottom" ) || 0, 10 ) ); }
+					if ( !p.width() ) { p.width( that.currentItem.innerWidth() - parseInt( that.currentItem.css( "paddingLeft" ) || 0, 10 ) - parseInt( that.currentItem.css( "paddingRight" ) || 0, 10 ) ); }
 				}
 			};
 		}
 
 		//Create the placeholder
-		that.placeholder = $(o.placeholder.element.call(that.element, that.currentItem));
+		that.placeholder = $( o.placeholder.element.call( that.element, that.currentItem ) );
 
 		//Append it after the actual current item
-		that.currentItem.after(that.placeholder);
+		that.currentItem.after( that.placeholder );
 
 		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
-		o.placeholder.update(that, that.placeholder);
+		o.placeholder.update( that, that.placeholder );
 
 	},
 
 	_createTrPlaceholder: function( sourceTr, targetTr ) {
 		var that = this;
 
-		sourceTr.children().each(function() {
+		sourceTr.children().each( function() {
 			$( "<td>&#160;</td>", that.document[ 0 ] )
 				.attr( "colspan", $( this ).attr( "colspan" ) || 1 )
 				.appendTo( targetTr );
-		});
+		} );
 	},
 
-	_contactContainers: function(event) {
+	_contactContainers: function( event ) {
 		var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, cur, nearBottom, floating, axis,
 			innermostContainer = null,
 			innermostIndex = null;
 
 		// Get innermost container that intersects with item
-		for (i = this.containers.length - 1; i >= 0; i--) {
+		for ( i = this.containers.length - 1; i >= 0; i-- ) {
 
 			// Never consider a container that's located within the item itself
-			if($.contains(this.currentItem[0], this.containers[i].element[0])) {
+			if ( $.contains( this.currentItem[ 0 ], this.containers[ i ].element[ 0 ] ) ) {
 				continue;
 			}
 
-			if(this._intersectsWith(this.containers[i].containerCache)) {
+			if ( this._intersectsWith( this.containers[ i ].containerCache ) ) {
 
 				// If we've already found a container and it's more "inner" than this, then continue
-				if(innermostContainer && $.contains(this.containers[i].element[0], innermostContainer.element[0])) {
+				if ( innermostContainer && $.contains( this.containers[ i ].element[ 0 ], innermostContainer.element[ 0 ] ) ) {
 					continue;
 				}
 
-				innermostContainer = this.containers[i];
+				innermostContainer = this.containers[ i ];
 				innermostIndex = i;
 
 			} else {
+
 				// container doesn't intersect. trigger "out" event if necessary
-				if(this.containers[i].containerCache.over) {
-					this.containers[i]._trigger("out", event, this._uiHash(this));
-					this.containers[i].containerCache.over = 0;
+				if ( this.containers[ i ].containerCache.over ) {
+					this.containers[ i ]._trigger( "out", event, this._uiHash( this ) );
+					this.containers[ i ].containerCache.over = 0;
 				}
 			}
 
 		}
 
 		// If no intersecting containers found, return
-		if(!innermostContainer) {
+		if ( !innermostContainer ) {
 			return;
 		}
 
 		// Move the item into the container if it's not there already
-		if(this.containers.length === 1) {
-			if (!this.containers[innermostIndex].containerCache.over) {
-				this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
-				this.containers[innermostIndex].containerCache.over = 1;
+		if ( this.containers.length === 1 ) {
+			if ( !this.containers[ innermostIndex ].containerCache.over ) {
+				this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) );
+				this.containers[ innermostIndex ].containerCache.over = 1;
 			}
 		} else {
 
 			//When entering a new container, we will find the item with the least distance and append our item near it
 			dist = 10000;
 			itemWithLeastDistance = null;
-			floating = innermostContainer.floating || this._isFloating(this.currentItem);
+			floating = innermostContainer.floating || this._isFloating( this.currentItem );
 			posProperty = floating ? "left" : "top";
 			sizeProperty = floating ? "width" : "height";
 			axis = floating ? "clientX" : "clientY";
 
-			for (j = this.items.length - 1; j >= 0; j--) {
-				if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) {
+			for ( j = this.items.length - 1; j >= 0; j-- ) {
+				if ( !$.contains( this.containers[ innermostIndex ].element[ 0 ], this.items[ j ].item[ 0 ] ) ) {
 					continue;
 				}
-				if(this.items[j].item[0] === this.currentItem[0]) {
+				if ( this.items[ j ].item[ 0 ] === this.currentItem[ 0 ] ) {
 					continue;
 				}
 
-				cur = this.items[j].item.offset()[posProperty];
+				cur = this.items[ j ].item.offset()[ posProperty ];
 				nearBottom = false;
 				if ( event[ axis ] - cur > this.items[ j ][ sizeProperty ] / 2 ) {
 					nearBottom = true;
@@ -926,16 +927,16 @@ return $.widget("ui.sortable", $.ui.mouse, {
 				if ( Math.abs( event[ axis ] - cur ) < dist ) {
 					dist = Math.abs( event[ axis ] - cur );
 					itemWithLeastDistance = this.items[ j ];
-					this.direction = nearBottom ? "up": "down";
+					this.direction = nearBottom ? "up" : "down";
 				}
 			}
 
 			//Check if dropOnEmpty is enabled
-			if(!itemWithLeastDistance && !this.options.dropOnEmpty) {
+			if ( !itemWithLeastDistance && !this.options.dropOnEmpty ) {
 				return;
 			}
 
-			if(this.currentContainer === this.containers[innermostIndex]) {
+			if ( this.currentContainer === this.containers[ innermostIndex ] ) {
 				if ( !this.currentContainer.containerCache.over ) {
 					this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash() );
 					this.currentContainer.containerCache.over = 1;
@@ -943,70 +944,68 @@ return $.widget("ui.sortable", $.ui.mouse, {
 				return;
 			}
 
-			itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true);
-			this._trigger("change", event, this._uiHash());
-			this.containers[innermostIndex]._trigger("change", event, this._uiHash(this));
-			this.currentContainer = this.containers[innermostIndex];
+			itemWithLeastDistance ? this._rearrange( event, itemWithLeastDistance, null, true ) : this._rearrange( event, null, this.containers[ innermostIndex ].element, true );
+			this._trigger( "change", event, this._uiHash() );
+			this.containers[ innermostIndex ]._trigger( "change", event, this._uiHash( this ) );
+			this.currentContainer = this.containers[ innermostIndex ];
 
 			//Update the placeholder
-			this.options.placeholder.update(this.currentContainer, this.placeholder);
+			this.options.placeholder.update( this.currentContainer, this.placeholder );
 
-			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
-			this.containers[innermostIndex].containerCache.over = 1;
+			this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) );
+			this.containers[ innermostIndex ].containerCache.over = 1;
 		}
 
-
 	},
 
-	_createHelper: function(event) {
+	_createHelper: function( event ) {
 
 		var o = this.options,
-			helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper === "clone" ? this.currentItem.clone() : this.currentItem);
+			helper = $.isFunction( o.helper ) ? $( o.helper.apply( this.element[ 0 ], [ event, this.currentItem ] ) ) : ( o.helper === "clone" ? this.currentItem.clone() : this.currentItem );
 
 		//Add the helper to the DOM if that didn't happen already
-		if(!helper.parents("body").length) {
-			$(o.appendTo !== "parent" ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
+		if ( !helper.parents( "body" ).length ) {
+			$( o.appendTo !== "parent" ? o.appendTo : this.currentItem[ 0 ].parentNode )[ 0 ].appendChild( helper[ 0 ] );
 		}
 
-		if(helper[0] === this.currentItem[0]) {
-			this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
+		if ( helper[ 0 ] === this.currentItem[ 0 ] ) {
+			this._storedCSS = { width: this.currentItem[ 0 ].style.width, height: this.currentItem[ 0 ].style.height, position: this.currentItem.css( "position" ), top: this.currentItem.css( "top" ), left: this.currentItem.css( "left" ) };
 		}
 
-		if(!helper[0].style.width || o.forceHelperSize) {
-			helper.width(this.currentItem.width());
+		if ( !helper[ 0 ].style.width || o.forceHelperSize ) {
+			helper.width( this.currentItem.width() );
 		}
-		if(!helper[0].style.height || o.forceHelperSize) {
-			helper.height(this.currentItem.height());
+		if ( !helper[ 0 ].style.height || o.forceHelperSize ) {
+			helper.height( this.currentItem.height() );
 		}
 
 		return helper;
 
 	},
 
-	_adjustOffsetFromHelper: function(obj) {
-		if (typeof obj === "string") {
-			obj = obj.split(" ");
+	_adjustOffsetFromHelper: function( obj ) {
+		if ( typeof obj === "string" ) {
+			obj = obj.split( " " );
 		}
-		if ($.isArray(obj)) {
-			obj = {left: +obj[0], top: +obj[1] || 0};
+		if ( $.isArray( obj ) ) {
+			obj = { left: +obj[ 0 ], top: +obj[ 1 ] || 0 };
 		}
-		if ("left" in obj) {
+		if ( "left" in obj ) {
 			this.offset.click.left = obj.left + this.margins.left;
 		}
-		if ("right" in obj) {
+		if ( "right" in obj ) {
 			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
 		}
-		if ("top" in obj) {
+		if ( "top" in obj ) {
 			this.offset.click.top = obj.top + this.margins.top;
 		}
-		if ("bottom" in obj) {
+		if ( "bottom" in obj ) {
 			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
 		}
 	},
 
 	_getParentOffset: function() {
 
-
 		//Get the offsetParent and cache its position
 		this.offsetParent = this.helper.offsetParent();
 		var po = this.offsetParent.offset();
@@ -1015,31 +1014,31 @@ return $.widget("ui.sortable", $.ui.mouse, {
 		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
 		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
 		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
-		if(this.cssPosition === "absolute" && this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) {
+		if ( this.cssPosition === "absolute" && this.scrollParent[ 0 ] !== this.document[ 0 ] && $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) {
 			po.left += this.scrollParent.scrollLeft();
 			po.top += this.scrollParent.scrollTop();
 		}
 
 		// This needs to be actually done for all browsers, since pageX/pageY includes this information
 		// with an ugly IE fix
-		if( this.offsetParent[0] === this.document[0].body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
+		if ( this.offsetParent[ 0 ] === this.document[ 0 ].body || ( this.offsetParent[ 0 ].tagName && this.offsetParent[ 0 ].tagName.toLowerCase() === "html" && $.ui.ie ) ) {
 			po = { top: 0, left: 0 };
 		}
 
 		return {
-			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
-			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+			top: po.top + ( parseInt( this.offsetParent.css( "borderTopWidth" ), 10 ) || 0 ),
+			left: po.left + ( parseInt( this.offsetParent.css( "borderLeftWidth" ), 10 ) || 0 )
 		};
 
 	},
 
 	_getRelativeOffset: function() {
 
-		if(this.cssPosition === "relative") {
+		if ( this.cssPosition === "relative" ) {
 			var p = this.currentItem.position();
 			return {
-				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
-				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
+				top: p.top - ( parseInt( this.helper.css( "top" ), 10 ) || 0 ) + this.scrollParent.scrollTop(),
+				left: p.left - ( parseInt( this.helper.css( "left" ), 10 ) || 0 ) + this.scrollParent.scrollLeft()
 			};
 		} else {
 			return { top: 0, left: 0 };
@@ -1049,8 +1048,8 @@ return $.widget("ui.sortable", $.ui.mouse, {
 
 	_cacheMargins: function() {
 		this.margins = {
-			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
-			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
+			left: ( parseInt( this.currentItem.css( "marginLeft" ), 10 ) || 0 ),
+			top: ( parseInt( this.currentItem.css( "marginTop" ), 10 ) || 0 )
 		};
 	},
 
@@ -1065,72 +1064,72 @@ return $.widget("ui.sortable", $.ui.mouse, {
 
 		var ce, co, over,
 			o = this.options;
-		if(o.containment === "parent") {
-			o.containment = this.helper[0].parentNode;
+		if ( o.containment === "parent" ) {
+			o.containment = this.helper[ 0 ].parentNode;
 		}
-		if(o.containment === "document" || o.containment === "window") {
+		if ( o.containment === "document" || o.containment === "window" ) {
 			this.containment = [
 				0 - this.offset.relative.left - this.offset.parent.left,
 				0 - this.offset.relative.top - this.offset.parent.top,
 				o.containment === "document" ? this.document.width() : this.window.width() - this.helperProportions.width - this.margins.left,
-				(o.containment === "document" ? this.document.width() : this.window.height() || this.document[0].body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+				( o.containment === "document" ? this.document.width() : this.window.height() || this.document[ 0 ].body.parentNode.scrollHeight ) - this.helperProportions.height - this.margins.top
 			];
 		}
 
-		if(!(/^(document|window|parent)$/).test(o.containment)) {
-			ce = $(o.containment)[0];
-			co = $(o.containment).offset();
-			over = ($(ce).css("overflow") !== "hidden");
+		if ( !( /^(document|window|parent)$/ ).test( o.containment ) ) {
+			ce = $( o.containment )[ 0 ];
+			co = $( o.containment ).offset();
+			over = ( $( ce ).css( "overflow" ) !== "hidden" );
 
 			this.containment = [
-				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
-				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
-				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
-				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
+				co.left + ( parseInt( $( ce ).css( "borderLeftWidth" ), 10 ) || 0 ) + ( parseInt( $( ce ).css( "paddingLeft" ), 10 ) || 0 ) - this.margins.left,
+				co.top + ( parseInt( $( ce ).css( "borderTopWidth" ), 10 ) || 0 ) + ( parseInt( $( ce ).css( "paddingTop" ), 10 ) || 0 ) - this.margins.top,
+				co.left + ( over ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) - ( parseInt( $( ce ).css( "borderLeftWidth" ), 10 ) || 0 ) - ( parseInt( $( ce ).css( "paddingRight" ), 10 ) || 0 ) - this.helperProportions.width - this.margins.left,
+				co.top + ( over ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) - ( parseInt( $( ce ).css( "borderTopWidth" ), 10 ) || 0 ) - ( parseInt( $( ce ).css( "paddingBottom" ), 10 ) || 0 ) - this.helperProportions.height - this.margins.top
 			];
 		}
 
 	},
 
-	_convertPositionTo: function(d, pos) {
+	_convertPositionTo: function( d, pos ) {
 
-		if(!pos) {
+		if ( !pos ) {
 			pos = this.position;
 		}
 		var mod = d === "absolute" ? 1 : -1,
-			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
-			scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+			scroll = this.cssPosition === "absolute" && !( this.scrollParent[ 0 ] !== this.document[ 0 ] && $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ? this.offsetParent : this.scrollParent,
+			scrollIsRootNode = ( /(html|body)/i ).test( scroll[ 0 ].tagName );
 
 		return {
 			top: (
 				pos.top	+																// The absolute mouse position
 				this.offset.relative.top * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
 				this.offset.parent.top * mod -											// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod )
 			),
 			left: (
 				pos.left +																// The absolute mouse position
 				this.offset.relative.left * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
 				this.offset.parent.left * mod	-										// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod )
 			)
 		};
 
 	},
 
-	_generatePosition: function(event) {
+	_generatePosition: function( event ) {
 
 		var top, left,
 			o = this.options,
 			pageX = event.pageX,
 			pageY = event.pageY,
-			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+			scroll = this.cssPosition === "absolute" && !( this.scrollParent[ 0 ] !== this.document[ 0 ] && $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ? this.offsetParent : this.scrollParent, scrollIsRootNode = ( /(html|body)/i ).test( scroll[ 0 ].tagName );
 
 		// This is another very weird special case that only happens for relative elements:
 		// 1. If the css position is relative
 		// 2. and the scroll parent is the document or similar to the offset parent
 		// we have to refresh the relative offset during the scroll so there are no jumps
-		if(this.cssPosition === "relative" && !(this.scrollParent[0] !== this.document[0] && this.scrollParent[0] !== this.offsetParent[0])) {
+		if ( this.cssPosition === "relative" && !( this.scrollParent[ 0 ] !== this.document[ 0 ] && this.scrollParent[ 0 ] !== this.offsetParent[ 0 ] ) ) {
 			this.offset.relative = this._getRelativeOffset();
 		}
 
@@ -1139,29 +1138,29 @@ return $.widget("ui.sortable", $.ui.mouse, {
 		 * Constrain the position to a mix of grid, containment.
 		 */
 
-		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
+		if ( this.originalPosition ) { //If we are not dragging yet, we won't check for options
 
-			if(this.containment) {
-				if(event.pageX - this.offset.click.left < this.containment[0]) {
-					pageX = this.containment[0] + this.offset.click.left;
+			if ( this.containment ) {
+				if ( event.pageX - this.offset.click.left < this.containment[ 0 ] ) {
+					pageX = this.containment[ 0 ] + this.offset.click.left;
 				}
-				if(event.pageY - this.offset.click.top < this.containment[1]) {
-					pageY = this.containment[1] + this.offset.click.top;
+				if ( event.pageY - this.offset.click.top < this.containment[ 1 ] ) {
+					pageY = this.containment[ 1 ] + this.offset.click.top;
 				}
-				if(event.pageX - this.offset.click.left > this.containment[2]) {
-					pageX = this.containment[2] + this.offset.click.left;
+				if ( event.pageX - this.offset.click.left > this.containment[ 2 ] ) {
+					pageX = this.containment[ 2 ] + this.offset.click.left;
 				}
-				if(event.pageY - this.offset.click.top > this.containment[3]) {
-					pageY = this.containment[3] + this.offset.click.top;
+				if ( event.pageY - this.offset.click.top > this.containment[ 3 ] ) {
+					pageY = this.containment[ 3 ] + this.offset.click.top;
 				}
 			}
 
-			if(o.grid) {
-				top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
-				pageY = this.containment ? ( (top - this.offset.click.top >= this.containment[1] && top - this.offset.click.top <= this.containment[3]) ? top : ((top - this.offset.click.top >= this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+			if ( o.grid ) {
+				top = this.originalPageY + Math.round( ( pageY - this.originalPageY ) / o.grid[ 1 ] ) * o.grid[ 1 ];
+				pageY = this.containment ? ( ( top - this.offset.click.top >= this.containment[ 1 ] && top - this.offset.click.top <= this.containment[ 3 ] ) ? top : ( ( top - this.offset.click.top >= this.containment[ 1 ] ) ? top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) : top;
 
-				left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
-				pageX = this.containment ? ( (left - this.offset.click.left >= this.containment[0] && left - this.offset.click.left <= this.containment[2]) ? left : ((left - this.offset.click.left >= this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+				left = this.originalPageX + Math.round( ( pageX - this.originalPageX ) / o.grid[ 0 ] ) * o.grid[ 0 ];
+				pageX = this.containment ? ( ( left - this.offset.click.left >= this.containment[ 0 ] && left - this.offset.click.left <= this.containment[ 2 ] ) ? left : ( ( left - this.offset.click.left >= this.containment[ 0 ] ) ? left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) : left;
 			}
 
 		}
@@ -1172,22 +1171,22 @@ return $.widget("ui.sortable", $.ui.mouse, {
 				this.offset.click.top -													// Click offset (relative to the element)
 				this.offset.relative.top	-											// Only for relative positioned nodes: Relative offset from element to offset parent
 				this.offset.parent.top +												// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) )
 			),
 			left: (
 				pageX -																// The absolute mouse position
 				this.offset.click.left -												// Click offset (relative to the element)
 				this.offset.relative.left	-											// Only for relative positioned nodes: Relative offset from element to offset parent
 				this.offset.parent.left +												// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) )
 			)
 		};
 
 	},
 
-	_rearrange: function(event, i, a, hardRefresh) {
+	_rearrange: function( event, i, a, hardRefresh ) {
 
-		a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction === "down" ? i.item[0] : i.item[0].nextSibling));
+		a ? a[ 0 ].appendChild( this.placeholder[ 0 ] ) : i.item[ 0 ].parentNode.insertBefore( this.placeholder[ 0 ], ( this.direction === "down" ? i.item[ 0 ] : i.item[ 0 ].nextSibling ) );
 
 		//Various things done here to improve the performance:
 		// 1. we create a setTimeout, that calls refreshPositions
@@ -1197,17 +1196,18 @@ return $.widget("ui.sortable", $.ui.mouse, {
 		this.counter = this.counter ? ++this.counter : 1;
 		var counter = this.counter;
 
-		this._delay(function() {
-			if(counter === this.counter) {
-				this.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
+		this._delay( function() {
+			if ( counter === this.counter ) {
+				this.refreshPositions( !hardRefresh ); //Precompute after each DOM insertion, NOT on mousemove
 			}
-		});
+		} );
 
 	},
 
-	_clear: function(event, noPropagation) {
+	_clear: function( event, noPropagation ) {
 
 		this.reverting = false;
+
 		// We delay all events that have to be triggered to after the point where the placeholder has been removed and
 		// everything else normalized again
 		var i,
@@ -1215,15 +1215,15 @@ return $.widget("ui.sortable", $.ui.mouse, {
 
 		// We first have to update the dom position of the actual currentItem
 		// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
-		if(!this._noFinalSort && this.currentItem.parent().length) {
-			this.placeholder.before(this.currentItem);
+		if ( !this._noFinalSort && this.currentItem.parent().length ) {
+			this.placeholder.before( this.currentItem );
 		}
 		this._noFinalSort = null;
 
-		if(this.helper[0] === this.currentItem[0]) {
-			for(i in this._storedCSS) {
-				if(this._storedCSS[i] === "auto" || this._storedCSS[i] === "static") {
-					this._storedCSS[i] = "";
+		if ( this.helper[ 0 ] === this.currentItem[ 0 ] ) {
+			for ( i in this._storedCSS ) {
+				if ( this._storedCSS[ i ] === "auto" || this._storedCSS[ i ] === "static" ) {
+					this._storedCSS[ i ] = "";
 				}
 			}
 			this.currentItem.css( this._storedCSS );
@@ -1232,37 +1232,36 @@ return $.widget("ui.sortable", $.ui.mouse, {
 			this.currentItem.show();
 		}
 
-		if(this.fromOutside && !noPropagation) {
-			delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
+		if ( this.fromOutside && !noPropagation ) {
+			delayedTriggers.push( function( event ) { this._trigger( "receive", event, this._uiHash( this.fromOutside ) ); } );
 		}
-		if((this.fromOutside || this.domPosition.prev !== this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent !== this.currentItem.parent()[0]) && !noPropagation) {
-			delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
+		if ( ( this.fromOutside || this.domPosition.prev !== this.currentItem.prev().not( ".ui-sortable-helper" )[ 0 ] || this.domPosition.parent !== this.currentItem.parent()[ 0 ] ) && !noPropagation ) {
+			delayedTriggers.push( function( event ) { this._trigger( "update", event, this._uiHash() ); } ); //Trigger update callback if the DOM position has changed
 		}
 
 		// Check if the items Container has Changed and trigger appropriate
 		// events.
-		if (this !== this.currentContainer) {
-			if(!noPropagation) {
-				delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); };  }).call(this, this.currentContainer));
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this));  }; }).call(this, this.currentContainer));
+		if ( this !== this.currentContainer ) {
+			if ( !noPropagation ) {
+				delayedTriggers.push( function( event ) { this._trigger( "remove", event, this._uiHash() ); } );
+				delayedTriggers.push( ( function( c ) { return function( event ) { c._trigger( "receive", event, this._uiHash( this ) ); };  } ).call( this, this.currentContainer ) );
+				delayedTriggers.push( ( function( c ) { return function( event ) { c._trigger( "update", event, this._uiHash( this ) );  }; } ).call( this, this.currentContainer ) );
 			}
 		}
 
-
 		//Post events to containers
 		function delayEvent( type, instance, container ) {
 			return function( event ) {
 				container._trigger( type, event, instance._uiHash( instance ) );
 			};
 		}
-		for (i = this.containers.length - 1; i >= 0; i--){
-			if (!noPropagation) {
+		for ( i = this.containers.length - 1; i >= 0; i-- ) {
+			if ( !noPropagation ) {
 				delayedTriggers.push( delayEvent( "deactivate", this, this.containers[ i ] ) );
 			}
-			if(this.containers[i].containerCache.over) {
+			if ( this.containers[ i ].containerCache.over ) {
 				delayedTriggers.push( delayEvent( "out", this, this.containers[ i ] ) );
-				this.containers[i].containerCache.over = 0;
+				this.containers[ i ].containerCache.over = 0;
 			}
 		}
 
@@ -1271,21 +1270,21 @@ return $.widget("ui.sortable", $.ui.mouse, {
 			this.document.find( "body" ).css( "cursor", this.storedCursor );
 			this.storedStylesheet.remove();
 		}
-		if(this._storedOpacity) {
-			this.helper.css("opacity", this._storedOpacity);
+		if ( this._storedOpacity ) {
+			this.helper.css( "opacity", this._storedOpacity );
 		}
-		if(this._storedZIndex) {
-			this.helper.css("zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex);
+		if ( this._storedZIndex ) {
+			this.helper.css( "zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex );
 		}
 
 		this.dragging = false;
 
-		if(!noPropagation) {
-			this._trigger("beforeStop", event, this._uiHash());
+		if ( !noPropagation ) {
+			this._trigger( "beforeStop", event, this._uiHash() );
 		}
 
 		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
-		this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+		this.placeholder[ 0 ].parentNode.removeChild( this.placeholder[ 0 ] );
 
 		if ( !this.cancelHelperRemoval ) {
 			if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
@@ -1294,11 +1293,11 @@ return $.widget("ui.sortable", $.ui.mouse, {
 			this.helper = null;
 		}
 
-		if(!noPropagation) {
-			for (i=0; i < delayedTriggers.length; i++) {
-				delayedTriggers[i].call(this, event);
+		if ( !noPropagation ) {
+			for ( i = 0; i < delayedTriggers.length; i++ ) {
+				delayedTriggers[ i ].call( this, event );
 			} //Trigger all delayed events
-			this._trigger("stop", event, this._uiHash());
+			this._trigger( "stop", event, this._uiHash() );
 		}
 
 		this.fromOutside = false;
@@ -1307,16 +1306,16 @@ return $.widget("ui.sortable", $.ui.mouse, {
 	},
 
 	_trigger: function() {
-		if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
+		if ( $.Widget.prototype._trigger.apply( this, arguments ) === false ) {
 			this.cancel();
 		}
 	},
 
-	_uiHash: function(_inst) {
+	_uiHash: function( _inst ) {
 		var inst = _inst || this;
 		return {
 			helper: inst.helper,
-			placeholder: inst.placeholder || $([]),
+			placeholder: inst.placeholder || $( [] ),
 			position: inst.position,
 			originalPosition: inst.originalPosition,
 			offset: inst.positionAbs,
@@ -1325,6 +1324,6 @@ return $.widget("ui.sortable", $.ui.mouse, {
 		};
 	}
 
-});
+} );
 
-}));
+} ) );

From 369effd8cce14dcc43f4672706805e90f596b8cc Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 08:58:09 -0400
Subject: [PATCH 06/27] Slider: Style updates

Ref #14246
---
 tests/unit/slider/common.js  |   2 +-
 tests/unit/slider/core.js    |  82 ++++++++++++++--------------
 tests/unit/slider/events.js  |  78 +++++++++++++--------------
 tests/unit/slider/methods.js |  46 ++++++++--------
 tests/unit/slider/options.js | 100 +++++++++++++++++------------------
 ui/widgets/slider.js         |  58 ++++++++++----------
 6 files changed, 185 insertions(+), 181 deletions(-)

diff --git a/tests/unit/slider/common.js b/tests/unit/slider/common.js
index 5cc3e66c596..df53cda4ff3 100644
--- a/tests/unit/slider/common.js
+++ b/tests/unit/slider/common.js
@@ -30,6 +30,6 @@ common.testWidget( "slider", {
 		start: null,
 		stop: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/slider/core.js b/tests/unit/slider/core.js
index 7fdb8c68c93..109c9e01ad2 100644
--- a/tests/unit/slider/core.js
+++ b/tests/unit/slider/core.js
@@ -14,7 +14,7 @@ module( "slider: core" );
 
 test( "markup structure", function( assert ) {
 	expect( 4 );
-	var element = $( "<div>" ).slider({ range: true }),
+	var element = $( "<div>" ).slider( { range: true } ),
 		handle = element.find( "span" ),
 		range = element.find( "div" );
 
@@ -22,7 +22,7 @@ test( "markup structure", function( assert ) {
 	assert.hasClasses( range, "ui-slider-range ui-widget-header" );
 	assert.hasClasses( handle[ 0 ], "ui-slider-handle" );
 	assert.hasClasses( handle[ 1 ], "ui-slider-handle" );
-});
+} );
 
 test( "keydown HOME on handle sets value to min", function() {
 	expect( 2 );
@@ -38,7 +38,7 @@ test( "keydown HOME on handle sets value to min", function() {
 	element.slider( "value", 0 );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-	equal(element.slider( "value" ), options.min );
+	equal( element.slider( "value" ), options.min );
 
 	element.slider( "destroy" );
 
@@ -54,10 +54,10 @@ test( "keydown HOME on handle sets value to min", function() {
 	element.slider( "value", 0 );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-	equal(element.slider( "value" ), options.min) ;
+	equal( element.slider( "value" ), options.min ) ;
 
 	element.slider( "destroy" );
-});
+} );
 
 test( "keydown END on handle sets value to max", function() {
 	expect( 2 );
@@ -73,7 +73,7 @@ test( "keydown END on handle sets value to max", function() {
 	element.slider( "value", 0 );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-	equal(element.slider( "value" ), options.max) ;
+	equal( element.slider( "value" ), options.max ) ;
 
 	element.slider( "destroy" );
 
@@ -89,10 +89,10 @@ test( "keydown END on handle sets value to max", function() {
 	element.slider( "value", 0 );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-	equal(element.slider( "value" ), options.max );
+	equal( element.slider( "value" ), options.max );
 
 	element.slider( "destroy" );
-});
+} );
 
 test( "keydown PAGE_UP on handle increases value by 1/5 range, not greater than max", function() {
 	expect( 4 );
@@ -106,17 +106,17 @@ test( "keydown PAGE_UP on handle increases value by 1/5 range, not greater than
 		};
 		element.slider( options );
 
-		element.slider( "value", 70);
+		element.slider( "value", 70 );
 
 		handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal(element.slider( "value" ), 90);
+		equal( element.slider( "value" ), 90 );
 
 		handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-		equal(element.slider( "value" ), 100);
+		equal( element.slider( "value" ), 100 );
 
 		element.slider( "destroy" );
-	});
-});
+	} );
+} );
 
 test( "keydown PAGE_DOWN on handle decreases value by 1/5 range, not less than min", function() {
 	expect( 4 );
@@ -130,17 +130,17 @@ test( "keydown PAGE_DOWN on handle decreases value by 1/5 range, not less than m
 		};
 		element.slider( options );
 
-		element.slider( "value", 30);
+		element.slider( "value", 30 );
 
 		handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal(element.slider( "value" ), 10);
+		equal( element.slider( "value" ), 10 );
 
 		handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-		equal(element.slider( "value" ), 0 );
+		equal( element.slider( "value" ), 0 );
 
 		element.slider( "destroy" );
-	});
-});
+	} );
+} );
 
 test( "keydown UP on handle increases value by step, not greater than max", function() {
 	expect( 4 );
@@ -151,15 +151,15 @@ test( "keydown UP on handle increases value by step, not greater than max", func
 		orientation: "horizontal",
 		step: 1
 	};
-	element.slider(options);
+	element.slider( options );
 
 	element.slider( "value", options.max - options.step );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equal(element.slider( "value" ), options.max );
+	equal( element.slider( "value" ), options.max );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equal(element.slider( "value" ), options.max );
+	equal( element.slider( "value" ), options.max );
 
 	element.slider( "destroy" );
 
@@ -175,13 +175,13 @@ test( "keydown UP on handle increases value by step, not greater than max", func
 	element.slider( "value", options.max - options.step );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equal(element.slider( "value" ), options.max );
+	equal( element.slider( "value" ), options.max );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-	equal(element.slider( "value" ), options.max );
+	equal( element.slider( "value" ), options.max );
 
 	element.slider( "destroy" );
-});
+} );
 
 test( "keydown RIGHT on handle increases value by step, not greater than max", function() {
 	expect( 4 );
@@ -192,15 +192,15 @@ test( "keydown RIGHT on handle increases value by step, not greater than max", f
 		orientation: "horizontal",
 		step: 1
 	};
-	element.slider(options);
+	element.slider( options );
 
 	element.slider( "value", options.max - options.step );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-	equal(element.slider( "value" ), options.max);
+	equal( element.slider( "value" ), options.max );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-	equal(element.slider( "value" ), options.max );
+	equal( element.slider( "value" ), options.max );
 
 	element.slider( "destroy" );
 
@@ -216,13 +216,13 @@ test( "keydown RIGHT on handle increases value by step, not greater than max", f
 	element.slider( "value", options.max - options.step );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-	equal(element.slider( "value" ), options.max );
+	equal( element.slider( "value" ), options.max );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-	equal(element.slider( "value" ), options.max );
+	equal( element.slider( "value" ), options.max );
 
 	element.slider( "destroy" );
-});
+} );
 
 test( "keydown DOWN on handle decreases value by step, not less than min", function() {
 	expect( 4 );
@@ -238,10 +238,10 @@ test( "keydown DOWN on handle decreases value by step, not less than min", funct
 	element.slider( "value", options.min + options.step );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equal(element.slider( "value" ), options.min);
+	equal( element.slider( "value" ), options.min );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equal(element.slider( "value" ), options.min );
+	equal( element.slider( "value" ), options.min );
 
 	element.slider( "destroy" );
 
@@ -257,13 +257,13 @@ test( "keydown DOWN on handle decreases value by step, not less than min", funct
 	element.slider( "value", options.min + options.step );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equal(element.slider( "value" ), options.min);
+	equal( element.slider( "value" ), options.min );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-	equal(element.slider( "value" ), options.min );
+	equal( element.slider( "value" ), options.min );
 
 	element.slider( "destroy" );
-});
+} );
 
 test( "keydown LEFT on handle decreases value by step, not less than min", function() {
 	expect( 4 );
@@ -274,15 +274,15 @@ test( "keydown LEFT on handle decreases value by step, not less than min", funct
 		orientation: "horizontal",
 		step: 1
 	};
-	element.slider(options);
+	element.slider( options );
 
 	element.slider( "value", options.min + options.step );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-	equal(element.slider( "value" ), options.min );
+	equal( element.slider( "value" ), options.min );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-	equal(element.slider( "value" ), options.min );
+	equal( element.slider( "value" ), options.min );
 
 	element.slider( "destroy" );
 
@@ -298,12 +298,12 @@ test( "keydown LEFT on handle decreases value by step, not less than min", funct
 	element.slider( "value", options.min + options.step );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-	equal(element.slider( "value" ), options.min );
+	equal( element.slider( "value" ), options.min );
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-	equal(element.slider( "value" ), options.min );
+	equal( element.slider( "value" ), options.min );
 
 	element.slider( "destroy" );
-});
+} );
 
 } );
diff --git a/tests/unit/slider/events.js b/tests/unit/slider/events.js
index 0256a209369..2cf67b5fe17 100644
--- a/tests/unit/slider/events.js
+++ b/tests/unit/slider/events.js
@@ -13,11 +13,11 @@ test( "mouse based interaction", function() {
 	expect( 4 );
 
 	var element = $( "#slider1" )
-		.slider({
+		.slider( {
 			start: function( event ) {
 				equal( event.originalEvent.type, "mousedown", "start triggered by mousedown" );
 			},
-			slide: function( event) {
+			slide: function( event ) {
 				equal( event.originalEvent.type, "mousemove", "slider triggered by mousemove" );
 			},
 			stop: function( event ) {
@@ -26,18 +26,18 @@ test( "mouse based interaction", function() {
 			change: function( event ) {
 				equal( event.originalEvent.type, "mouseup", "change triggered by mouseup" );
 			}
-		});
+		} );
 
 	element.find( ".ui-slider-handle" ).eq( 0 )
 		.simulate( "drag", { dx: 10, dy: 10 } );
 
-});
+} );
 test( "keyboard based interaction", function() {
 	expect( 3 );
 
 	// Test keyup at end of handle slide (keyboard)
 	var element = $( "#slider1" )
-		.slider({
+		.slider( {
 			start: function( event ) {
 				equal( event.originalEvent.type, "keydown", "start triggered by keydown" );
 			},
@@ -50,113 +50,113 @@ test( "keyboard based interaction", function() {
 			change: function( event ) {
 				equal( event.originalEvent.type, "keyup", "change triggered by keyup" );
 			}
-		});
+		} );
 
 	element.find( ".ui-slider-handle" ).eq( 0 )
 		.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } )
 		.simulate( "keypress", { keyCode: $.ui.keyCode.LEFT } )
 		.simulate( "keyup", { keyCode: $.ui.keyCode.LEFT } );
 
-});
+} );
 test( "programmatic event triggers", function() {
 	expect( 6 );
 
 	// Test value method
 	var element = $( "<div></div>" )
-		.slider({
+		.slider( {
 			change: function() {
 				ok( true, "change triggered by value method" );
 			}
-		})
+		} )
 		.slider( "value", 0 );
 
 	// Test values method
 	element = $( "<div></div>" )
-		.slider({
+		.slider( {
 			values: [ 10, 20 ],
 			change: function() {
 				ok( true, "change triggered by values method" );
 			}
-		})
+		} )
 		.slider( "values", [ 80, 90 ] );
 
 	// Test value option
 	element = $( "<div></div>" )
-		.slider({
+		.slider( {
 			change: function() {
 				ok( true, "change triggered by value option" );
 			}
-		})
+		} )
 		.slider( "option", "value", 0 );
 
 	// Test values option
 	element = $( "<div></div>" )
-		.slider({
+		.slider( {
 			values: [ 10, 20 ],
 			change: function() {
 				ok( true, "change triggered by values option" );
 			}
-		})
+		} )
 		.slider( "option", "values", [ 80, 90 ] );
 
-});
+} );
 
 test( "mouse based interaction part two: when handles overlap", function() {
 	expect( 6 );
 
 	var element = $( "#slider1" )
-		.slider({
+		.slider( {
 			values: [ 0, 0, 0 ],
 			start: function( event, ui ) {
 				equal( handles.index( ui.handle ), 2, "rightmost handle activated when overlapping at minimum (#3736)" );
 			}
-		}),
+		} ),
 		handles = element.find( ".ui-slider-handle" );
 	handles.eq( 0 ).simulate( "drag", { dx: 10 } );
 	element.slider( "destroy" );
 
 	element = $( "#slider1" )
-		.slider({
+		.slider( {
 			values: [ 10, 10, 10 ],
 			max: 10,
 			start: function( event, ui ) {
 				equal( handles.index( ui.handle ), 0, "leftmost handle activated when overlapping at maximum" );
 			}
-		}),
+		} ),
 		handles = element.find( ".ui-slider-handle" );
 	handles.eq( 0 ).simulate( "drag", { dx: -10 } );
 	element.slider( "destroy" );
 
 	element = $( "#slider1" )
-		.slider({
+		.slider( {
 			values: [ 19, 20 ]
-		}),
+		} ),
 		handles = element.find( ".ui-slider-handle" );
 	handles.eq( 0 ).simulate( "drag", { dx: 10 } );
 	element.one( "slidestart", function( event, ui ) {
 		equal( handles.index( ui.handle ), 0, "left handle activated if left was moved last" );
-	});
+	} );
 	handles.eq( 0 ).simulate( "drag", { dx: 10 } );
 	element.slider( "destroy" );
 
 	element = $( "#slider1" )
-		.slider({
+		.slider( {
 			values: [ 19, 20 ]
-		}),
+		} ),
 		handles = element.find( ".ui-slider-handle" );
 	handles.eq( 1 ).simulate( "drag", { dx: -10 } );
 	element.one( "slidestart", function( event, ui ) {
 		equal( handles.index( ui.handle ), 1, "right handle activated if right was moved last (#3467)" );
-	});
+	} );
 	handles.eq( 0 ).simulate( "drag", { dx: 10 } );
 
 	element = $( "#slider1" )
-		.slider({
+		.slider( {
 			range: true,
 			min: 0,
 			max: 100,
 			values: [ 0, 50 ]
-		}),
+		} ),
 		handles = element.find( ".ui-slider-handle" );
 
 	element.slider( "option", { values: [ 100, 100 ] } );
@@ -166,7 +166,7 @@ test( "mouse based interaction part two: when handles overlap", function() {
 	element.slider( "option", { values: [ 0, 0 ] } );
 	handles.eq( 1 ).simulate( "drag", { dx: 10 } );
 	equal( element.slider( "values" )[ 1 ], 1, "setting both values of range slider to the minimum  doesn't lock slider" );
-});
+} );
 
 test( "event data", function() {
 	expect( 6 );
@@ -175,7 +175,7 @@ test( "event data", function() {
 		values = [ 8, 9, 7, 4 ],
 		newValues = [ 8, 9, 7, 5 ],
 		element = $( "#slider1" )
-			.slider({
+			.slider( {
 				values: values,
 				start: function( event, ui ) {
 					deepEqual( ui, expectedUiHash, "passing ui to start event" );
@@ -189,7 +189,7 @@ test( "event data", function() {
 				change: function( event, ui ) {
 					deepEqual( ui, expectedChangedUiHash, "passing ui to change event" );
 				}
-			}),
+			} ),
 		handles = element.find( ".ui-slider-handle" ),
 		expectedUiHash = {
 			handle: handles.eq( slideHandleIndex )[ 0 ],
@@ -200,33 +200,33 @@ test( "event data", function() {
 		expectedChangedUiHash = $.extend( {}, expectedUiHash, {
 			values: newValues,
 			value: newValues[ slideHandleIndex ]
-		});
+		} );
 
 	handles.eq( slideHandleIndex ).simulate( "drag", { dx: 10 } );
 
 	element.slider( "destroy" );
-	element = $( "#slider1" ).slider({
+	element = $( "#slider1" ).slider( {
 		min: 0,
 		max: 100,
 		value: 1,
-		slide: function ( event, ui ) {
+		slide: function( event, ui ) {
 			equal( ui.value, 0, "should pass 0 value if slider reaches it" );
 		}
-	});
+	} );
 	handles = element.find( ".ui-slider-handle" );
 	handles.eq( 0 ).simulate( "drag", { dx: -10 } );
 
 	element.slider( "destroy" );
-	element = $( "#slider1" ).slider({
+	element = $( "#slider1" ).slider( {
 		min: 0,
 		max: 100,
 		values: [ 1, 2 ],
-		slide: function ( event, ui ) {
+		slide: function( event, ui ) {
 			equal( ui.value, 0, "should pass 0 value if one of handles reaches it" );
 		}
-	});
+	} );
 	handles = element.find( ".ui-slider-handle" );
 	handles.eq( 0 ).simulate( "drag", { dx: -10 } );
-});
+} );
 
 } );
diff --git a/tests/unit/slider/methods.js b/tests/unit/slider/methods.js
index a4187bd7ffb..15b2e8726f9 100644
--- a/tests/unit/slider/methods.js
+++ b/tests/unit/slider/methods.js
@@ -6,7 +6,7 @@ define( [
 module( "slider: methods" );
 
 test( "init", function() {
-	expect(5);
+	expect( 5 );
 
 	$( "<div></div>" ).appendTo( "body" ).slider().remove();
 	ok( true, ".slider() called on element" );
@@ -24,65 +24,67 @@ test( "init", function() {
 
 	$( "<div></div>" ).slider().slider( "option", "foo", "bar" ).remove();
 	ok( true, "arbitrary option setter after init" );
-});
+} );
 
 test( "destroy", function( assert ) {
 	expect( 1 );
 	assert.domEqual( "#slider1", function() {
 		$( "#slider1" ).slider().slider( "destroy" );
-	});
-});
+	} );
+} );
 
 test( "enable", function( assert ) {
 	expect( 3 );
 	var element,
 		expected = $( "<div></div>" ).slider(),
 		actual = expected.slider( "enable" );
-	equal(actual, expected, "enable is chainable" );
+	equal( actual, expected, "enable is chainable" );
 
-	element = $( "<div></div>" ).slider({ disabled: true });
+	element = $( "<div></div>" ).slider( { disabled: true } );
 	assert.hasClasses( element, "ui-state-disabled ui-slider-disabled" );
 	element.slider( "enable" );
 	assert.lacksClasses( element, "ui-state-disabled ui-slider-disabled" );
-});
+} );
 
 test( "disable", function( assert ) {
 	expect( 4 );
 	var element,
 		expected = $( "<div></div>" ).slider(),
 		actual = expected.slider( "disable" );
-	equal(actual, expected, "disable is chainable" );
+	equal( actual, expected, "disable is chainable" );
 
-	element = $( "<div></div>" ).slider({ disabled: false });
+	element = $( "<div></div>" ).slider( { disabled: false } );
 	assert.lacksClasses( element, "ui-state-disabled ui-slider-disabled" );
 	element.slider( "disable" );
 	assert.hasClasses( element, "ui-state-disabled ui-slider-disabled" );
 	ok( !element.attr( "aria-disabled" ), "slider does not have aria-disabled attr after disable method call" );
-});
+} );
 
 test( "value", function() {
 	expect( 19 );
-	$( [ false, "min", "max" ] ).each(function() {
-		var element = $( "<div></div>" ).slider({
+	$( [ false, "min", "max" ] ).each( function() {
+		var element = $( "<div></div>" ).slider( {
 			range: this,
 			value: 5
-		});
+		} );
 		equal( element.slider( "value" ), 5, "range: " + this + " slider method get" );
-		equal( element.slider( "value", 10), element, "value method is chainable" );
+		equal( element.slider( "value", 10 ), element, "value method is chainable" );
 		equal( element.slider( "value" ), 10, "range: " + this + " slider method set" );
 		element.remove();
-	});
-	var element = $( "<div></div>" ).slider({
+	} );
+	var element = $( "<div></div>" ).slider( {
 		min: -1, value: 0, max: 1
-	});
+	} );
+
 	// min with value option vs value method
 	element.slider( "option", "value", -2 );
 	equal( element.slider( "option", "value" ), -2, "value option does not respect min" );
 	equal( element.slider( "value" ), -1, "value method get respects min" );
 	equal( element.slider( "value", -2 ), element, "value method is chainable" );
 	equal( element.slider( "option", "value" ), -1, "value method set respects min" );
+
 	// max with value option vs value method
-	element.slider( "option", "value", 2);
+	element.slider( "option", "value", 2 );
 	equal( element.slider( "option", "value" ), 2, "value option does not respect max" );
 	equal( element.slider( "value" ), 1, "value method get respects max" );
 	equal( element.slider( "value", 2 ), element, "value method is chainable" );
@@ -94,20 +96,20 @@ test( "value", function() {
 		value: 2,
 		max: 2.4,
 		step: 0.01
-	});
+	} );
 	element.slider( "option", "value", 2.4 );
 	equal( element.slider( "value" ), 2.4, "value is set to max with 0.01 step" );
 
-	element = $( "<div></div>" ).slider({
+	element = $( "<div></div>" ).slider( {
 		value: 100,
 		min: 10,
 		max: 500,
 		step: 50
-	});
+	} );
 
 	element.slider( "option", "value", 510 );
 	equal( element.slider( "value" ), 460, "value is restricted to maximum valid step" );
-});
+} );
 
 //test( "values", function() {
 //	ok(false, "missing test - untested code is broken code." );
diff --git a/tests/unit/slider/options.js b/tests/unit/slider/options.js
index f6b61a2b362..031031cdc81 100644
--- a/tests/unit/slider/options.js
+++ b/tests/unit/slider/options.js
@@ -11,18 +11,18 @@ function handle() {
 
 module( "slider: options" );
 
-test( "disabled", function( assert ){
+test( "disabled", function( assert ) {
 	expect( 8 );
 	var count = 0;
 
 	element = $( "#slider1" ).slider();
 	element.on( "slidestart", function() {
 		count++;
-	});
+	} );
 
 	// Enabled
 	assert.lacksClasses( element, "ui-slider-disabled" );
-	equal( element.slider( "option", "disabled" ), false , "is not disabled" );
+	equal( element.slider( "option", "disabled" ), false, "is not disabled" );
 
 	handle().simulate( "drag", { dx: 10 } );
 	equal( count, 1, "slider moved" );
@@ -40,7 +40,7 @@ test( "disabled", function( assert ){
 
 	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
 	equal( count, 2, "slider did not move" );
-});
+} );
 
 test( "max", function() {
 	expect( 5 );
@@ -87,7 +87,7 @@ test( "max", function() {
 	ok( element.slider( "value" ) === options.max, "value method will max, step is changed and step is float" );
 	element.slider( "destroy" );
 
-});
+} );
 
 test( "min", function() {
 	expect( 2 );
@@ -106,7 +106,7 @@ test( "min", function() {
 	ok( element.slider( "value" ) === options.min, "value method is contained by min" );
 	element.slider( "destroy" );
 
-});
+} );
 
 test( "orientation", function( assert ) {
 	expect( 14 );
@@ -126,7 +126,7 @@ test( "orientation", function( assert ) {
 	assert.hasClasses( element, "ui-slider-horizontal" );
 	assert.lacksClasses( element, "ui-slider-vertical" );
 	equal( element.find( ".ui-slider-handle" )[ 0 ].style.bottom, "", "CSS bottom reset" );
-	equal( handle()[0].style.left, percentVal + "%", "horizontal slider handle is positioned with left: %" );
+	equal( handle()[ 0 ].style.left, percentVal + "%", "horizontal slider handle is positioned with left: %" );
 
 	element.slider( "destroy" ) ;
 
@@ -143,17 +143,17 @@ test( "orientation", function( assert ) {
 	assert.hasClasses( element, "ui-slider-vertical" );
 	assert.lacksClasses( element, "ui-slider-horizontal" );
 	equal( element.find( ".ui-slider-handle" )[ 0 ].style.left, "", "CSS left reset" );
-	equal( handle()[0].style.bottom, percentVal + "%", "vertical slider handle is positioned with bottom: %" );
+	equal( handle()[ 0 ].style.bottom, percentVal + "%", "vertical slider handle is positioned with bottom: %" );
 
 	element.slider( "destroy" );
 
 	newValue = 7;
-	rangeSize = 500 - (500 * newValue / 10);
-	element = $( "#slider2" ).slider({
+	rangeSize = 500 - ( 500 * newValue / 10 );
+	element = $( "#slider2" ).slider( {
 		range: "max",
 		min: 0,
 		max: 10
-	});
+	} );
 
 	element.slider( "option", "value", newValue );
 	element.slider( "option", "orientation", "vertical" );
@@ -170,11 +170,11 @@ test( "orientation", function( assert ) {
 
 	element.slider( "destroy" );
 
-	element = $( "#slider2" ).slider({
+	element = $( "#slider2" ).slider( {
 		range: true,
 		min: 0,
 		max: 100
-	});
+	} );
 	element.slider( "option", { values: [ 60, 70 ] } );
 	notEqual( element.find( ".ui-slider-range " ).position().left, 0,
 		"range should not pull over to the track's border" );
@@ -183,19 +183,19 @@ test( "orientation", function( assert ) {
 		"range should pull over to the track's border" );
 
 	element.slider( "destroy" );
-});
+} );
 
 //spec: http://wiki.jqueryui.com/Slider#specs
 // value option/method: the value option is not restricted by min/max/step.
 // What is returned by the value method is restricted by min (>=), max (<=), and step (even multiple)
 test( "step", function() {
 	expect( 9 );
-	element = $( "<div></div>" ).slider({
+	element = $( "<div></div>" ).slider( {
 		min: 0,
 		value: 0,
 		step: 10,
 		max: 100
-	});
+	} );
 	equal( element.slider( "value" ), 0 );
 
 	element.slider( "value", 1 );
@@ -210,12 +210,12 @@ test( "step", function() {
 	element.slider( "value", 19 );
 	equal( element.slider( "value" ), 20 );
 
-	element = $( "<div></div>" ).slider({
+	element = $( "<div></div>" ).slider( {
 		min: 0,
 		value: 0,
 		step: 20,
 		max: 100
-	});
+	} );
 	element.slider( "value", 0 );
 
 	element.slider( "option", "value", 1 );
@@ -231,7 +231,7 @@ test( "step", function() {
 	equal( element.slider( "value" ), 20 );
 
 	element.slider( "destroy" );
-});
+} );
 
 //test( "value", function() {
 //	ok(false, "missing test - untested code is broken code." );
@@ -243,13 +243,13 @@ test( "values", function() {
 	// Testing multiple ranges on the same page, the object reference to the values
 	// property is preserved via multiple range elements, so updating options.values
 	// of 1 slider updates options.values of all the others
-	var ranges = $([
+	var ranges = $( [
 		document.createElement( "div" ),
 		document.createElement( "div" )
-	]).slider({
+	] ).slider( {
 		range: true,
 		values: [ 25, 75 ]
-	});
+	} );
 
 	notStrictEqual(
 		ranges.eq( 0 ).slider( "instance" ).options.values,
@@ -264,43 +264,43 @@ test( "values", function() {
 		ranges.eq( 1 ).slider( "values", 0 ),
 		"the values for multiple sliders should be different"
 	);
-});
+} );
 
 test( "range", function( assert ) {
 	expect( 32 );
 	var range;
 
 	// Min
-	element = $( "<div></div>" ).slider({
+	element = $( "<div></div>" ).slider( {
 		range: "min",
 		min: 1,
 		max: 10,
 		step: 1
-	});
+	} );
 
 	equal( element.find( ".ui-slider-handle" ).length, 1, "range min, one handle" );
 	equal( element.find( ".ui-slider-range-min" ).length, 1, "range min" );
 	element.slider( "destroy" );
 
 	// Max
-	element = $( "<div></div>" ).slider({
+	element = $( "<div></div>" ).slider( {
 		range: "max",
 		min: 1,
 		max: 10,
 		step: 1
-	});
+	} );
 
 	equal( element.find( ".ui-slider-handle" ).length, 1, "range max, one handle" );
 	equal( element.find( ".ui-slider-range-max" ).length, 1, "range max" );
 	element.slider( "destroy" );
 
 	// True
-	element = $( "<div></div>" ).slider({
+	element = $( "<div></div>" ).slider( {
 		range: true,
 		min: 1,
 		max: 10,
 		step: 1
-	});
+	} );
 
 	range = element.find( ".ui-slider-range" );
 	equal( element.find( ".ui-slider-handle" ).length, 2, "range true, two handles" );
@@ -308,12 +308,12 @@ test( "range", function( assert ) {
 	element.slider( "destroy" );
 
 	// Change range from min to max
-	element = $( "<div></div>" ).slider({
+	element = $( "<div></div>" ).slider( {
 		range: "min",
 		min: 1,
 		max: 10,
 		step: 1
-	}).slider( "option", "range", "max" );
+	} ).slider( "option", "range", "max" );
 
 	equal( element.find( ".ui-slider-handle" ).length, 1, "range switch from min to max, one handle" );
 	equal( element.find( ".ui-slider-range-min" ).length, 0, "range switch from min to max" );
@@ -321,12 +321,12 @@ test( "range", function( assert ) {
 	element.slider( "destroy" );
 
 	// Change range from max to min
-	element = $( "<div></div>" ).slider({
+	element = $( "<div></div>" ).slider( {
 		range: "max",
 		min: 1,
 		max: 10,
 		step: 1
-	}).slider( "option", "range", "min" );
+	} ).slider( "option", "range", "min" );
 
 	equal( element.find( ".ui-slider-handle" ).length, 1, "range switch from max to min, one handle" );
 	equal( element.find( ".ui-slider-range-max" ).length, 0, "range switch from max to min" );
@@ -334,53 +334,53 @@ test( "range", function( assert ) {
 	element.slider( "destroy" );
 
 	// Change range from max to true
-	element = $( "<div></div>" ).slider({
+	element = $( "<div></div>" ).slider( {
 		range: "max",
 		min: 1,
 		max: 10,
 		step: 1
-	}).slider( "option", "range", true );
+	} ).slider( "option", "range", true );
 
 	equal( element.find( ".ui-slider-handle" ).length, 2, "range switch from max to true, two handles" );
 	equal( element.find( ".ui-slider-range-max" ).length, 0, "range switch from max to true" );
 	equal( element.find( ".ui-slider-range-min" ).length, 0, "range switch from max to true" );
-	equal( element.slider( "option", "value" ), 0 , "option value" );
-	equal( element.slider( "value" ), 1 , "value" );
-	deepEqual( element.slider( "option", "values" ), [1, 1], "option values" );
-	deepEqual( element.slider( "values" ), [1, 1], "values" );
+	equal( element.slider( "option", "value" ), 0, "option value" );
+	equal( element.slider( "value" ), 1, "value" );
+	deepEqual( element.slider( "option", "values" ), [ 1, 1 ], "option values" );
+	deepEqual( element.slider( "values" ), [ 1, 1 ], "values" );
 	element.slider( "destroy" );
 
 	// Change range from true to min
-	element = $( "<div></div>" ).slider({
+	element = $( "<div></div>" ).slider( {
 		range: true,
 		min: 1,
 		max: 10,
 		step: 1
-	}).slider( "option", "range", "min" );
+	} ).slider( "option", "range", "min" );
 
 	equal( element.find( ".ui-slider-handle" ).length, 1, "range switch from true to min, one handle" );
 	equal( element.find( ".ui-slider-range-max" ).length, 0, "range switch from true to min" );
 	equal( element.find( ".ui-slider-range-min" ).length, 1, "range switch from true to min" );
 	equal( element.slider( "option", "value" ), 1, "value" );
-	equal( element.slider( "value" ), 1 , "value" );
+	equal( element.slider( "value" ), 1, "value" );
 	equal( element.slider( "option", "values" ), null, "values" );
-	deepEqual( element.slider( "values" ), [] , "values" );
+	deepEqual( element.slider( "values" ), [], "values" );
 	element.slider( "destroy" );
 
 	// Change range from true to false
-	element = $( "<div></div>" ).slider({
+	element = $( "<div></div>" ).slider( {
 		range: true,
 		min: 1,
 		max: 10,
 		step: 1
-	}).slider( "option", "range", false );
+	} ).slider( "option", "range", false );
 	equal( element.find( ".ui-slider-handle" ).length, 2, "range switch from true to false, both handles remain" );
 	equal( element.find( ".ui-slider-range" ).length, 0, "range switch from true to false" );
-	equal( element.slider( "option", "value" ), 0 , "option value" );
-	equal( element.slider( "value" ), 1 , "value" );
-	deepEqual( element.slider( "option", "values" ), [1, 1], "option values" );
-	deepEqual( element.slider( "values" ), [1, 1], "values" );
+	equal( element.slider( "option", "value" ), 0, "option value" );
+	equal( element.slider( "value" ), 1, "value" );
+	deepEqual( element.slider( "option", "values" ), [ 1, 1 ], "option values" );
+	deepEqual( element.slider( "values" ), [ 1, 1 ], "values" );
 	element.slider( "destroy" );
-});
+} );
 
 } );
diff --git a/ui/widgets/slider.js b/ui/widgets/slider.js
index 792fa4da2da..5c4f252d596 100644
--- a/ui/widgets/slider.js
+++ b/ui/widgets/slider.js
@@ -16,11 +16,11 @@
 //>>css.structure: ../themes/base/slider.css
 //>>css.theme: ../themes/base/theme.css
 
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([
+		define( [
 			"jquery",
 			"./mouse",
 			"../keycode",
@@ -32,7 +32,7 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}(function( $ ) {
+}( function( $ ) {
 
 return $.widget( "ui.slider", $.ui.mouse, {
 	version: "@VERSION",
@@ -117,9 +117,9 @@ return $.widget( "ui.slider", $.ui.mouse, {
 
 		this.handle = this.handles.eq( 0 );
 
-		this.handles.each(function( i ) {
+		this.handles.each( function( i ) {
 			$( this ).data( "ui-slider-handle-index", i );
-		});
+		} );
 	},
 
 	_createRange: function() {
@@ -130,9 +130,9 @@ return $.widget( "ui.slider", $.ui.mouse, {
 				if ( !options.values ) {
 					options.values = [ this._valueMin(), this._valueMin() ];
 				} else if ( options.values.length && options.values.length !== 2 ) {
-					options.values = [ options.values[0], options.values[0] ];
+					options.values = [ options.values[ 0 ], options.values[ 0 ] ];
 				} else if ( $.isArray( options.values ) ) {
-					options.values = options.values.slice(0);
+					options.values = options.values.slice( 0 );
 				}
 			}
 
@@ -145,10 +145,10 @@ return $.widget( "ui.slider", $.ui.mouse, {
 				this._removeClass( this.range, "ui-slider-range-min ui-slider-range-max" );
 
 				// Handle range switching from true to min/max
-				this.range.css({
+				this.range.css( {
 					"left": "",
 					"bottom": ""
-				});
+				} );
 			}
 			if ( options.range === "min" || options.range === "max" ) {
 				this._addClass( this.range, "ui-slider-range-" + options.range );
@@ -195,16 +195,16 @@ return $.widget( "ui.slider", $.ui.mouse, {
 		position = { x: event.pageX, y: event.pageY };
 		normValue = this._normValueFromMouse( position );
 		distance = this._valueMax() - this._valueMin() + 1;
-		this.handles.each(function( i ) {
-			var thisDistance = Math.abs( normValue - that.values(i) );
-			if (( distance > thisDistance ) ||
+		this.handles.each( function( i ) {
+			var thisDistance = Math.abs( normValue - that.values( i ) );
+			if ( ( distance > thisDistance ) ||
 				( distance === thisDistance &&
-					(i === that._lastChangedValue || that.values(i) === o.min ))) {
+					( i === that._lastChangedValue || that.values( i ) === o.min ) ) ) {
 				distance = thisDistance;
 				closestHandle = $( this );
 				index = i;
 			}
-		});
+		} );
 
 		allowed = this._start( event, index );
 		if ( allowed === false ) {
@@ -223,9 +223,9 @@ return $.widget( "ui.slider", $.ui.mouse, {
 			left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
 			top: event.pageY - offset.top -
 				( closestHandle.height() / 2 ) -
-				( parseInt( closestHandle.css("borderTopWidth"), 10 ) || 0 ) -
-				( parseInt( closestHandle.css("borderBottomWidth"), 10 ) || 0) +
-				( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
+				( parseInt( closestHandle.css( "borderTopWidth" ), 10 ) || 0 ) -
+				( parseInt( closestHandle.css( "borderBottomWidth" ), 10 ) || 0 ) +
+				( parseInt( closestHandle.css( "marginTop" ), 10 ) || 0 )
 		};
 
 		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
@@ -361,6 +361,7 @@ return $.widget( "ui.slider", $.ui.mouse, {
 
 	_change: function( event, index ) {
 		if ( !this._keySliding && !this._mouseSliding ) {
+
 			//store the last changed value index for reference when handles overlap
 			this._lastChangedValue = index;
 			this._trigger( "change", event, this._uiHash( index ) );
@@ -503,10 +504,11 @@ return $.widget( "ui.slider", $.ui.mouse, {
 
 			return val;
 		} else if ( this._hasMultipleValues() ) {
+
 			// .slice() creates a copy of the array
 			// this copy gets trimmed by min and max and then returned
 			vals = this.options.values.slice();
-			for ( i = 0; i < vals.length; i += 1) {
+			for ( i = 0; i < vals.length; i += 1 ) {
 				vals[ i ] = this._trimAlignValue( vals[ i ] );
 			}
 
@@ -525,16 +527,16 @@ return $.widget( "ui.slider", $.ui.mouse, {
 			return this._valueMax();
 		}
 		var step = ( this.options.step > 0 ) ? this.options.step : 1,
-			valModStep = (val - this._valueMin()) % step,
+			valModStep = ( val - this._valueMin() ) % step,
 			alignValue = val - valModStep;
 
-		if ( Math.abs(valModStep) * 2 >= step ) {
+		if ( Math.abs( valModStep ) * 2 >= step ) {
 			alignValue += ( valModStep > 0 ) ? step : ( -step );
 		}
 
 		// Since JavaScript has problems with large floats, round
 		// the final value to 5 digits after the decimal point (see #4124)
-		return parseFloat( alignValue.toFixed(5) );
+		return parseFloat( alignValue.toFixed( 5 ) );
 	},
 
 	_calculateNewMax: function() {
@@ -568,7 +570,7 @@ return $.widget( "ui.slider", $.ui.mouse, {
 		return this.max;
 	},
 
-	_refreshRange: function ( orientation ) {
+	_refreshRange: function( orientation ) {
 		if ( orientation === "vertical" ) {
 			this.range.css( { "width": "", "left": "" } );
 		}
@@ -586,8 +588,8 @@ return $.widget( "ui.slider", $.ui.mouse, {
 			_set = {};
 
 		if ( this._hasMultipleValues() ) {
-			this.handles.each(function( i ) {
-				valPercent = ( that.values(i) - that._valueMin() ) / ( that._valueMax() - that._valueMin() ) * 100;
+			this.handles.each( function( i ) {
+				valPercent = ( that.values( i ) - that._valueMin() ) / ( that._valueMax() - that._valueMin() ) * 100;
 				_set[ that.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
 				$( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
 				if ( that.options.range === true ) {
@@ -608,7 +610,7 @@ return $.widget( "ui.slider", $.ui.mouse, {
 					}
 				}
 				lastValPercent = valPercent;
-			});
+			} );
 		} else {
 			value = this.value();
 			valueMin = this._valueMin();
@@ -681,7 +683,7 @@ return $.widget( "ui.slider", $.ui.mouse, {
 					break;
 				case $.ui.keyCode.PAGE_DOWN:
 					newVal = this._trimAlignValue(
-						curVal - ( (this._valueMax() - this._valueMin()) / this.numPages ) );
+						curVal - ( ( this._valueMax() - this._valueMin() ) / this.numPages ) );
 					break;
 				case $.ui.keyCode.UP:
 				case $.ui.keyCode.RIGHT:
@@ -712,6 +714,6 @@ return $.widget( "ui.slider", $.ui.mouse, {
 			}
 		}
 	}
-});
+} );
 
-}));
+} ) );

From 03717b3a315fc774c751afb594f28a2f478dda6b Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 08:58:20 -0400
Subject: [PATCH 07/27] Selectable: Style updates

Ref #14246
---
 tests/unit/selectable/common.js  |   2 +-
 tests/unit/selectable/events.js  |  30 +++---
 tests/unit/selectable/methods.js |  90 ++++++++--------
 tests/unit/selectable/options.js |  54 +++++-----
 ui/widgets/selectable.js         | 174 ++++++++++++++++---------------
 5 files changed, 179 insertions(+), 171 deletions(-)

diff --git a/tests/unit/selectable/common.js b/tests/unit/selectable/common.js
index 460ea0602a0..70b94bbb99e 100644
--- a/tests/unit/selectable/common.js
+++ b/tests/unit/selectable/common.js
@@ -24,6 +24,6 @@ common.testWidget( "selectable", {
 		unselected: null,
 		unselecting: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/selectable/events.js b/tests/unit/selectable/events.js
index 5d4e48996f1..0e2e1384d1b 100644
--- a/tests/unit/selectable/events.js
+++ b/tests/unit/selectable/events.js
@@ -4,37 +4,37 @@ define( [
 	"ui/widgets/selectable"
 ], function( $, testHelpers ) {
 
-module("selectable: events");
+module( "selectable: events" );
 
 test( "start", function() {
 	expect( 2 );
-	var el = $("#selectable1");
-	el.selectable({
+	var el = $( "#selectable1" );
+	el.selectable( {
 		start: function() {
 			ok( true, "drag fired start callback" );
-			equal( this, el[0], "context of callback" );
+			equal( this, el[ 0 ], "context of callback" );
 		}
-	});
+	} );
 	el.simulate( "drag", {
 		dx: 20,
 		dy: 20
-	});
-});
+	} );
+} );
 
 test( "stop", function() {
 	expect( 2 );
-	var el = $("#selectable1");
-	el.selectable({
+	var el = $( "#selectable1" );
+	el.selectable( {
 		start: function() {
 			ok( true, "drag fired stop callback" );
-			equal( this, el[0], "context of callback" );
+			equal( this, el[ 0 ], "context of callback" );
 		}
-	});
+	} );
 	el.simulate( "drag", {
 		dx: 20,
 		dy: 20
-	});
-});
+	} );
+} );
 
 test( "mousedown: initial position of helper", function() {
 	expect( 2 );
@@ -48,7 +48,7 @@ test( "mousedown: initial position of helper", function() {
 	element.simulate( "mousedown", {
 		clientX: 10,
 		clientY: 10
-	});
+	} );
 
 	helperOffset = $( ".ui-selectable-helper" ).offset();
 	ok( helperOffset.top, 110, "Scroll top should be accounted for." );
@@ -58,6 +58,6 @@ test( "mousedown: initial position of helper", function() {
 	element.simulate( "mouseup" );
 	contentToForceScroll.remove();
 	$( window ).scrollTop( 0 ).scrollLeft( 0 );
-});
+} );
 
 } );
diff --git a/tests/unit/selectable/methods.js b/tests/unit/selectable/methods.js
index ee60e4ebfb0..30160e975e6 100644
--- a/tests/unit/selectable/methods.js
+++ b/tests/unit/selectable/methods.js
@@ -3,73 +3,73 @@ define( [
 	"ui/widgets/selectable"
 ], function( $ ) {
 
-module("selectable: methods");
+module( "selectable: methods" );
 
-test("init", function() {
+test( "init", function() {
 	expect( 5 );
 
-	$("<div></div>").appendTo("body").selectable().remove();
-	ok(true, ".selectable() called on element");
+	$( "<div></div>" ).appendTo( "body" ).selectable().remove();
+	ok( true, ".selectable() called on element" );
 
-	$([]).selectable().remove();
-	ok(true, ".selectable() called on empty collection");
+	$( [] ).selectable().remove();
+	ok( true, ".selectable() called on empty collection" );
 
-	$("<div></div>").selectable().remove();
-	ok(true, ".selectable() called on disconnected DOMElement");
+	$( "<div></div>" ).selectable().remove();
+	ok( true, ".selectable() called on disconnected DOMElement" );
 
-	var el = $("<div></div>").selectable();
-	el.selectable("option", "foo");
+	var el = $( "<div></div>" ).selectable();
+	el.selectable( "option", "foo" );
 	el.remove();
-	ok(true, "arbitrary option getter after init");
+	ok( true, "arbitrary option getter after init" );
 
-	$("<div></div>").selectable().selectable("option", "foo", "bar").remove();
-	ok(true, "arbitrary option setter after init");
-});
+	$( "<div></div>" ).selectable().selectable( "option", "foo", "bar" ).remove();
+	ok( true, "arbitrary option setter after init" );
+} );
 
-test("destroy", function() {
+test( "destroy", function() {
 	expect( 4 );
 
-	$("<div></div>").appendTo("body").selectable().selectable("destroy").remove();
-	ok(true, ".selectable('destroy') called on element");
+	$( "<div></div>" ).appendTo( "body" ).selectable().selectable( "destroy" ).remove();
+	ok( true, ".selectable('destroy') called on element" );
 
-	$([]).selectable().selectable("destroy").remove();
-	ok(true, ".selectable('destroy') called on empty collection");
+	$( [] ).selectable().selectable( "destroy" ).remove();
+	ok( true, ".selectable('destroy') called on empty collection" );
 
-	$("<div></div>").selectable().selectable("destroy").remove();
-	ok(true, ".selectable('destroy') called on disconnected DOMElement");
+	$( "<div></div>" ).selectable().selectable( "destroy" ).remove();
+	ok( true, ".selectable('destroy') called on disconnected DOMElement" );
 
-	var expected = $("<div></div>").selectable(),
-		actual = expected.selectable("destroy");
-	equal(actual, expected, "destroy is chainable");
-});
+	var expected = $( "<div></div>" ).selectable(),
+		actual = expected.selectable( "destroy" );
+	equal( actual, expected, "destroy is chainable" );
+} );
 
-test("enable", function() {
-	expect(3);
+test( "enable", function() {
+	expect( 3 );
 	var expected, actual,
 		fired = false,
-		el = $("#selectable1");
+		el = $( "#selectable1" );
 
-	el.selectable({
+	el.selectable( {
 		disabled: true,
 		start: function() { fired = true; }
-	});
+	} );
 	el.simulate( "drag", {
 		dx: 20,
 		dy: 20
-	});
-	equal(fired, false, "start fired");
-	el.selectable("enable");
+	} );
+	equal( fired, false, "start fired" );
+	el.selectable( "enable" );
 	el.simulate( "drag", {
 		dx: 20,
 		dy: 20
-	});
-	equal(fired, true, "start fired");
-	el.selectable("destroy");
+	} );
+	equal( fired, true, "start fired" );
+	el.selectable( "destroy" );
 
-	expected = $("<div></div>").selectable();
-	actual = expected.selectable("enable");
-	equal(actual, expected, "enable is chainable");
-});
+	expected = $( "<div></div>" ).selectable();
+	actual = expected.selectable( "enable" );
+	equal( actual, expected, "enable is chainable" );
+} );
 
 test( "disable", function( assert ) {
 	expect( 6 );
@@ -77,16 +77,16 @@ test( "disable", function( assert ) {
 		fired = false,
 		element = $( "#selectable1" );
 
-	element.selectable({
+	element.selectable( {
 		disabled: false,
 		start: function() {
 			fired = true;
 		}
-	});
+	} );
 	element.simulate( "drag", {
 		dx: 20,
 		dy: 20
-	});
+	} );
 	equal( fired, true, "start fired" );
 
 	chainable = element.selectable( "disable" );
@@ -95,7 +95,7 @@ test( "disable", function( assert ) {
 	element.simulate( "drag", {
 		dx: 20,
 		dy: 20
-	});
+	} );
 	equal( fired, false, "start fired" );
 
 	assert.lacksClasses( element.selectable( "widget" ), "ui-state-disabled" );
@@ -106,6 +106,6 @@ test( "disable", function( assert ) {
 	element.selectable( "destroy" );
 
 	equal( chainable, element, "disable is chainable" );
-});
+} );
 
 } );
diff --git a/tests/unit/selectable/options.js b/tests/unit/selectable/options.js
index 6bb898d261e..df2f54f3e83 100644
--- a/tests/unit/selectable/options.js
+++ b/tests/unit/selectable/options.js
@@ -3,62 +3,62 @@ define( [
 	"ui/widgets/selectable"
 ], function( $ ) {
 
-module("selectable: options");
+module( "selectable: options" );
 
-test("autoRefresh", function() {
-	expect(3);
+test( "autoRefresh", function() {
+	expect( 3 );
 
 	var actual = 0,
-		el = $("#selectable1"),
-		sel = $("*", el),
+		el = $( "#selectable1" ),
+		sel = $( "*", el ),
 		selected = function() { actual += 1; };
 
-	el = $("#selectable1").selectable({ autoRefresh: false,	selected: selected });
+	el = $( "#selectable1" ).selectable( { autoRefresh: false,	selected: selected } );
 	sel.hide();
 	el.simulate( "drag", {
 		dx: 1000,
 		dy: 1000
-	});
-	equal(actual, sel.length);
-	el.selectable("destroy");
+	} );
+	equal( actual, sel.length );
+	el.selectable( "destroy" );
 
 	actual = 0;
 	sel.show();
-	el = $("#selectable1").selectable({ autoRefresh: true,	selected: selected });
+	el = $( "#selectable1" ).selectable( { autoRefresh: true,	selected: selected } );
 	sel.hide();
 	el.simulate( "drag", {
 		dx: 1000,
 		dy: 1000
-	});
-	equal(actual, 0);
+	} );
+	equal( actual, 0 );
 
 	sel.show();
 	$( sel[ 0 ] ).simulate( "drag", {
 		dx: 1000,
 		dy: 1000
-	});
-	equal(actual, sel.length);
+	} );
+	equal( actual, sel.length );
 
-	el.selectable("destroy");
+	el.selectable( "destroy" );
 	sel.show();
-});
+} );
 
-test("filter", function() {
-	expect(2);
+test( "filter", function() {
+	expect( 2 );
 
-	var actual =0,
-		el = $("#selectable1"),
-		sel = $("*", el),
+	var actual = 0,
+		el = $( "#selectable1" ),
+		sel = $( "*", el ),
 		selected = function() { actual += 1; };
 
-	el = $("#selectable1").selectable({ filter: ".special", selected: selected });
+	el = $( "#selectable1" ).selectable( { filter: ".special", selected: selected } );
 	el.simulate( "drag", {
 		dx: 1000,
 		dy: 1000
-	});
-	ok(sel.length !== 1, "this test assumes more than 1 selectee");
-	equal(actual, 1);
-	el.selectable("destroy");
-});
+	} );
+	ok( sel.length !== 1, "this test assumes more than 1 selectee" );
+	equal( actual, 1 );
+	el.selectable( "destroy" );
+} );
 
 } );
diff --git a/ui/widgets/selectable.js b/ui/widgets/selectable.js
index 0dadac9627d..152729d7cf9 100644
--- a/ui/widgets/selectable.js
+++ b/ui/widgets/selectable.js
@@ -14,11 +14,11 @@
 //>>demos: http://jqueryui.com/selectable/
 //>>css.structure: ../themes/base/selectable.css
 
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([
+		define( [
 			"jquery",
 			"./mouse",
 			"../version",
@@ -29,9 +29,9 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}(function( $ ) {
+}( function( $ ) {
 
-return $.widget("ui.selectable", $.ui.mouse, {
+return $.widget( "ui.selectable", $.ui.mouse, {
 	version: "@VERSION",
 	options: {
 		appendTo: "body",
@@ -57,12 +57,12 @@ return $.widget("ui.selectable", $.ui.mouse, {
 
 		// Cache selectee children based on filter
 		this.refresh = function() {
-			that.selectees = $(that.options.filter, that.element[0]);
+			that.selectees = $( that.options.filter, that.element[ 0 ] );
 			that._addClass( that.selectees, "ui-selectee" );
-			that.selectees.each(function() {
-				var $this = $(this),
+			that.selectees.each( function() {
+				var $this = $( this ),
 					pos = $this.offset();
-				$.data(this, "selectable-item", {
+				$.data( this, "selectable-item", {
 					element: this,
 					$element: $this,
 					left: pos.left,
@@ -70,150 +70,156 @@ return $.widget("ui.selectable", $.ui.mouse, {
 					right: pos.left + $this.outerWidth(),
 					bottom: pos.top + $this.outerHeight(),
 					startselected: false,
-					selected: $this.hasClass("ui-selected"),
-					selecting: $this.hasClass("ui-selecting"),
-					unselecting: $this.hasClass("ui-unselecting")
-				});
-			});
+					selected: $this.hasClass( "ui-selected" ),
+					selecting: $this.hasClass( "ui-selecting" ),
+					unselecting: $this.hasClass( "ui-unselecting" )
+				} );
+			} );
 		};
 		this.refresh();
 
 		this._mouseInit();
 
-		this.helper = $("<div>");
+		this.helper = $( "<div>" );
 		this._addClass( this.helper, "ui-selectable-helper" );
 	},
 
 	_destroy: function() {
-		this.selectees.removeData("selectable-item");
+		this.selectees.removeData( "selectable-item" );
 		this._mouseDestroy();
 	},
 
-	_mouseStart: function(event) {
+	_mouseStart: function( event ) {
 		var that = this,
 			options = this.options;
 
 		this.opos = [ event.pageX, event.pageY ];
 
-		if (this.options.disabled) {
+		if ( this.options.disabled ) {
 			return;
 		}
 
-		this.selectees = $(options.filter, this.element[0]);
+		this.selectees = $( options.filter, this.element[ 0 ] );
 
-		this._trigger("start", event);
+		this._trigger( "start", event );
+
+		$( options.appendTo ).append( this.helper );
 
-		$(options.appendTo).append(this.helper);
 		// position helper (lasso)
-		this.helper.css({
+		this.helper.css( {
 			"left": event.pageX,
 			"top": event.pageY,
 			"width": 0,
 			"height": 0
-		});
+		} );
 
-		if (options.autoRefresh) {
+		if ( options.autoRefresh ) {
 			this.refresh();
 		}
 
-		this.selectees.filter(".ui-selected").each(function() {
-			var selectee = $.data(this, "selectable-item");
+		this.selectees.filter( ".ui-selected" ).each( function() {
+			var selectee = $.data( this, "selectable-item" );
 			selectee.startselected = true;
-			if (!event.metaKey && !event.ctrlKey) {
+			if ( !event.metaKey && !event.ctrlKey ) {
 				that._removeClass( selectee.$element, "ui-selected" );
 				selectee.selected = false;
 				that._addClass( selectee.$element, "ui-unselecting" );
 				selectee.unselecting = true;
+
 				// selectable UNSELECTING callback
-				that._trigger("unselecting", event, {
+				that._trigger( "unselecting", event, {
 					unselecting: selectee.element
-				});
+				} );
 			}
-		});
+		} );
 
-		$(event.target).parents().addBack().each(function() {
+		$( event.target ).parents().addBack().each( function() {
 			var doSelect,
-				selectee = $.data(this, "selectable-item");
-			if (selectee) {
-				doSelect = (!event.metaKey && !event.ctrlKey) || !selectee.$element.hasClass("ui-selected");
+				selectee = $.data( this, "selectable-item" );
+			if ( selectee ) {
+				doSelect = ( !event.metaKey && !event.ctrlKey ) || !selectee.$element.hasClass( "ui-selected" );
 				that._removeClass( selectee.$element, doSelect ? "ui-unselecting" : "ui-selected" )
 					._addClass( selectee.$element, doSelect ? "ui-selecting" : "ui-unselecting" );
 				selectee.unselecting = !doSelect;
 				selectee.selecting = doSelect;
 				selectee.selected = doSelect;
+
 				// selectable (UN)SELECTING callback
-				if (doSelect) {
-					that._trigger("selecting", event, {
+				if ( doSelect ) {
+					that._trigger( "selecting", event, {
 						selecting: selectee.element
-					});
+					} );
 				} else {
-					that._trigger("unselecting", event, {
+					that._trigger( "unselecting", event, {
 						unselecting: selectee.element
-					});
+					} );
 				}
 				return false;
 			}
-		});
+		} );
 
 	},
 
-	_mouseDrag: function(event) {
+	_mouseDrag: function( event ) {
 
 		this.dragged = true;
 
-		if (this.options.disabled) {
+		if ( this.options.disabled ) {
 			return;
 		}
 
 		var tmp,
 			that = this,
 			options = this.options,
-			x1 = this.opos[0],
-			y1 = this.opos[1],
+			x1 = this.opos[ 0 ],
+			y1 = this.opos[ 1 ],
 			x2 = event.pageX,
 			y2 = event.pageY;
 
-		if (x1 > x2) { tmp = x2; x2 = x1; x1 = tmp; }
-		if (y1 > y2) { tmp = y2; y2 = y1; y1 = tmp; }
-		this.helper.css({ left: x1, top: y1, width: x2 - x1, height: y2 - y1 });
+		if ( x1 > x2 ) { tmp = x2; x2 = x1; x1 = tmp; }
+		if ( y1 > y2 ) { tmp = y2; y2 = y1; y1 = tmp; }
+		this.helper.css( { left: x1, top: y1, width: x2 - x1, height: y2 - y1 } );
 
-		this.selectees.each(function() {
-			var selectee = $.data(this, "selectable-item"),
+		this.selectees.each( function() {
+			var selectee = $.data( this, "selectable-item" ),
 				hit = false;
 
 			//prevent helper from being selected if appendTo: selectable
-			if (!selectee || selectee.element === that.element[0]) {
+			if ( !selectee || selectee.element === that.element[ 0 ] ) {
 				return;
 			}
 
-			if (options.tolerance === "touch") {
-				hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) );
-			} else if (options.tolerance === "fit") {
-				hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2);
+			if ( options.tolerance === "touch" ) {
+				hit = ( !( selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1 ) );
+			} else if ( options.tolerance === "fit" ) {
+				hit = ( selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2 );
 			}
 
-			if (hit) {
+			if ( hit ) {
+
 				// SELECT
-				if (selectee.selected) {
+				if ( selectee.selected ) {
 					that._removeClass( selectee.$element, "ui-selected" );
 					selectee.selected = false;
 				}
-				if (selectee.unselecting) {
+				if ( selectee.unselecting ) {
 					that._removeClass( selectee.$element, "ui-unselecting" );
 					selectee.unselecting = false;
 				}
-				if (!selectee.selecting) {
+				if ( !selectee.selecting ) {
 					that._addClass( selectee.$element, "ui-selecting" );
 					selectee.selecting = true;
+
 					// selectable SELECTING callback
-					that._trigger("selecting", event, {
+					that._trigger( "selecting", event, {
 						selecting: selectee.element
-					});
+					} );
 				}
 			} else {
+
 				// UNSELECT
-				if (selectee.selecting) {
-					if ((event.metaKey || event.ctrlKey) && selectee.startselected) {
+				if ( selectee.selecting ) {
+					if ( ( event.metaKey || event.ctrlKey ) && selectee.startselected ) {
 						that._removeClass( selectee.$element, "ui-selecting" );
 						selectee.selecting = false;
 						that._addClass( selectee.$element, "ui-selected" );
@@ -221,67 +227,69 @@ return $.widget("ui.selectable", $.ui.mouse, {
 					} else {
 						that._removeClass( selectee.$element, "ui-selecting" );
 						selectee.selecting = false;
-						if (selectee.startselected) {
+						if ( selectee.startselected ) {
 							that._addClass( selectee.$element, "ui-unselecting" );
 							selectee.unselecting = true;
 						}
+
 						// selectable UNSELECTING callback
-						that._trigger("unselecting", event, {
+						that._trigger( "unselecting", event, {
 							unselecting: selectee.element
-						});
+						} );
 					}
 				}
-				if (selectee.selected) {
-					if (!event.metaKey && !event.ctrlKey && !selectee.startselected) {
+				if ( selectee.selected ) {
+					if ( !event.metaKey && !event.ctrlKey && !selectee.startselected ) {
 						that._removeClass( selectee.$element, "ui-selected" );
 						selectee.selected = false;
 
 						that._addClass( selectee.$element, "ui-unselecting" );
 						selectee.unselecting = true;
+
 						// selectable UNSELECTING callback
-						that._trigger("unselecting", event, {
+						that._trigger( "unselecting", event, {
 							unselecting: selectee.element
-						});
+						} );
 					}
 				}
 			}
-		});
+		} );
 
 		return false;
 	},
 
-	_mouseStop: function(event) {
+	_mouseStop: function( event ) {
 		var that = this;
 
 		this.dragged = false;
 
-		$(".ui-unselecting", this.element[0]).each(function() {
-			var selectee = $.data(this, "selectable-item");
+		$( ".ui-unselecting", this.element[ 0 ] ).each( function() {
+			var selectee = $.data( this, "selectable-item" );
 			that._removeClass( selectee.$element, "ui-unselecting" );
 			selectee.unselecting = false;
 			selectee.startselected = false;
-			that._trigger("unselected", event, {
+			that._trigger( "unselected", event, {
 				unselected: selectee.element
-			});
-		});
-		$(".ui-selecting", this.element[0]).each(function() {
-			var selectee = $.data(this, "selectable-item");
+			} );
+		} );
+		$( ".ui-selecting", this.element[ 0 ] ).each( function() {
+			var selectee = $.data( this, "selectable-item" );
 			that._removeClass( selectee.$element, "ui-selecting" )
 				._addClass( selectee.$element, "ui-selected" );
 			selectee.selecting = false;
 			selectee.selected = true;
 			selectee.startselected = true;
-			that._trigger("selected", event, {
+			that._trigger( "selected", event, {
 				selected: selectee.element
-			});
-		});
-		this._trigger("stop", event);
+			} );
+		} );
+		this._trigger( "stop", event );
 
 		this.helper.remove();
 
 		return false;
 	}
 
-});
+} );
 
-}));
+} ) );

From dfdcafdbbe13831711eb504b8cf30deaf7e9e107 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 08:58:35 -0400
Subject: [PATCH 08/27] Resizable: Style updates

Ref #14246
---
 tests/unit/resizable/common.js  |   2 +-
 tests/unit/resizable/core.js    | 188 +++++------
 tests/unit/resizable/events.js  |  94 +++---
 tests/unit/resizable/helper.js  |   5 +-
 tests/unit/resizable/methods.js |   4 +-
 tests/unit/resizable/options.js | 365 ++++++++++----------
 ui/widgets/resizable.js         | 568 ++++++++++++++++----------------
 7 files changed, 613 insertions(+), 613 deletions(-)

diff --git a/tests/unit/resizable/common.js b/tests/unit/resizable/common.js
index 3f1f82bced9..8d98096a442 100644
--- a/tests/unit/resizable/common.js
+++ b/tests/unit/resizable/common.js
@@ -35,6 +35,6 @@ common.testWidget( "resizable", {
 		start: null,
 		stop: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/resizable/core.js b/tests/unit/resizable/core.js
index 450fd6ef8ee..8c942e62ff5 100644
--- a/tests/unit/resizable/core.js
+++ b/tests/unit/resizable/core.js
@@ -4,7 +4,7 @@ define( [
 	"ui/widgets/resizable"
 ], function( $, testHelper ) {
 
-module("resizable: core");
+module( "resizable: core" );
 
 /*
 test("element types", function() {
@@ -25,188 +25,188 @@ test("element types", function() {
 });
 */
 
-test("n", function() {
-	expect(4);
+test( "n", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-n", target = $("#resizable1").resizable({ handles: "all" });
+	var handle = ".ui-resizable-n", target = $( "#resizable1" ).resizable( { handles: "all" } );
 
-	testHelper.drag(handle, 0, -50);
+	testHelper.drag( handle, 0, -50 );
 	equal( target.height(), 150, "compare height" );
 
-	testHelper.drag(handle, 0, 50);
+	testHelper.drag( handle, 0, 50 );
 	equal( target.height(), 100, "compare height" );
 
-	equal( target[0].style.left, "", "left should not be modified" );
-	equal( target[0].style.width, "", "width should not be modified" );
-});
+	equal( target[ 0 ].style.left, "", "left should not be modified" );
+	equal( target[ 0 ].style.width, "", "width should not be modified" );
+} );
 
-test("s", function() {
-	expect(5);
+test( "s", function() {
+	expect( 5 );
 
-	var handle = ".ui-resizable-s", target = $("#resizable1").resizable({ handles: "all" });
+	var handle = ".ui-resizable-s", target = $( "#resizable1" ).resizable( { handles: "all" } );
 
-	testHelper.drag(handle, 0, 50);
+	testHelper.drag( handle, 0, 50 );
 	equal( target.height(), 150, "compare height" );
 
-	testHelper.drag(handle, 0, -50);
+	testHelper.drag( handle, 0, -50 );
 	equal( target.height(), 100, "compare height" );
 
-	equal( target[0].style.top, "", "top should not be modified" );
-	equal( target[0].style.left, "", "left should not be modified" );
-	equal( target[0].style.width, "", "width should not be modified" );
-});
+	equal( target[ 0 ].style.top, "", "top should not be modified" );
+	equal( target[ 0 ].style.left, "", "left should not be modified" );
+	equal( target[ 0 ].style.width, "", "width should not be modified" );
+} );
 
-test("e", function() {
-	expect(5);
+test( "e", function() {
+	expect( 5 );
 
-	var handle = ".ui-resizable-e", target = $("#resizable1").resizable({ handles: "all" });
+	var handle = ".ui-resizable-e", target = $( "#resizable1" ).resizable( { handles: "all" } );
 
-	testHelper.drag(handle, 50);
-	equal( target.width(), 150, "compare width");
+	testHelper.drag( handle, 50 );
+	equal( target.width(), 150, "compare width" );
 
-	testHelper.drag(handle, -50);
+	testHelper.drag( handle, -50 );
 	equal( target.width(), 100, "compare width" );
 
-	equal( target[0].style.height, "", "height should not be modified" );
-	equal( target[0].style.top, "", "top should not be modified" );
-	equal( target[0].style.left, "", "left should not be modified" );
-});
+	equal( target[ 0 ].style.height, "", "height should not be modified" );
+	equal( target[ 0 ].style.top, "", "top should not be modified" );
+	equal( target[ 0 ].style.left, "", "left should not be modified" );
+} );
 
-test("w", function() {
-	expect(4);
+test( "w", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-w", target = $("#resizable1").resizable({ handles: "all" });
+	var handle = ".ui-resizable-w", target = $( "#resizable1" ).resizable( { handles: "all" } );
 
-	testHelper.drag(handle, -50);
+	testHelper.drag( handle, -50 );
 	equal( target.width(), 150, "compare width" );
 
-	testHelper.drag(handle, 50);
+	testHelper.drag( handle, 50 );
 	equal( target.width(), 100, "compare width" );
 
-	equal( target[0].style.height, "", "height should not be modified" );
-	equal( target[0].style.top, "", "top should not be modified" );
-});
+	equal( target[ 0 ].style.height, "", "height should not be modified" );
+	equal( target[ 0 ].style.top, "", "top should not be modified" );
+} );
 
-test("ne", function() {
-	expect(5);
+test( "ne", function() {
+	expect( 5 );
 
-	var handle = ".ui-resizable-ne", target = $("#resizable1").css({ overflow: "hidden" }).resizable({ handles: "all" });
+	var handle = ".ui-resizable-ne", target = $( "#resizable1" ).css( { overflow: "hidden" } ).resizable( { handles: "all" } );
 
-	testHelper.drag(handle, -50, -50);
+	testHelper.drag( handle, -50, -50 );
 	equal( target.width(), 50, "compare width" );
 	equal( target.height(), 150, "compare height" );
 
-	testHelper.drag(handle, 50, 50);
+	testHelper.drag( handle, 50, 50 );
 	equal( target.width(), 100, "compare width" );
 	equal( target.height(), 100, "compare height" );
 
-	equal( target[0].style.left, "", "left should not be modified" );
-});
+	equal( target[ 0 ].style.left, "", "left should not be modified" );
+} );
 
-test("se", function() {
-	expect(6);
+test( "se", function() {
+	expect( 6 );
 
-	var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all" });
+	var handle = ".ui-resizable-se", target = $( "#resizable1" ).resizable( { handles: "all" } );
 
-	testHelper.drag(handle, 50, 50);
+	testHelper.drag( handle, 50, 50 );
 	equal( target.width(), 150, "compare width" );
 	equal( target.height(), 150, "compare height" );
 
-	testHelper.drag(handle, -50, -50);
+	testHelper.drag( handle, -50, -50 );
 	equal( target.width(), 100, "compare width" );
 	equal( target.height(), 100, "compare height" );
 
-	equal( target[0].style.top, "", "top should not be modified" );
-	equal( target[0].style.left, "", "left should not be modified" );
-});
+	equal( target[ 0 ].style.top, "", "top should not be modified" );
+	equal( target[ 0 ].style.left, "", "left should not be modified" );
+} );
 
-test("sw", function() {
-	expect(5);
+test( "sw", function() {
+	expect( 5 );
 
-	var handle = ".ui-resizable-sw", target = $("#resizable1").resizable({ handles: "all" });
+	var handle = ".ui-resizable-sw", target = $( "#resizable1" ).resizable( { handles: "all" } );
 
-	testHelper.drag(handle, -50, -50);
+	testHelper.drag( handle, -50, -50 );
 	equal( target.width(), 150, "compare width" );
 	equal( target.height(), 50, "compare height" );
 
-	testHelper.drag(handle, 50, 50);
+	testHelper.drag( handle, 50, 50 );
 	equal( target.width(), 100, "compare width" );
 	equal( target.height(), 100, "compare height" );
 
-	equal( target[0].style.top, "", "top should not be modified" );
-});
+	equal( target[ 0 ].style.top, "", "top should not be modified" );
+} );
 
-test("nw", function() {
-	expect(4);
+test( "nw", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-nw", target = $("#resizable1").resizable({ handles: "all" });
+	var handle = ".ui-resizable-nw", target = $( "#resizable1" ).resizable( { handles: "all" } );
 
-	testHelper.drag(handle, -50, -50);
+	testHelper.drag( handle, -50, -50 );
 	equal( target.width(), 150, "compare width" );
 	equal( target.height(), 150, "compare height" );
 
-	testHelper.drag(handle, 50, 50);
+	testHelper.drag( handle, 50, 50 );
 	equal( target.width(), 100, "compare width" );
 	equal( target.height(), 100, "compare height" );
-});
+} );
 
-test("handle with complex markup (#8756)", function() {
-	expect(2);
+test( "handle with complex markup (#8756)", function() {
+	expect( 2 );
 
-	$("#resizable1")
+	$( "#resizable1" )
 		.append(
-			$("<div>")
-				.addClass("ui-resizable-handle")
-				.addClass("ui-resizable-w")
-				.append($("<div>"))
+			$( "<div>" )
+				.addClass( "ui-resizable-handle" )
+				.addClass( "ui-resizable-w" )
+				.append( $( "<div>" ) )
 		);
 
-	var handle = ".ui-resizable-w div", target = $("#resizable1").resizable({ handles: "all" });
+	var handle = ".ui-resizable-w div", target = $( "#resizable1" ).resizable( { handles: "all" } );
 
-	testHelper.drag(handle, -50);
+	testHelper.drag( handle, -50 );
 	equal( target.width(), 150, "compare width" );
 
-	testHelper.drag(handle, 50);
+	testHelper.drag( handle, 50 );
 	equal( target.width(), 100, "compare width" );
-});
+} );
 
-test("resizable accounts for scroll position correctly (#3815)", function() {
+test( "resizable accounts for scroll position correctly (#3815)", function() {
 	expect( 4 );
 
 	var position, top, left,
-		container = $("<div style='overflow:scroll;height:300px;width:300px;position:relative;'></div>").appendTo("#qunit-fixture"),
-		overflowed = $("<div style='width: 1000px; height: 1000px;'></div>").appendTo( container ),
-		el = $("<div style='height:100px;width:100px;position:absolute;top:10px;left:10px;'></div>").appendTo( overflowed ).resizable({ handles: "all" }),
+		container = $( "<div style='overflow:scroll;height:300px;width:300px;position:relative;'></div>" ).appendTo( "#qunit-fixture" ),
+		overflowed = $( "<div style='width: 1000px; height: 1000px;'></div>" ).appendTo( container ),
+		el = $( "<div style='height:100px;width:100px;position:absolute;top:10px;left:10px;'></div>" ).appendTo( overflowed ).resizable( { handles: "all" } ),
 		handle = ".ui-resizable-e",
-		handlePosition = $(handle).position().left;
+		handlePosition = $( handle ).position().left;
 
 	container.scrollLeft( 100 ).scrollTop( 100 );
 
 	position = el.position();
-	left = el.css("left");
-	top = el.css("top");
+	left = el.css( "left" );
+	top = el.css( "top" );
 
-	testHelper.drag(handle, 50, 50);
+	testHelper.drag( handle, 50, 50 );
 	deepEqual( el.position(), position, "position stays the same when resized" );
-	equal( el.css("left"), left, "css('left') stays the same when resized" );
-	equal( el.css("top"), top, "css('top') stays the same when resized" );
-	equal( $(handle).position().left, handlePosition + 50, "handle also moved" );
-});
+	equal( el.css( "left" ), left, "css('left') stays the same when resized" );
+	equal( el.css( "top" ), top, "css('top') stays the same when resized" );
+	equal( $( handle ).position().left, handlePosition + 50, "handle also moved" );
+} );
 
 test( "resizable stores correct size when using helper and grid (#9547)", function() {
 	expect( 2 );
 
 	var handle = ".ui-resizable-se",
-		target = $( "#resizable1" ).resizable({
+		target = $( "#resizable1" ).resizable( {
 			handles: "all",
 			helper: "ui-resizable-helper",
 			grid: [ 10, 10 ]
-		});
+		} );
 
 	testHelper.drag( handle, 1, 1 );
 	equal( target.width(), 100, "compare width" );
 	equal( target.height(), 100, "compare height" );
-});
+} );
 
 test( "nested resizable", function() {
 	expect( 4 );
@@ -220,9 +220,9 @@ test( "nested resizable", function() {
 	outer.appendTo( target );
 	inner.appendTo( outer );
 
-	inner.resizable( { handles : "e" } );
-	outer.resizable( { handles : "e" } );
-	target.resizable( { handles : "e" } );
+	inner.resizable( { handles: "e" } );
+	outer.resizable( { handles: "e" } );
+	target.resizable( { handles: "e" } );
 
 	innerHandle = $( "#inner > .ui-resizable-e" );
 	outerHandle = $( "#outer > .ui-resizable-e" );
@@ -239,6 +239,6 @@ test( "nested resizable", function() {
 
 	inner.remove();
 	outer.remove();
-});
+} );
 
 } );
diff --git a/tests/unit/resizable/events.js b/tests/unit/resizable/events.js
index b77130741f4..b12cfa8d5ee 100644
--- a/tests/unit/resizable/events.js
+++ b/tests/unit/resizable/events.js
@@ -4,31 +4,31 @@ define( [
 	"ui/widgets/resizable"
 ], function( $, testHelper ) {
 
-module("resizable: events");
+module( "resizable: events" );
 
-test("start", function() {
+test( "start", function() {
 
-	expect(5);
+	expect( 5 );
 
 	var count = 0,
 		handle = ".ui-resizable-se";
 
-	$("#resizable1").resizable({
+	$( "#resizable1" ).resizable( {
 		handles: "all",
-		start: function(event, ui) {
+		start: function( event, ui ) {
 			equal( ui.size.width, 100, "compare width" );
 			equal( ui.size.height, 100, "compare height" );
 			equal( ui.originalSize.width, 100, "compare original width" );
 			equal( ui.originalSize.height, 100, "compare original height" );
 			count++;
 		}
-	});
+	} );
 
-	testHelper.drag(handle, 50, 50);
+	testHelper.drag( handle, 50, 50 );
 
-	equal(count, 1, "start callback should happen exactly once");
+	equal( count, 1, "start callback should happen exactly once" );
 
-});
+} );
 
 test( "resize", function() {
 
@@ -37,7 +37,7 @@ test( "resize", function() {
 	var count = 0,
 		handle = ".ui-resizable-se";
 
-	$("#resizable1").resizable({
+	$( "#resizable1" ).resizable( {
 		handles: "all",
 		resize: function( event, ui ) {
 			if ( count === 0 ) {
@@ -53,13 +53,13 @@ test( "resize", function() {
 			}
 			count++;
 		}
-	});
+	} );
 
 	testHelper.drag( handle, 50, 50 );
 
 	equal( count, 2, "resize callback should happen exactly once per size adjustment" );
 
-});
+} );
 
 test( "resize (min/max dimensions)", function() {
 
@@ -68,7 +68,7 @@ test( "resize (min/max dimensions)", function() {
 	var count = 0,
 		handle = ".ui-resizable-se";
 
-	$("#resizable1").resizable({
+	$( "#resizable1" ).resizable( {
 		handles: "all",
 		minWidth: 60,
 		minHeight: 60,
@@ -81,13 +81,13 @@ test( "resize (min/max dimensions)", function() {
 			equal( ui.originalSize.height, 100, "compare original height" );
 			count++;
 		}
-	});
+	} );
 
 	testHelper.drag( handle, -200, -200 );
 
 	equal( count, 1, "resize callback should happen exactly once per size adjustment" );
 
-});
+} );
 
 test( "resize (containment)", function() {
 
@@ -95,12 +95,12 @@ test( "resize (containment)", function() {
 
 	var count = 0,
 		handle = ".ui-resizable-se",
-		container = $("#resizable1").wrap("<div>").parent().css({
+		container = $( "#resizable1" ).wrap( "<div>" ).parent().css( {
 			height: "100px",
 			width: "100px"
-		});
+		} );
 
-	$("#resizable1").resizable({
+	$( "#resizable1" ).resizable( {
 		handles: "all",
 		containment: container,
 		resize: function( event, ui ) {
@@ -110,7 +110,7 @@ test( "resize (containment)", function() {
 			equal( ui.originalSize.height, 100, "compare original height" );
 			count++;
 		}
-	});
+	} );
 
 	// Prove you can't resize outside containment by dragging southeast corner southeast
 	testHelper.drag( handle, 100, 100 );
@@ -120,45 +120,45 @@ test( "resize (containment)", function() {
 
 	equal( count, 1, "resize callback should happen exactly once per size adjustment" );
 
-});
+} );
 
-test("resize (grid)", function() {
+test( "resize (grid)", function() {
 
-	expect(5);
+	expect( 5 );
 
 	var count = 0,
 		handle = ".ui-resizable-se";
 
-	$("#resizable1").resizable({
+	$( "#resizable1" ).resizable( {
 		handles: "all",
 		grid: 50,
-		resize: function(event, ui) {
+		resize: function( event, ui ) {
 			equal( ui.size.width, 150, "compare width" );
 			equal( ui.size.height, 150, "compare height" );
 			equal( ui.originalSize.width, 100, "compare original width" );
 			equal( ui.originalSize.height, 100, "compare original height" );
 			count++;
 		}
-	});
+	} );
 
-	testHelper.drag(handle, 50, 50);
+	testHelper.drag( handle, 50, 50 );
 
-	equal(count, 1, "resize callback should happen exactly once per grid-unit size adjustment");
+	equal( count, 1, "resize callback should happen exactly once per grid-unit size adjustment" );
 
-});
+} );
 
 test( "resize, custom adjustment", function() {
 	expect( 4 );
 
 	var handle = ".ui-resizable-se",
-		element = $( "#resizable1" ).resizable({
+		element = $( "#resizable1" ).resizable( {
 			resize: function( event, ui ) {
 				ui.size.width = 100;
 				ui.size.height = 200;
 				ui.position.left = 300;
 				ui.position.top = 400;
 			}
-		});
+		} );
 
 	testHelper.drag( handle, 50, 50 );
 
@@ -166,31 +166,31 @@ test( "resize, custom adjustment", function() {
 	equal( element.height(), 200, "resize event can control height" );
 	equal( element.position().left, 300, "resize event can control left" );
 	equal( element.position().top, 400, "resize event can control top" );
-});
+} );
 
-test("stop", function() {
+test( "stop", function() {
 
-	expect(5);
+	expect( 5 );
 
 	var count = 0,
 		handle = ".ui-resizable-se";
 
-	$("#resizable1").resizable({
+	$( "#resizable1" ).resizable( {
 		handles: "all",
-		stop: function(event, ui) {
+		stop: function( event, ui ) {
 			equal( ui.size.width, 150, "compare width" );
 			equal( ui.size.height, 150, "compare height" );
 			equal( ui.originalSize.width, 100, "compare original width" );
 			equal( ui.originalSize.height, 100, "compare original height" );
 			count++;
 		}
-	});
+	} );
 
-	testHelper.drag(handle, 50, 50);
+	testHelper.drag( handle, 50, 50 );
 
-	equal(count, 1, "stop callback should happen exactly once");
+	equal( count, 1, "stop callback should happen exactly once" );
 
-});
+} );
 
 test( "resize (containment) works with parent with negative offset", function() {
 
@@ -204,30 +204,30 @@ test( "resize (containment) works with parent with negative offset", function()
 		increaseWidthBy = 50;
 
 	// Position fixed container in window top left
-	fixedContainer.css({
+	fixedContainer.css( {
 		width: 400,
 		height: 100,
 		position: "fixed",
 		top: 0,
 		left: 0
-	});
+	} );
 
 	// Position absolute container within fixed on slightly outside window
-	absoluteContainer.css({
+	absoluteContainer.css( {
 		width: 400,
 		height: 100,
 		position: "absolute",
 		top: 0,
 		left: -50
-	});
+	} );
 
 	// Set up resizable to be contained within absolute container
-	target.resizable({
+	target.resizable( {
 		handles: "all",
 		containment: "parent"
-	}).css({
+	} ).css( {
 		width: 300
-	});
+	} );
 
 	widthBefore = target.width();
 
@@ -237,6 +237,6 @@ test( "resize (containment) works with parent with negative offset", function()
 
 	equal( widthAfter, ( widthBefore + increaseWidthBy ), "resizable width should be increased by the value dragged" );
 
-});
+} );
 
 } );
diff --git a/tests/unit/resizable/helper.js b/tests/unit/resizable/helper.js
index 494c1a07385..f541d69c7a2 100644
--- a/tests/unit/resizable/helper.js
+++ b/tests/unit/resizable/helper.js
@@ -5,13 +5,14 @@ define( [
 
 return $.extend( helper, {
 	drag: function( el, dx, dy ) {
+
 		// this mouseover is to work around a limitation in resizable
 		// TODO: fix resizable so handle doesn't require mouseover in order to be used
-		$( el ).simulate("mouseover").simulate( "drag", {
+		$( el ).simulate( "mouseover" ).simulate( "drag", {
 			moves: 2,
 			dx: dx,
 			dy: dy
-		});
+		} );
 	}
 } );
 
diff --git a/tests/unit/resizable/methods.js b/tests/unit/resizable/methods.js
index ed79ef6212c..eea42a682e9 100644
--- a/tests/unit/resizable/methods.js
+++ b/tests/unit/resizable/methods.js
@@ -8,7 +8,7 @@ module( "resizable: methods" );
 test( "disable", function( assert ) {
 	expect( 5 );
 
-	var element = $( "#resizable1" ).resizable({ disabled: false }),
+	var element = $( "#resizable1" ).resizable( { disabled: false } ),
 		chainable = element.resizable( "disable" );
 
 	assert.lacksClasses( element.resizable( "widget" ), "ui-state-disabled" );
@@ -16,6 +16,6 @@ test( "disable", function( assert ) {
 	assert.hasClasses( element.resizable( "widget" ), "ui-resizable-disabled" );
 	equal( element.resizable( "option", "disabled" ), true, "disabled option setter" );
 	equal( chainable, element, "disable is chainable" );
-});
+} );
 
 } );
diff --git a/tests/unit/resizable/options.js b/tests/unit/resizable/options.js
index 23434830979..2d44eb8ee8a 100644
--- a/tests/unit/resizable/options.js
+++ b/tests/unit/resizable/options.js
@@ -4,124 +4,124 @@ define( [
 	"ui/widgets/resizable"
 ], function( $, testHelper ) {
 
-module("resizable: options");
+module( "resizable: options" );
 
 test( "alsoResize", function() {
 	expect( 2 );
 
 	var other = $( "<div>" )
-			.css({
+			.css( {
 				width: 50,
 				height: 50
-			})
+			} )
 			.appendTo( "body" ),
-		element = $( "#resizable1" ).resizable({
+		element = $( "#resizable1" ).resizable( {
 			alsoResize: other
-		}),
+		} ),
 		handle = ".ui-resizable-e";
 
 	testHelper.drag( handle, 80 );
 	equal( element.width(), 180, "resizable width" );
 	equal( other.width(), 130, "alsoResize width" );
-});
+} );
 
-test("aspectRatio: 'preserve' (e)", function() {
-	expect(4);
+test( "aspectRatio: 'preserve' (e)", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-e", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
+	var handle = ".ui-resizable-e", target = $( "#resizable1" ).resizable( { aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 } );
 
-	testHelper.drag(handle, 80);
-	equal( target.width(), 130, "compare maxWidth");
-	equal( target.height(), 130, "compare maxHeight");
+	testHelper.drag( handle, 80 );
+	equal( target.width(), 130, "compare maxWidth" );
+	equal( target.height(), 130, "compare maxHeight" );
 
-	testHelper.drag(handle, -130);
-	equal( target.width(), 70, "compare minWidth");
-	equal( target.height(), 70, "compare minHeight");
-});
+	testHelper.drag( handle, -130 );
+	equal( target.width(), 70, "compare minWidth" );
+	equal( target.height(), 70, "compare minHeight" );
+} );
 
-test("aspectRatio: 'preserve' (w)", function() {
-	expect(4);
+test( "aspectRatio: 'preserve' (w)", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-w", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
+	var handle = ".ui-resizable-w", target = $( "#resizable1" ).resizable( { aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 } );
 
-	testHelper.drag(handle, -80);
-	equal( target.width(), 130, "compare maxWidth");
-	equal( target.height(), 130, "compare maxHeight");
+	testHelper.drag( handle, -80 );
+	equal( target.width(), 130, "compare maxWidth" );
+	equal( target.height(), 130, "compare maxHeight" );
 
-	testHelper.drag(handle, 130);
-	equal( target.width(), 70, "compare minWidth");
-	equal( target.height(), 70, "compare minHeight");
-});
+	testHelper.drag( handle, 130 );
+	equal( target.width(), 70, "compare minWidth" );
+	equal( target.height(), 70, "compare minHeight" );
+} );
 
-test("aspectRatio: 'preserve' (n)", function() {
-	expect(4);
+test( "aspectRatio: 'preserve' (n)", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-n", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
+	var handle = ".ui-resizable-n", target = $( "#resizable1" ).resizable( { aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 } );
 
-	testHelper.drag(handle, 0, -80);
-	equal( target.width(), 130, "compare maxWidth");
-	equal( target.height(), 130, "compare maxHeight");
+	testHelper.drag( handle, 0, -80 );
+	equal( target.width(), 130, "compare maxWidth" );
+	equal( target.height(), 130, "compare maxHeight" );
 
-	testHelper.drag(handle, 0, 80);
-	equal( target.width(), 70, "compare minWidth");
-	equal( target.height(), 70, "compare minHeight");
-});
+	testHelper.drag( handle, 0, 80 );
+	equal( target.width(), 70, "compare minWidth" );
+	equal( target.height(), 70, "compare minHeight" );
+} );
 
-test("aspectRatio: 'preserve' (s)", function() {
-	expect(4);
+test( "aspectRatio: 'preserve' (s)", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-s", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
+	var handle = ".ui-resizable-s", target = $( "#resizable1" ).resizable( { aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 } );
 
-	testHelper.drag(handle, 0, 80);
-	equal( target.width(), 130, "compare maxWidth");
-	equal( target.height(), 130, "compare maxHeight");
+	testHelper.drag( handle, 0, 80 );
+	equal( target.width(), 130, "compare maxWidth" );
+	equal( target.height(), 130, "compare maxHeight" );
 
-	testHelper.drag(handle, 0, -80);
-	equal( target.width(), 70, "compare minWidth");
-	equal( target.height(), 70, "compare minHeight");
-});
+	testHelper.drag( handle, 0, -80 );
+	equal( target.width(), 70, "compare minWidth" );
+	equal( target.height(), 70, "compare minHeight" );
+} );
 
-test("aspectRatio: 'preserve' (se)", function() {
-	expect(4);
+test( "aspectRatio: 'preserve' (se)", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
+	var handle = ".ui-resizable-se", target = $( "#resizable1" ).resizable( { aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 } );
 
-	testHelper.drag(handle, 80, 80);
-	equal( target.width(), 130, "compare maxWidth");
-	equal( target.height(), 130, "compare maxHeight");
+	testHelper.drag( handle, 80, 80 );
+	equal( target.width(), 130, "compare maxWidth" );
+	equal( target.height(), 130, "compare maxHeight" );
 
-	testHelper.drag(handle, -80, -80);
-	equal( target.width(), 70, "compare minWidth");
-	equal( target.height(), 70, "compare minHeight");
-});
+	testHelper.drag( handle, -80, -80 );
+	equal( target.width(), 70, "compare minWidth" );
+	equal( target.height(), 70, "compare minHeight" );
+} );
 
-test("aspectRatio: 'preserve' (sw)", function() {
-	expect(4);
+test( "aspectRatio: 'preserve' (sw)", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-sw", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
+	var handle = ".ui-resizable-sw", target = $( "#resizable1" ).resizable( { aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 } );
 
-	testHelper.drag(handle, -80, 80);
-	equal( target.width(), 130, "compare maxWidth");
-	equal( target.height(), 130, "compare maxHeight");
+	testHelper.drag( handle, -80, 80 );
+	equal( target.width(), 130, "compare maxWidth" );
+	equal( target.height(), 130, "compare maxHeight" );
 
-	testHelper.drag(handle, 80, -80);
-	equal( target.width(), 70, "compare minWidth");
-	equal( target.height(), 70, "compare minHeight");
-});
+	testHelper.drag( handle, 80, -80 );
+	equal( target.width(), 70, "compare minWidth" );
+	equal( target.height(), 70, "compare minHeight" );
+} );
 
-test("aspectRatio: 'preserve' (ne)", function() {
-	expect(4);
+test( "aspectRatio: 'preserve' (ne)", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-ne", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 });
+	var handle = ".ui-resizable-ne", target = $( "#resizable1" ).resizable( { aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 } );
 
-	testHelper.drag(handle, 80, -80);
-	equal( target.width(), 130, "compare maxWidth");
-	equal( target.height(), 130, "compare maxHeight");
+	testHelper.drag( handle, 80, -80 );
+	equal( target.width(), 130, "compare maxWidth" );
+	equal( target.height(), 130, "compare maxHeight" );
 
-	testHelper.drag(handle, -80, 80);
-	equal( target.width(), 70, "compare minWidth");
-	equal( target.height(), 70, "compare minHeight");
-});
+	testHelper.drag( handle, -80, 80 );
+	equal( target.width(), 70, "compare minWidth" );
+	equal( target.height(), 70, "compare minHeight" );
+} );
 
 test( "aspectRatio: Resizing can move objects", function() {
 	expect( 7 );
@@ -129,14 +129,14 @@ test( "aspectRatio: Resizing can move objects", function() {
 	// Http://bugs.jqueryui.com/ticket/7018 - Resizing can move objects
 	var handleW = ".ui-resizable-w",
 		handleNW = ".ui-resizable-nw",
-		target = $( "#resizable1" ).resizable({
+		target = $( "#resizable1" ).resizable( {
 			aspectRatio: true,
 			handles: "all",
 			containment: "parent"
-		});
+		} );
 
-	$( "#container" ).css({ width: 200, height: 300 });
-	$( "#resizable1" ).css({ width: 100, height: 100, left: 75, top: 200 });
+	$( "#container" ).css( { width: 200, height: 300 } );
+	$( "#resizable1" ).css( { width: 100, height: 100, left: 75, top: 200 } );
 
 	testHelper.drag( handleW, -20 );
 	equal( target.width(), 100, "compare width - no size change" );
@@ -144,22 +144,22 @@ test( "aspectRatio: Resizing can move objects", function() {
 	equal( target.position().left, 75, "compare left - no movement" );
 
 	// Http://bugs.jqueryui.com/ticket/9107 - aspectRatio and containment not handled correctly
-	$( "#container" ).css({ width: 200, height: 300, position: "absolute", left: 100, top: 100 });
-	$( "#resizable1" ).css({ width: 100, height: 100, left: 0, top: 0 });
+	$( "#container" ).css( { width: 200, height: 300, position: "absolute", left: 100, top: 100 } );
+	$( "#resizable1" ).css( { width: 100, height: 100, left: 0, top: 0 } );
 
 	testHelper.drag( handleNW, -20, -20 );
 	equal( target.width(), 100, "compare width - no size change" );
 	equal( target.height(), 100, "compare height - no size change" );
 	equal( target.position().left, 0, "compare left - no movement" );
 	equal( target.position().top, 0, "compare top - no movement" );
-});
+} );
 
 test( "containment", function() {
 	expect( 4 );
 
-	var element = $( "#resizable1" ).resizable({
+	var element = $( "#resizable1" ).resizable( {
 		containment: "#container"
-	});
+	} );
 
 	testHelper.drag( ".ui-resizable-se", 20, 30 );
 	equal( element.width(), 120, "unconstrained width within container" );
@@ -168,17 +168,17 @@ test( "containment", function() {
 	testHelper.drag( ".ui-resizable-se", 400, 400 );
 	equal( element.width(), 300, "constrained width at containment edge" );
 	equal( element.height(), 200, "constrained height at containment edge" );
-});
+} );
 
 test( "containment - not immediate parent", function() {
 	expect( 4 );
 
 	// Http://bugs.jqueryui.com/ticket/7485 - Resizable: Containment calculation is wrong
 	// when containment element is not the immediate parent
-	var element = $( "#child" ).resizable({
+	var element = $( "#child" ).resizable( {
 		containment: "#container2",
 		handles: "all"
-	});
+	} );
 
 	testHelper.drag( ".ui-resizable-e", 300, 0 );
 	equal( element.width(), 400, "Relative, contained within container width" );
@@ -190,27 +190,27 @@ test( "containment - not immediate parent", function() {
 	$( "#parent" ).css( { left: 50, top: 50 } );
 	$( "#container2" ).css( { left: 50, top: 50 } );
 
-	element = $( "#child" ).resizable({
+	element = $( "#child" ).resizable( {
 		containment: "#container2",
 		handles: "all"
-	});
+	} );
 
 	testHelper.drag( ".ui-resizable-e", 400, 0 );
 	equal( element.width(), 300, "Relative with Left, contained within container width" );
 
 	testHelper.drag( ".ui-resizable-s", 0, 400 );
 	equal( element.height(), 300, "Relative with Top, contained within container height" );
-});
+} );
 
 test( "containment - immediate parent", function() {
 	expect( 4 );
 
 	// Http://bugs.jqueryui.com/ticket/10140 - Resizable: Width calculation is wrong when containment element is "position: relative"
 	// when containment element is  immediate parent
-	var element = $( "#child" ).resizable({
+	var element = $( "#child" ).resizable( {
 		containment: "parent",
 		handles: "all"
-	});
+	} );
 
 	testHelper.drag( ".ui-resizable-e", 400, 0 );
 	equal( element.width(), 300, "Relative, contained within container width" );
@@ -222,69 +222,69 @@ test( "containment - immediate parent", function() {
 	$( "#parent" ).css( { left: 50, top: 50 } );
 	$( "#container2" ).css( { left: 50, top: 50 } );
 
-	element = $( "#child" ).resizable({
+	element = $( "#child" ).resizable( {
 		containment: "parent",
 		handles: "all"
-	});
+	} );
 
 	testHelper.drag( ".ui-resizable-e", 400, 0 );
 	equal( element.width(), 250, "Relative with Left, contained within container width" );
 
 	testHelper.drag( ".ui-resizable-s", 0, 400 );
 	equal( element.height(), 250, "Relative with Top, contained within container height" );
-});
+} );
 
-test("grid", function() {
-	expect(4);
+test( "grid", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all", grid: [ 0, 20 ] });
+	var handle = ".ui-resizable-se", target = $( "#resizable1" ).resizable( { handles: "all", grid: [ 0, 20 ] } );
 
-	testHelper.drag(handle, 3, 9);
-	equal( target.width(), 103, "compare width");
-	equal( target.height(), 100, "compare height");
+	testHelper.drag( handle, 3, 9 );
+	equal( target.width(), 103, "compare width" );
+	equal( target.height(), 100, "compare height" );
 
-	testHelper.drag(handle, 15, 11);
-	equal( target.width(), 118, "compare width");
-	equal( target.height(), 120, "compare height");
-});
+	testHelper.drag( handle, 15, 11 );
+	equal( target.width(), 118, "compare width" );
+	equal( target.height(), 120, "compare height" );
+} );
 
-test("grid (min/max dimensions)", function() {
-	expect(4);
+test( "grid (min/max dimensions)", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all", grid: 20, minWidth: 65, minHeight: 65, maxWidth: 135, maxHeight: 135 });
+	var handle = ".ui-resizable-se", target = $( "#resizable1" ).resizable( { handles: "all", grid: 20, minWidth: 65, minHeight: 65, maxWidth: 135, maxHeight: 135 } );
 
-	testHelper.drag(handle, 50, 50);
-	equal( target.width(), 120, "grid should respect maxWidth");
-	equal( target.height(), 120, "grid should respect maxHeight");
+	testHelper.drag( handle, 50, 50 );
+	equal( target.width(), 120, "grid should respect maxWidth" );
+	equal( target.height(), 120, "grid should respect maxHeight" );
 
-	testHelper.drag(handle, -100, -100);
-	equal( target.width(), 80, "grid should respect minWidth");
-	equal( target.height(), 80, "grid should respect minHeight");
-});
+	testHelper.drag( handle, -100, -100 );
+	equal( target.width(), 80, "grid should respect minWidth" );
+	equal( target.height(), 80, "grid should respect minHeight" );
+} );
 
-test("grid (wrapped)", function() {
-	expect(4);
+test( "grid (wrapped)", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-se", target = $("#resizable2").resizable({ handles: "all", grid: [ 0, 20 ] });
+	var handle = ".ui-resizable-se", target = $( "#resizable2" ).resizable( { handles: "all", grid: [ 0, 20 ] } );
 
-	testHelper.drag(handle, 3, 9);
-	equal( target.width(), 103, "compare width");
-	equal( target.height(), 100, "compare height");
+	testHelper.drag( handle, 3, 9 );
+	equal( target.width(), 103, "compare width" );
+	equal( target.height(), 100, "compare height" );
 
-	testHelper.drag(handle, 15, 11);
-	equal( target.width(), 118, "compare width");
-	equal( target.height(), 120, "compare height");
-});
+	testHelper.drag( handle, 15, 11 );
+	equal( target.width(), 118, "compare width" );
+	equal( target.height(), 120, "compare height" );
+} );
 
 test( "grid - Resizable: can be moved when grid option is set (#9611)", function() {
 	expect( 6 );
 
 	var oldPosition,
 		handle = ".ui-resizable-nw",
-		target = $( "#resizable1" ).resizable({
+		target = $( "#resizable1" ).resizable( {
 			handles: "all",
 			grid: 50
-		});
+		} );
 
 	testHelper.drag( handle, 50, 50 );
 	equal( target.width(), 50, "compare width" );
@@ -297,162 +297,159 @@ test( "grid - Resizable: can be moved when grid option is set (#9611)", function
 	equal( target.height(), 50, "compare height" );
 	equal( target.position().top, oldPosition.top, "compare top" );
 	equal( target.position().left, oldPosition.left, "compare left" );
-});
+} );
 
 test( "grid - maintains grid with padding and border when approaching no dimensions", function() {
 	expect( 2 );
 
 	// Http://bugs.jqueryui.com/ticket/10437 - Resizable: border with grid option working wrong
 	var handle = ".ui-resizable-nw",
-		target = $( "#resizable1" ).css({
+		target = $( "#resizable1" ).css( {
 			padding: 5,
 			border: "5px solid black",
 			width: 80,
 			height: 80
-		}).resizable({
+		} ).resizable( {
 			handles: "all",
 			grid: [ 50, 12 ]
-		});
+		} );
 
 	testHelper.drag( handle, 50, 50 );
 	equal( target.outerWidth(), 50, "compare width" );
 	equal( target.outerHeight(), 52, "compare height" );
-});
+} );
 
-test("ui-resizable-se { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
-	expect(4);
+test( "ui-resizable-se { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 });
+	var handle = ".ui-resizable-se", target = $( "#resizable1" ).resizable( { handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 } );
 
-	testHelper.drag(handle, -50, -50);
+	testHelper.drag( handle, -50, -50 );
 	equal( target.width(), 60, "compare minWidth" );
 	equal( target.height(), 60, "compare minHeight" );
 
-	testHelper.drag(handle, 70, 70);
+	testHelper.drag( handle, 70, 70 );
 	equal( target.width(), 100, "compare maxWidth" );
 	equal( target.height(), 100, "compare maxHeight" );
-});
+} );
 
-test("ui-resizable-sw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
-	expect(4);
+test( "ui-resizable-sw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-sw", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 });
+	var handle = ".ui-resizable-sw", target = $( "#resizable1" ).resizable( { handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 } );
 
-	testHelper.drag(handle, 50, -50);
+	testHelper.drag( handle, 50, -50 );
 	equal( target.width(), 60, "compare minWidth" );
 	equal( target.height(), 60, "compare minHeight" );
 
-	testHelper.drag(handle, -70, 70);
+	testHelper.drag( handle, -70, 70 );
 	equal( target.width(), 100, "compare maxWidth" );
 	equal( target.height(), 100, "compare maxHeight" );
-});
+} );
 
-test("ui-resizable-ne { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
-	expect(4);
+test( "ui-resizable-ne { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-ne", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 });
+	var handle = ".ui-resizable-ne", target = $( "#resizable1" ).resizable( { handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 } );
 
-	testHelper.drag(handle, -50, 50);
+	testHelper.drag( handle, -50, 50 );
 	equal( target.width(), 60, "compare minWidth" );
 	equal( target.height(), 60, "compare minHeight" );
 
-	testHelper.drag(handle, 70, -70);
+	testHelper.drag( handle, 70, -70 );
 	equal( target.width(), 100, "compare maxWidth" );
 	equal( target.height(), 100, "compare maxHeight" );
-});
+} );
 
-test("ui-resizable-nw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
-	expect(4);
+test( "ui-resizable-nw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
+	expect( 4 );
 
-	var handle = ".ui-resizable-nw", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 });
+	var handle = ".ui-resizable-nw", target = $( "#resizable1" ).resizable( { handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 } );
 
-	testHelper.drag(handle, 70, 70);
+	testHelper.drag( handle, 70, 70 );
 	equal( target.width(), 60, "compare minWidth" );
 	equal( target.height(), 60, "compare minHeight" );
 
-	testHelper.drag(handle, -70, -70);
+	testHelper.drag( handle, -70, -70 );
 	equal( target.width(), 100, "compare maxWidth" );
 	equal( target.height(), 100, "compare maxHeight" );
-});
-
+} );
 
-test( "custom handles { handles: { 's': $('#resizer1'), containment: 'parent' }", function () {
+test( "custom handles { handles: { 's': $('#resizer1'), containment: 'parent' }", function() {
 	expect( 2 );
 
 	var handle = "#resizer1",
-		target = $( "#resizable1" ).resizable({ handles: { "s": $( "#resizer1" ) }, containment: "parent" });
+		target = $( "#resizable1" ).resizable( { handles: { "s": $( "#resizer1" ) }, containment: "parent" } );
 
 	testHelper.drag( handle, 0, 70 );
 	equal( target.height(), 170, "compare height" );
 
 	testHelper.drag( handle, 0, -70 );
 	equal( target.height(), 100, "compare height" );
-});
-
+} );
 
-test( "custom handles { handles: { 's': $('#resizer1')[0], containment: 'parent' }", function () {
+test( "custom handles { handles: { 's': $('#resizer1')[0], containment: 'parent' }", function() {
 	expect( 2 );
 
 	var handle = "#resizer1",
-		target = $( "#resizable1" ).resizable({ handles: { "s": $( "#resizer1" )[ 0 ] }, containment: "parent" });
+		target = $( "#resizable1" ).resizable( { handles: { "s": $( "#resizer1" )[ 0 ] }, containment: "parent" } );
 
 	testHelper.drag( handle, 0, 70 );
 	equal( target.height(), 170, "compare height" );
 
 	testHelper.drag( handle, 0, -70 );
 	equal( target.height(), 100, "compare height" );
-});
-
+} );
 
-test("zIndex, applied to all handles", function() {
-	expect(8);
+test( "zIndex, applied to all handles", function() {
+	expect( 8 );
 
-	var target = $("<div></div>").resizable({ handles: "all", zIndex: 100 });
+	var target = $( "<div></div>" ).resizable( { handles: "all", zIndex: 100 } );
 	target.children( ".ui-resizable-handle" ).each( function( index, handle ) {
 		equal( $( handle ).css( "zIndex" ), 100, "compare zIndex" );
-	});
-});
+	} );
+} );
 
 test( "alsoResize + containment", function() {
 	expect( 4 );
 	var other = $( "<div>" )
-			.css({
+			.css( {
 				width: 50,
 				height: 50
-			})
+			} )
 			.appendTo( "body" ),
-		element = $( "#resizable1" ).resizable({
+		element = $( "#resizable1" ).resizable( {
 			alsoResize: other,
 			containment: "#container"
-		});
+		} );
 
 	testHelper.drag( ".ui-resizable-se", 400, 400 );
 	equal( element.width(), 300, "resizable constrained width at containment edge" );
 	equal( element.height(), 200, "resizable constrained height at containment edge" );
 	equal( other.width(), 250, "alsoResize constrained width at containment edge" );
 	equal( other.height(), 150, "alsoResize constrained height at containment edge" );
-});
+} );
 
 test( "alsoResize + multiple selection", function() {
 	expect( 6 );
 	var other1 = $( "<div>" )
 			.addClass( "other" )
-			.css({
+			.css( {
 				width: 50,
 				height: 50
-			})
+			} )
 			.appendTo( "body" ),
 		other2 = $( "<div>" )
 			.addClass( "other" )
-			.css({
+			.css( {
 				width: 50,
 				height: 50
-			})
-			.appendTo( "body"),
-		element = $( "#resizable1" ).resizable({
+			} )
+			.appendTo( "body" ),
+		element = $( "#resizable1" ).resizable( {
 			alsoResize: other1.add( other2 ),
 			containment: "#container"
-		});
+		} );
 
 	testHelper.drag( ".ui-resizable-se", 400, 400 );
 	equal( element.width(), 300, "resizable constrained width at containment edge" );
@@ -461,6 +458,6 @@ test( "alsoResize + multiple selection", function() {
 	equal( other1.height(), 150, "alsoResize o1 constrained height at containment edge" );
 	equal( other2.width(), 250, "alsoResize o2 constrained width at containment edge" );
 	equal( other2.height(), 150, "alsoResize o2 constrained height at containment edge" );
-});
+} );
 
 } );
diff --git a/ui/widgets/resizable.js b/ui/widgets/resizable.js
index cc6f9f186de..ac45bcde0f9 100644
--- a/ui/widgets/resizable.js
+++ b/ui/widgets/resizable.js
@@ -16,11 +16,11 @@
 //>>css.structure: ../themes/base/resizable.css
 //>>css.theme: ../themes/base/theme.css
 
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([
+		define( [
 			"jquery",
 			"./mouse",
 			"../disable-selection",
@@ -33,9 +33,9 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}(function( $ ) {
+}( function( $ ) {
 
-$.widget("ui.resizable", $.ui.mouse, {
+$.widget( "ui.resizable", $.ui.mouse, {
 	version: "@VERSION",
 	widgetEventPrefix: "resize",
 	options: {
@@ -57,6 +57,7 @@ $.widget("ui.resizable", $.ui.mouse, {
 		maxWidth: null,
 		minHeight: 10,
 		minWidth: 10,
+
 		// See #7960
 		zIndex: 90,
 
@@ -76,7 +77,7 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 	_hasScroll: function( el, a ) {
 
-		if ( $( el ).css( "overflow" ) === "hidden") {
+		if ( $( el ).css( "overflow" ) === "hidden" ) {
 			return false;
 		}
 
@@ -103,25 +104,25 @@ $.widget("ui.resizable", $.ui.mouse, {
 			o = this.options;
 		this._addClass( "ui-resizable" );
 
-		$.extend(this, {
-			_aspectRatio: !!(o.aspectRatio),
+		$.extend( this, {
+			_aspectRatio: !!( o.aspectRatio ),
 			aspectRatio: o.aspectRatio,
 			originalElement: this.element,
 			_proportionallyResizeElements: [],
 			_helper: o.helper || o.ghost || o.animate ? o.helper || "ui-resizable-helper" : null
-		});
+		} );
 
 		// Wrap the element if it cannot hold child nodes
-		if (this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)) {
+		if ( this.element[ 0 ].nodeName.match( /^(canvas|textarea|input|select|button|img)$/i ) ) {
 
 			this.element.wrap(
-				$("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({
-					position: this.element.css("position"),
+				$( "<div class='ui-wrapper' style='overflow: hidden;'></div>" ).css( {
+					position: this.element.css( "position" ),
 					width: this.element.outerWidth(),
 					height: this.element.outerHeight(),
-					top: this.element.css("top"),
-					left: this.element.css("left")
-				})
+					top: this.element.css( "top" ),
+					left: this.element.css( "left" )
+				} )
 			);
 
 			this.element = this.element.parent().data(
@@ -130,38 +131,39 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 			this.elementIsWrapper = true;
 
-			this.element.css({
-				marginLeft: this.originalElement.css("marginLeft"),
-				marginTop: this.originalElement.css("marginTop"),
-				marginRight: this.originalElement.css("marginRight"),
-				marginBottom: this.originalElement.css("marginBottom")
-			});
-			this.originalElement.css({
+			this.element.css( {
+				marginLeft: this.originalElement.css( "marginLeft" ),
+				marginTop: this.originalElement.css( "marginTop" ),
+				marginRight: this.originalElement.css( "marginRight" ),
+				marginBottom: this.originalElement.css( "marginBottom" )
+			} );
+			this.originalElement.css( {
 				marginLeft: 0,
 				marginTop: 0,
 				marginRight: 0,
 				marginBottom: 0
-			});
+			} );
+
 			// support: Safari
 			// Prevent Safari textarea resize
-			this.originalResizeStyle = this.originalElement.css("resize");
-			this.originalElement.css("resize", "none");
+			this.originalResizeStyle = this.originalElement.css( "resize" );
+			this.originalElement.css( "resize", "none" );
 
-			this._proportionallyResizeElements.push( this.originalElement.css({
+			this._proportionallyResizeElements.push( this.originalElement.css( {
 				position: "static",
 				zoom: 1,
 				display: "block"
-			}) );
+			} ) );
 
 			// Support: IE9
 			// avoid IE jump (hard set the margin)
-			this.originalElement.css({ margin: this.originalElement.css("margin") });
+			this.originalElement.css( { margin: this.originalElement.css( "margin" ) } );
 
 			this._proportionallyResize();
 		}
 
 		this.handles = o.handles ||
-			( !$(".ui-resizable-handle", this.element).length ?
+			( !$( ".ui-resizable-handle", this.element ).length ?
 				"e,s,se" : {
 					n: ".ui-resizable-n",
 					e: ".ui-resizable-e",
@@ -176,55 +178,55 @@ $.widget("ui.resizable", $.ui.mouse, {
 		this._handles = $();
 		if ( this.handles.constructor === String ) {
 
-			if ( this.handles === "all") {
+			if ( this.handles === "all" ) {
 				this.handles = "n,e,s,w,se,sw,ne,nw";
 			}
 
-			n = this.handles.split(",");
+			n = this.handles.split( "," );
 			this.handles = {};
 
-			for (i = 0; i < n.length; i++) {
+			for ( i = 0; i < n.length; i++ ) {
 
-				handle = $.trim(n[i]);
+				handle = $.trim( n[ i ] );
 				hname = "ui-resizable-" + handle;
-				axis = $("<div>");
+				axis = $( "<div>" );
 				this._addClass( axis, "ui-resizable-handle " + hname );
 
-				axis.css({ zIndex: o.zIndex });
+				axis.css( { zIndex: o.zIndex } );
 
-				this.handles[handle] = ".ui-resizable-" + handle;
-				this.element.append(axis);
+				this.handles[ handle ] = ".ui-resizable-" + handle;
+				this.element.append( axis );
 			}
 
 		}
 
-		this._renderAxis = function(target) {
+		this._renderAxis = function( target ) {
 
 			var i, axis, padPos, padWrapper;
 
 			target = target || this.element;
 
-			for (i in this.handles) {
+			for ( i in this.handles ) {
 
-				if (this.handles[i].constructor === String) {
-					this.handles[i] = this.element.children( this.handles[ i ] ).first().show();
+				if ( this.handles[ i ].constructor === String ) {
+					this.handles[ i ] = this.element.children( this.handles[ i ] ).first().show();
 				} else if ( this.handles[ i ].jquery || this.handles[ i ].nodeType ) {
 					this.handles[ i ] = $( this.handles[ i ] );
-					this._on( this.handles[ i ], { "mousedown": that._mouseDown });
+					this._on( this.handles[ i ], { "mousedown": that._mouseDown } );
 				}
 
-				if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)) {
+				if ( this.elementIsWrapper && this.originalElement[ 0 ].nodeName.match( /^(textarea|input|select|button)$/i ) ) {
 
-					axis = $(this.handles[i], this.element);
+					axis = $( this.handles[ i ], this.element );
 
-					padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
+					padWrapper = /sw|ne|nw|se|n|s/.test( i ) ? axis.outerHeight() : axis.outerWidth();
 
 					padPos = [ "padding",
-						/ne|nw|n/.test(i) ? "Top" :
-						/se|sw|s/.test(i) ? "Bottom" :
-						/^e$/.test(i) ? "Right" : "Left" ].join("");
+						/ne|nw|n/.test( i ) ? "Top" :
+						/se|sw|s/.test( i ) ? "Bottom" :
+						/^e$/.test( i ) ? "Right" : "Left" ].join( "" );
 
-					target.css(padPos, padWrapper);
+					target.css( padPos, padWrapper );
 
 					this._proportionallyResize();
 				}
@@ -234,40 +236,40 @@ $.widget("ui.resizable", $.ui.mouse, {
 		};
 
 		// TODO: make renderAxis a prototype function
-		this._renderAxis(this.element);
+		this._renderAxis( this.element );
 
 		this._handles = this._handles.add( this.element.find( ".ui-resizable-handle" ) );
 		this._handles.disableSelection();
 
 		this._handles.on( "mouseover", function() {
-			if (!that.resizing) {
-				if (this.className) {
-					axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
+			if ( !that.resizing ) {
+				if ( this.className ) {
+					axis = this.className.match( /ui-resizable-(se|sw|ne|nw|n|e|s|w)/i );
 				}
-				that.axis = axis && axis[1] ? axis[1] : "se";
+				that.axis = axis && axis[ 1 ] ? axis[ 1 ] : "se";
 			}
-		});
+		} );
 
-		if (o.autoHide) {
+		if ( o.autoHide ) {
 			this._handles.hide();
 			this._addClass( "ui-resizable-autohide" );
-			$(this.element)
+			$( this.element )
 				.on( "mouseenter", function() {
-					if (o.disabled) {
+					if ( o.disabled ) {
 						return;
 					}
 					that._removeClass( "ui-resizable-autohide" );
 					that._handles.show();
-				})
+				} )
 				.on( "mouseleave", function() {
-					if (o.disabled) {
+					if ( o.disabled ) {
 						return;
 					}
-					if (!that.resizing) {
+					if ( !that.resizing ) {
 						that._addClass( "ui-resizable-autohide" );
 						that._handles.hide();
 					}
-				});
+				} );
 		}
 
 		this._mouseInit();
@@ -278,42 +280,42 @@ $.widget("ui.resizable", $.ui.mouse, {
 		this._mouseDestroy();
 
 		var wrapper,
-			_destroy = function(exp) {
-				$(exp)
-					.removeData("resizable")
-					.removeData("ui-resizable")
-					.off(".resizable")
-					.find(".ui-resizable-handle")
+			_destroy = function( exp ) {
+				$( exp )
+					.removeData( "resizable" )
+					.removeData( "ui-resizable" )
+					.off( ".resizable" )
+					.find( ".ui-resizable-handle" )
 						.remove();
 			};
 
 		// TODO: Unwrap at same DOM position
-		if (this.elementIsWrapper) {
-			_destroy(this.element);
+		if ( this.elementIsWrapper ) {
+			_destroy( this.element );
 			wrapper = this.element;
-			this.originalElement.css({
-				position: wrapper.css("position"),
+			this.originalElement.css( {
+				position: wrapper.css( "position" ),
 				width: wrapper.outerWidth(),
 				height: wrapper.outerHeight(),
-				top: wrapper.css("top"),
-				left: wrapper.css("left")
-			}).insertAfter( wrapper );
+				top: wrapper.css( "top" ),
+				left: wrapper.css( "left" )
+			} ).insertAfter( wrapper );
 			wrapper.remove();
 		}
 
-		this.originalElement.css("resize", this.originalResizeStyle);
-		_destroy(this.originalElement);
+		this.originalElement.css( "resize", this.originalResizeStyle );
+		_destroy( this.originalElement );
 
 		return this;
 	},
 
-	_mouseCapture: function(event) {
+	_mouseCapture: function( event ) {
 		var i, handle,
 			capture = false;
 
-		for (i in this.handles) {
-			handle = $(this.handles[i])[0];
-			if (handle === event.target || $.contains(handle, event.target)) {
+		for ( i in this.handles ) {
+			handle = $( this.handles[ i ] )[ 0 ];
+			if ( handle === event.target || $.contains( handle, event.target ) ) {
 				capture = true;
 			}
 		}
@@ -321,7 +323,7 @@ $.widget("ui.resizable", $.ui.mouse, {
 		return !this.options.disabled && capture;
 	},
 
-	_mouseStart: function(event) {
+	_mouseStart: function( event ) {
 
 		var curleft, curtop, cursor,
 			o = this.options,
@@ -331,12 +333,12 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 		this._renderProxy();
 
-		curleft = this._num(this.helper.css("left"));
-		curtop = this._num(this.helper.css("top"));
+		curleft = this._num( this.helper.css( "left" ) );
+		curtop = this._num( this.helper.css( "top" ) );
 
-		if (o.containment) {
-			curleft += $(o.containment).scrollLeft() || 0;
-			curtop += $(o.containment).scrollTop() || 0;
+		if ( o.containment ) {
+			curleft += $( o.containment ).scrollLeft() || 0;
+			curtop += $( o.containment ).scrollTop() || 0;
 		}
 
 		this.offset = this.helper.offset();
@@ -366,45 +368,45 @@ $.widget("ui.resizable", $.ui.mouse, {
 		this.originalPosition = { left: curleft, top: curtop };
 		this.originalMousePosition = { left: event.pageX, top: event.pageY };
 
-		this.aspectRatio = (typeof o.aspectRatio === "number") ?
+		this.aspectRatio = ( typeof o.aspectRatio === "number" ) ?
 			o.aspectRatio :
-			((this.originalSize.width / this.originalSize.height) || 1);
+			( ( this.originalSize.width / this.originalSize.height ) || 1 );
 
-		cursor = $(".ui-resizable-" + this.axis).css("cursor");
-		$("body").css("cursor", cursor === "auto" ? this.axis + "-resize" : cursor);
+		cursor = $( ".ui-resizable-" + this.axis ).css( "cursor" );
+		$( "body" ).css( "cursor", cursor === "auto" ? this.axis + "-resize" : cursor );
 
 		this._addClass( "ui-resizable-resizing" );
-		this._propagate("start", event);
+		this._propagate( "start", event );
 		return true;
 	},
 
-	_mouseDrag: function(event) {
+	_mouseDrag: function( event ) {
 
 		var data, props,
 			smp = this.originalMousePosition,
 			a = this.axis,
-			dx = (event.pageX - smp.left) || 0,
-			dy = (event.pageY - smp.top) || 0,
-			trigger = this._change[a];
+			dx = ( event.pageX - smp.left ) || 0,
+			dy = ( event.pageY - smp.top ) || 0,
+			trigger = this._change[ a ];
 
 		this._updatePrevProperties();
 
-		if (!trigger) {
+		if ( !trigger ) {
 			return false;
 		}
 
-		data = trigger.apply(this, [ event, dx, dy ]);
+		data = trigger.apply( this, [ event, dx, dy ] );
 
-		this._updateVirtualBoundaries(event.shiftKey);
-		if (this._aspectRatio || event.shiftKey) {
-			data = this._updateRatio(data, event);
+		this._updateVirtualBoundaries( event.shiftKey );
+		if ( this._aspectRatio || event.shiftKey ) {
+			data = this._updateRatio( data, event );
 		}
 
-		data = this._respectSize(data, event);
+		data = this._respectSize( data, event );
 
-		this._updateCache(data);
+		this._updateCache( data );
 
-		this._propagate("resize", event);
+		this._propagate( "resize", event );
 
 		props = this._applyChanges();
 
@@ -421,47 +423,47 @@ $.widget("ui.resizable", $.ui.mouse, {
 		return false;
 	},
 
-	_mouseStop: function(event) {
+	_mouseStop: function( event ) {
 
 		this.resizing = false;
 		var pr, ista, soffseth, soffsetw, s, left, top,
 			o = this.options, that = this;
 
-		if (this._helper) {
+		if ( this._helper ) {
 
 			pr = this._proportionallyResizeElements;
-			ista = pr.length && (/textarea/i).test(pr[0].nodeName);
-			soffseth = ista && this._hasScroll(pr[0], "left") ? 0 : that.sizeDiff.height;
+			ista = pr.length && ( /textarea/i ).test( pr[ 0 ].nodeName );
+			soffseth = ista && this._hasScroll( pr[ 0 ], "left" ) ? 0 : that.sizeDiff.height;
 			soffsetw = ista ? 0 : that.sizeDiff.width;
 
 			s = {
-				width: (that.helper.width()  - soffsetw),
-				height: (that.helper.height() - soffseth)
+				width: ( that.helper.width()  - soffsetw ),
+				height: ( that.helper.height() - soffseth )
 			};
-			left = (parseInt(that.element.css("left"), 10) +
-				(that.position.left - that.originalPosition.left)) || null;
-			top = (parseInt(that.element.css("top"), 10) +
-				(that.position.top - that.originalPosition.top)) || null;
+			left = ( parseInt( that.element.css( "left" ), 10 ) +
+				( that.position.left - that.originalPosition.left ) ) || null;
+			top = ( parseInt( that.element.css( "top" ), 10 ) +
+				( that.position.top - that.originalPosition.top ) ) || null;
 
-			if (!o.animate) {
-				this.element.css($.extend(s, { top: top, left: left }));
+			if ( !o.animate ) {
+				this.element.css( $.extend( s, { top: top, left: left } ) );
 			}
 
-			that.helper.height(that.size.height);
-			that.helper.width(that.size.width);
+			that.helper.height( that.size.height );
+			that.helper.width( that.size.width );
 
-			if (this._helper && !o.animate) {
+			if ( this._helper && !o.animate ) {
 				this._proportionallyResize();
 			}
 		}
 
-		$("body").css("cursor", "auto");
+		$( "body" ).css( "cursor", "auto" );
 
 		this._removeClass( "ui-resizable-resizing" );
 
-		this._propagate("stop", event);
+		this._propagate( "stop", event );
 
-		if (this._helper) {
+		if ( this._helper ) {
 			this.helper.remove();
 		}
 
@@ -501,51 +503,51 @@ $.widget("ui.resizable", $.ui.mouse, {
 		return props;
 	},
 
-	_updateVirtualBoundaries: function(forceAspectRatio) {
+	_updateVirtualBoundaries: function( forceAspectRatio ) {
 		var pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b,
 			o = this.options;
 
 		b = {
-			minWidth: this._isNumber(o.minWidth) ? o.minWidth : 0,
-			maxWidth: this._isNumber(o.maxWidth) ? o.maxWidth : Infinity,
-			minHeight: this._isNumber(o.minHeight) ? o.minHeight : 0,
-			maxHeight: this._isNumber(o.maxHeight) ? o.maxHeight : Infinity
+			minWidth: this._isNumber( o.minWidth ) ? o.minWidth : 0,
+			maxWidth: this._isNumber( o.maxWidth ) ? o.maxWidth : Infinity,
+			minHeight: this._isNumber( o.minHeight ) ? o.minHeight : 0,
+			maxHeight: this._isNumber( o.maxHeight ) ? o.maxHeight : Infinity
 		};
 
-		if (this._aspectRatio || forceAspectRatio) {
+		if ( this._aspectRatio || forceAspectRatio ) {
 			pMinWidth = b.minHeight * this.aspectRatio;
 			pMinHeight = b.minWidth / this.aspectRatio;
 			pMaxWidth = b.maxHeight * this.aspectRatio;
 			pMaxHeight = b.maxWidth / this.aspectRatio;
 
-			if (pMinWidth > b.minWidth) {
+			if ( pMinWidth > b.minWidth ) {
 				b.minWidth = pMinWidth;
 			}
-			if (pMinHeight > b.minHeight) {
+			if ( pMinHeight > b.minHeight ) {
 				b.minHeight = pMinHeight;
 			}
-			if (pMaxWidth < b.maxWidth) {
+			if ( pMaxWidth < b.maxWidth ) {
 				b.maxWidth = pMaxWidth;
 			}
-			if (pMaxHeight < b.maxHeight) {
+			if ( pMaxHeight < b.maxHeight ) {
 				b.maxHeight = pMaxHeight;
 			}
 		}
 		this._vBoundaries = b;
 	},
 
-	_updateCache: function(data) {
+	_updateCache: function( data ) {
 		this.offset = this.helper.offset();
-		if (this._isNumber(data.left)) {
+		if ( this._isNumber( data.left ) ) {
 			this.position.left = data.left;
 		}
-		if (this._isNumber(data.top)) {
+		if ( this._isNumber( data.top ) ) {
 			this.position.top = data.top;
 		}
-		if (this._isNumber(data.height)) {
+		if ( this._isNumber( data.height ) ) {
 			this.size.height = data.height;
 		}
-		if (this._isNumber(data.width)) {
+		if ( this._isNumber( data.width ) ) {
 			this.size.width = data.width;
 		}
 	},
@@ -556,19 +558,19 @@ $.widget("ui.resizable", $.ui.mouse, {
 			csize = this.size,
 			a = this.axis;
 
-		if (this._isNumber(data.height)) {
-			data.width = (data.height * this.aspectRatio);
-		} else if (this._isNumber(data.width)) {
-			data.height = (data.width / this.aspectRatio);
+		if ( this._isNumber( data.height ) ) {
+			data.width = ( data.height * this.aspectRatio );
+		} else if ( this._isNumber( data.width ) ) {
+			data.height = ( data.width / this.aspectRatio );
 		}
 
-		if (a === "sw") {
-			data.left = cpos.left + (csize.width - data.width);
+		if ( a === "sw" ) {
+			data.left = cpos.left + ( csize.width - data.width );
 			data.top = null;
 		}
-		if (a === "nw") {
-			data.top = cpos.top + (csize.height - data.height);
-			data.left = cpos.left + (csize.width - data.width);
+		if ( a === "nw" ) {
+			data.top = cpos.top + ( csize.height - data.height );
+			data.left = cpos.left + ( csize.width - data.width );
 		}
 
 		return data;
@@ -578,43 +580,43 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 		var o = this._vBoundaries,
 			a = this.axis,
-			ismaxw = this._isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width),
-			ismaxh = this._isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
-			isminw = this._isNumber(data.width) && o.minWidth && (o.minWidth > data.width),
-			isminh = this._isNumber(data.height) && o.minHeight && (o.minHeight > data.height),
+			ismaxw = this._isNumber( data.width ) && o.maxWidth && ( o.maxWidth < data.width ),
+			ismaxh = this._isNumber( data.height ) && o.maxHeight && ( o.maxHeight < data.height ),
+			isminw = this._isNumber( data.width ) && o.minWidth && ( o.minWidth > data.width ),
+			isminh = this._isNumber( data.height ) && o.minHeight && ( o.minHeight > data.height ),
 			dw = this.originalPosition.left + this.originalSize.width,
 			dh = this.position.top + this.size.height,
-			cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
-		if (isminw) {
+			cw = /sw|nw|w/.test( a ), ch = /nw|ne|n/.test( a );
+		if ( isminw ) {
 			data.width = o.minWidth;
 		}
-		if (isminh) {
+		if ( isminh ) {
 			data.height = o.minHeight;
 		}
-		if (ismaxw) {
+		if ( ismaxw ) {
 			data.width = o.maxWidth;
 		}
-		if (ismaxh) {
+		if ( ismaxh ) {
 			data.height = o.maxHeight;
 		}
 
-		if (isminw && cw) {
+		if ( isminw && cw ) {
 			data.left = dw - o.minWidth;
 		}
-		if (ismaxw && cw) {
+		if ( ismaxw && cw ) {
 			data.left = dw - o.maxWidth;
 		}
-		if (isminh && ch) {
+		if ( isminh && ch ) {
 			data.top = dh - o.minHeight;
 		}
-		if (ismaxh && ch) {
+		if ( ismaxh && ch ) {
 			data.top = dh - o.maxHeight;
 		}
 
 		// Fixing jump error on top/left - bug #2330
-		if (!data.width && !data.height && !data.left && data.top) {
+		if ( !data.width && !data.height && !data.left && data.top ) {
 			data.top = null;
-		} else if (!data.width && !data.height && !data.top && data.left) {
+		} else if ( !data.width && !data.height && !data.top && data.left ) {
 			data.left = null;
 		}
 
@@ -650,7 +652,7 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 	_proportionallyResize: function() {
 
-		if (!this._proportionallyResizeElements.length) {
+		if ( !this._proportionallyResizeElements.length ) {
 			return;
 		}
 
@@ -658,20 +660,20 @@ $.widget("ui.resizable", $.ui.mouse, {
 			i = 0,
 			element = this.helper || this.element;
 
-		for ( ; i < this._proportionallyResizeElements.length; i++) {
+		for ( ; i < this._proportionallyResizeElements.length; i++ ) {
 
-			prel = this._proportionallyResizeElements[i];
+			prel = this._proportionallyResizeElements[ i ];
 
 			// TODO: Seems like a bug to cache this.outerDimensions
 			// considering that we are in a loop.
-			if (!this.outerDimensions) {
+			if ( !this.outerDimensions ) {
 				this.outerDimensions = this._getPaddingPlusBorderDimensions( prel );
 			}
 
-			prel.css({
-				height: (element.height() - this.outerDimensions.height) || 0,
-				width: (element.width() - this.outerDimensions.width) || 0
-			});
+			prel.css( {
+				height: ( element.height() - this.outerDimensions.height ) || 0,
+				width: ( element.width() - this.outerDimensions.width ) || 0
+			} );
 
 		}
 
@@ -682,22 +684,22 @@ $.widget("ui.resizable", $.ui.mouse, {
 		var el = this.element, o = this.options;
 		this.elementOffset = el.offset();
 
-		if (this._helper) {
+		if ( this._helper ) {
 
-			this.helper = this.helper || $("<div style='overflow:hidden;'></div>");
+			this.helper = this.helper || $( "<div style='overflow:hidden;'></div>" );
 
 			this._addClass( this.helper, this._helper );
-			this.helper.css({
+			this.helper.css( {
 				width: this.element.outerWidth() - 1,
 				height: this.element.outerHeight() - 1,
 				position: "absolute",
 				left: this.elementOffset.left + "px",
 				top: this.elementOffset.top + "px",
 				zIndex: ++o.zIndex //TODO: Don't modify option
-			});
+			} );
 
 			this.helper
-				.appendTo("body")
+				.appendTo( "body" )
 				.disableSelection();
 
 		} else {
@@ -707,41 +709,41 @@ $.widget("ui.resizable", $.ui.mouse, {
 	},
 
 	_change: {
-		e: function(event, dx) {
+		e: function( event, dx ) {
 			return { width: this.originalSize.width + dx };
 		},
-		w: function(event, dx) {
+		w: function( event, dx ) {
 			var cs = this.originalSize, sp = this.originalPosition;
 			return { left: sp.left + dx, width: cs.width - dx };
 		},
-		n: function(event, dx, dy) {
+		n: function( event, dx, dy ) {
 			var cs = this.originalSize, sp = this.originalPosition;
 			return { top: sp.top + dy, height: cs.height - dy };
 		},
-		s: function(event, dx, dy) {
+		s: function( event, dx, dy ) {
 			return { height: this.originalSize.height + dy };
 		},
-		se: function(event, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments),
-				this._change.e.apply(this, [ event, dx, dy ]));
+		se: function( event, dx, dy ) {
+			return $.extend( this._change.s.apply( this, arguments ),
+				this._change.e.apply( this, [ event, dx, dy ] ) );
 		},
-		sw: function(event, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments),
-				this._change.w.apply(this, [ event, dx, dy ]));
+		sw: function( event, dx, dy ) {
+			return $.extend( this._change.s.apply( this, arguments ),
+				this._change.w.apply( this, [ event, dx, dy ] ) );
 		},
-		ne: function(event, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments),
-				this._change.e.apply(this, [ event, dx, dy ]));
+		ne: function( event, dx, dy ) {
+			return $.extend( this._change.n.apply( this, arguments ),
+				this._change.e.apply( this, [ event, dx, dy ] ) );
 		},
-		nw: function(event, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments),
-				this._change.w.apply(this, [ event, dx, dy ]));
+		nw: function( event, dx, dy ) {
+			return $.extend( this._change.n.apply( this, arguments ),
+				this._change.w.apply( this, [ event, dx, dy ] ) );
 		}
 	},
 
-	_propagate: function(n, event) {
-		$.ui.plugin.call(this, n, [ event, this.ui() ]);
-		(n !== "resize" && this._trigger(n, event, this.ui()));
+	_propagate: function( n, event ) {
+		$.ui.plugin.call( this, n, [ event, this.ui() ] );
+		( n !== "resize" && this._trigger( n, event, this.ui() ) );
 	},
 
 	plugins: {},
@@ -758,54 +760,54 @@ $.widget("ui.resizable", $.ui.mouse, {
 		};
 	}
 
-});
+} );
 
 /*
  * Resizable Extensions
  */
 
-$.ui.plugin.add("resizable", "animate", {
+$.ui.plugin.add( "resizable", "animate", {
 
 	stop: function( event ) {
-		var that = $(this).resizable( "instance" ),
+		var that = $( this ).resizable( "instance" ),
 			o = that.options,
 			pr = that._proportionallyResizeElements,
-			ista = pr.length && (/textarea/i).test(pr[0].nodeName),
-			soffseth = ista && that._hasScroll(pr[0], "left") ? 0 : that.sizeDiff.height,
+			ista = pr.length && ( /textarea/i ).test( pr[ 0 ].nodeName ),
+			soffseth = ista && that._hasScroll( pr[ 0 ], "left" ) ? 0 : that.sizeDiff.height,
 			soffsetw = ista ? 0 : that.sizeDiff.width,
-			style = { width: (that.size.width - soffsetw), height: (that.size.height - soffseth) },
-			left = (parseInt(that.element.css("left"), 10) +
-				(that.position.left - that.originalPosition.left)) || null,
-			top = (parseInt(that.element.css("top"), 10) +
-				(that.position.top - that.originalPosition.top)) || null;
+			style = { width: ( that.size.width - soffsetw ), height: ( that.size.height - soffseth ) },
+			left = ( parseInt( that.element.css( "left" ), 10 ) +
+				( that.position.left - that.originalPosition.left ) ) || null,
+			top = ( parseInt( that.element.css( "top" ), 10 ) +
+				( that.position.top - that.originalPosition.top ) ) || null;
 
 		that.element.animate(
-			$.extend(style, top && left ? { top: top, left: left } : {}), {
+			$.extend( style, top && left ? { top: top, left: left } : {} ), {
 				duration: o.animateDuration,
 				easing: o.animateEasing,
 				step: function() {
 
 					var data = {
-						width: parseInt(that.element.css("width"), 10),
-						height: parseInt(that.element.css("height"), 10),
-						top: parseInt(that.element.css("top"), 10),
-						left: parseInt(that.element.css("left"), 10)
+						width: parseInt( that.element.css( "width" ), 10 ),
+						height: parseInt( that.element.css( "height" ), 10 ),
+						top: parseInt( that.element.css( "top" ), 10 ),
+						left: parseInt( that.element.css( "left" ), 10 )
 					};
 
-					if (pr && pr.length) {
-						$(pr[0]).css({ width: data.width, height: data.height });
+					if ( pr && pr.length ) {
+						$( pr[ 0 ] ).css( { width: data.width, height: data.height } );
 					}
 
 					// Propagating resize, and updating values for each animation step
-					that._updateCache(data);
-					that._propagate("resize", event);
+					that._updateCache( data );
+					that._propagate( "resize", event );
 
 				}
 			}
 		);
 	}
 
-});
+} );
 
 $.ui.plugin.add( "resizable", "containment", {
 
@@ -843,9 +845,9 @@ $.ui.plugin.add( "resizable", "containment", {
 		} else {
 			element = $( ce );
 			p = [];
-			$([ "Top", "Right", "Left", "Bottom" ]).each(function( i, name ) {
+			$( [ "Top", "Right", "Left", "Bottom" ] ).each( function( i, name ) {
 				p[ i ] = that._num( element.css( "padding" + name ) );
-			});
+			} );
 
 			that.containerOffset = element.offset();
 			that.containerPosition = element.position();
@@ -926,14 +928,14 @@ $.ui.plugin.add( "resizable", "containment", {
 		}
 
 		woset = Math.abs( that.sizeDiff.width +
-			(that._helper ?
+			( that._helper ?
 				that.offset.left - cop.left :
-				(that.offset.left - co.left)) );
+				( that.offset.left - co.left ) ) );
 
 		hoset = Math.abs( that.sizeDiff.height +
-			(that._helper ?
+			( that._helper ?
 				that.offset.top - cop.top :
-				(that.offset.top - co.top)) );
+				( that.offset.top - co.top ) ) );
 
 		if ( woset + that.size.width >= that.parentData.width ) {
 			that.size.width = that.parentData.width - woset;
@@ -971,80 +973,80 @@ $.ui.plugin.add( "resizable", "containment", {
 			h = helper.outerHeight() - that.sizeDiff.height;
 
 		if ( that._helper && !o.animate && ( /relative/ ).test( ce.css( "position" ) ) ) {
-			$( this ).css({
+			$( this ).css( {
 				left: ho.left - cop.left - co.left,
 				width: w,
 				height: h
-			});
+			} );
 		}
 
 		if ( that._helper && !o.animate && ( /static/ ).test( ce.css( "position" ) ) ) {
-			$( this ).css({
+			$( this ).css( {
 				left: ho.left - cop.left - co.left,
 				width: w,
 				height: h
-			});
+			} );
 		}
 	}
-});
+} );
 
-$.ui.plugin.add("resizable", "alsoResize", {
+$.ui.plugin.add( "resizable", "alsoResize", {
 
 	start: function() {
-		var that = $(this).resizable( "instance" ),
+		var that = $( this ).resizable( "instance" ),
 			o = that.options;
 
-		$(o.alsoResize).each(function() {
-			var el = $(this);
-			el.data("ui-resizable-alsoresize", {
-				width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
-				left: parseInt(el.css("left"), 10), top: parseInt(el.css("top"), 10)
-			});
-		});
+		$( o.alsoResize ).each( function() {
+			var el = $( this );
+			el.data( "ui-resizable-alsoresize", {
+				width: parseInt( el.width(), 10 ), height: parseInt( el.height(), 10 ),
+				left: parseInt( el.css( "left" ), 10 ), top: parseInt( el.css( "top" ), 10 )
+			} );
+		} );
 	},
 
-	resize: function(event, ui) {
-		var that = $(this).resizable( "instance" ),
+	resize: function( event, ui ) {
+		var that = $( this ).resizable( "instance" ),
 			o = that.options,
 			os = that.originalSize,
 			op = that.originalPosition,
 			delta = {
-				height: (that.size.height - os.height) || 0,
-				width: (that.size.width - os.width) || 0,
-				top: (that.position.top - op.top) || 0,
-				left: (that.position.left - op.left) || 0
+				height: ( that.size.height - os.height ) || 0,
+				width: ( that.size.width - os.width ) || 0,
+				top: ( that.position.top - op.top ) || 0,
+				left: ( that.position.left - op.left ) || 0
 			};
 
-			$(o.alsoResize).each(function() {
-				var el = $(this), start = $(this).data("ui-resizable-alsoresize"), style = {},
-					css = el.parents(ui.originalElement[0]).length ?
+			$( o.alsoResize ).each( function() {
+				var el = $( this ), start = $( this ).data( "ui-resizable-alsoresize" ), style = {},
+					css = el.parents( ui.originalElement[ 0 ] ).length ?
 							[ "width", "height" ] :
 							[ "width", "height", "top", "left" ];
 
-				$.each(css, function(i, prop) {
-					var sum = (start[prop] || 0) + (delta[prop] || 0);
-					if (sum && sum >= 0) {
-						style[prop] = sum || null;
+				$.each( css, function( i, prop ) {
+					var sum = ( start[ prop ] || 0 ) + ( delta[ prop ] || 0 );
+					if ( sum && sum >= 0 ) {
+						style[ prop ] = sum || null;
 					}
-				});
+				} );
 
-				el.css(style);
-			});
+				el.css( style );
+			} );
 	},
 
 	stop: function() {
-		$(this).removeData("resizable-alsoresize");
+		$( this ).removeData( "resizable-alsoresize" );
 	}
-});
+} );
 
-$.ui.plugin.add("resizable", "ghost", {
+$.ui.plugin.add( "resizable", "ghost", {
 
 	start: function() {
 
-		var that = $(this).resizable( "instance" ), cs = that.size;
+		var that = $( this ).resizable( "instance" ), cs = that.size;
 
 		that.ghost = that.originalElement.clone();
-		that.ghost.css({
+		that.ghost.css( {
 			opacity: 0.25,
 			display: "block",
 			position: "relative",
@@ -1053,7 +1055,7 @@ $.ui.plugin.add("resizable", "ghost", {
 			margin: 0,
 			left: 0,
 			top: 0
-		});
+		} );
 
 		that._addClass( that.ghost, "ui-resizable-ghost" );
 
@@ -1065,80 +1067,80 @@ $.ui.plugin.add("resizable", "ghost", {
 			that.ghost.addClass( this.options.ghost );
 		}
 
-		that.ghost.appendTo(that.helper);
+		that.ghost.appendTo( that.helper );
 
 	},
 
 	resize: function() {
-		var that = $(this).resizable( "instance" );
-		if (that.ghost) {
-			that.ghost.css({
+		var that = $( this ).resizable( "instance" );
+		if ( that.ghost ) {
+			that.ghost.css( {
 				position: "relative",
 				height: that.size.height,
 				width: that.size.width
-			});
+			} );
 		}
 	},
 
 	stop: function() {
-		var that = $(this).resizable( "instance" );
-		if (that.ghost && that.helper) {
-			that.helper.get(0).removeChild(that.ghost.get(0));
+		var that = $( this ).resizable( "instance" );
+		if ( that.ghost && that.helper ) {
+			that.helper.get( 0 ).removeChild( that.ghost.get( 0 ) );
 		}
 	}
 
-});
+} );
 
-$.ui.plugin.add("resizable", "grid", {
+$.ui.plugin.add( "resizable", "grid", {
 
 	resize: function() {
 		var outerDimensions,
-			that = $(this).resizable( "instance" ),
+			that = $( this ).resizable( "instance" ),
 			o = that.options,
 			cs = that.size,
 			os = that.originalSize,
 			op = that.originalPosition,
 			a = that.axis,
 			grid = typeof o.grid === "number" ? [ o.grid, o.grid ] : o.grid,
-			gridX = (grid[0] || 1),
-			gridY = (grid[1] || 1),
-			ox = Math.round((cs.width - os.width) / gridX) * gridX,
-			oy = Math.round((cs.height - os.height) / gridY) * gridY,
+			gridX = ( grid[ 0 ] || 1 ),
+			gridY = ( grid[ 1 ] || 1 ),
+			ox = Math.round( ( cs.width - os.width ) / gridX ) * gridX,
+			oy = Math.round( ( cs.height - os.height ) / gridY ) * gridY,
 			newWidth = os.width + ox,
 			newHeight = os.height + oy,
-			isMaxWidth = o.maxWidth && (o.maxWidth < newWidth),
-			isMaxHeight = o.maxHeight && (o.maxHeight < newHeight),
-			isMinWidth = o.minWidth && (o.minWidth > newWidth),
-			isMinHeight = o.minHeight && (o.minHeight > newHeight);
+			isMaxWidth = o.maxWidth && ( o.maxWidth < newWidth ),
+			isMaxHeight = o.maxHeight && ( o.maxHeight < newHeight ),
+			isMinWidth = o.minWidth && ( o.minWidth > newWidth ),
+			isMinHeight = o.minHeight && ( o.minHeight > newHeight );
 
 		o.grid = grid;
 
-		if (isMinWidth) {
+		if ( isMinWidth ) {
 			newWidth += gridX;
 		}
-		if (isMinHeight) {
+		if ( isMinHeight ) {
 			newHeight += gridY;
 		}
-		if (isMaxWidth) {
+		if ( isMaxWidth ) {
 			newWidth -= gridX;
 		}
-		if (isMaxHeight) {
+		if ( isMaxHeight ) {
 			newHeight -= gridY;
 		}
 
-		if (/^(se|s|e)$/.test(a)) {
+		if ( /^(se|s|e)$/.test( a ) ) {
 			that.size.width = newWidth;
 			that.size.height = newHeight;
-		} else if (/^(ne)$/.test(a)) {
+		} else if ( /^(ne)$/.test( a ) ) {
 			that.size.width = newWidth;
 			that.size.height = newHeight;
 			that.position.top = op.top - oy;
-		} else if (/^(sw)$/.test(a)) {
+		} else if ( /^(sw)$/.test( a ) ) {
 			that.size.width = newWidth;
 			that.size.height = newHeight;
 			that.position.left = op.left - ox;
 		} else {
-			if ( newHeight - gridY <= 0 || newWidth - gridX <= 0) {
+			if ( newHeight - gridY <= 0 || newWidth - gridX <= 0 ) {
 				outerDimensions = that._getPaddingPlusBorderDimensions( this );
 			}
 
@@ -1161,8 +1163,8 @@ $.ui.plugin.add("resizable", "grid", {
 		}
 	}
 
-});
+} );
 
 return $.ui.resizable;
 
-}));
+} ) );

From 9bf3b5f98b3fbadcbb35084c6d2b7afe234bb509 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 08:58:48 -0400
Subject: [PATCH 09/27] Progressbar: Style updates

Ref #14246
---
 tests/unit/progressbar/common.js  |  2 +-
 tests/unit/progressbar/core.js    |  8 +++----
 tests/unit/progressbar/events.js  | 18 +++++++--------
 tests/unit/progressbar/methods.js | 12 +++++-----
 tests/unit/progressbar/options.js | 38 +++++++++++++++----------------
 ui/widgets/progressbar.js         |  2 ++
 6 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/tests/unit/progressbar/common.js b/tests/unit/progressbar/common.js
index baadb6d5319..566b96465d2 100644
--- a/tests/unit/progressbar/common.js
+++ b/tests/unit/progressbar/common.js
@@ -19,6 +19,6 @@ common.testWidget( "progressbar", {
 		complete: null,
 		create: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/progressbar/core.js b/tests/unit/progressbar/core.js
index 8c09f67ae2a..3c5ad9e686a 100644
--- a/tests/unit/progressbar/core.js
+++ b/tests/unit/progressbar/core.js
@@ -19,11 +19,11 @@ test( "markup structure", function( assert ) {
 	element.progressbar( "option", "value", 100 );
 	assert.hasClasses( value, "ui-progressbar-complete ui-widget-header ui-progressbar-value" );
 	equal( element.children().children().length, 0, "no overlay div" );
-});
+} );
 
 test( "markup structure - indeterminate", function( assert ) {
 	expect( 5 );
-	var element = $( "#progressbar" ).progressbar({ value: false }),
+	var element = $( "#progressbar" ).progressbar( { value: false } ),
 		children = element.children();
 
 	assert.hasClasses( element, "ui-progressbar ui-progressbar-indeterminate ui-widget ui-widget-content" );
@@ -32,7 +32,7 @@ test( "markup structure - indeterminate", function( assert ) {
 	assert.hasClasses( children[ 0 ], "ui-progressbar-value" );
 	equal( children.children( ".ui-progressbar-overlay" ).length, 1,
 		"Value has class ui-progressbar-overlay" );
-});
+} );
 
 test( "accessibility", function() {
 	expect( 11 );
@@ -59,6 +59,6 @@ test( "accessibility", function() {
 	equal( element.attr( "aria-valuemin" ), 0, "aria-valuemin" );
 	equal( element.attr( "aria-valuemax" ), 150, "aria-valuemax" );
 	equal( element.attr( "aria-valuenow" ), null, "aria-valuenow" );
-});
+} );
 
 } );
diff --git a/tests/unit/progressbar/events.js b/tests/unit/progressbar/events.js
index 7f4926466f4..b767e1395f1 100644
--- a/tests/unit/progressbar/events.js
+++ b/tests/unit/progressbar/events.js
@@ -7,7 +7,7 @@ module( "progressbar: events" );
 
 test( "create", function() {
 	expect( 1 );
-	$( "#progressbar" ).progressbar({
+	$( "#progressbar" ).progressbar( {
 		value: 5,
 		create: function() {
 			equal( $( this ).progressbar( "value" ), 5, "Correct value at create" );
@@ -15,8 +15,8 @@ test( "create", function() {
 		change: function() {
 			ok( false, "create has triggered change()" );
 		}
-	});
-});
+	} );
+} );
 
 test( "change", function() {
 	expect( 2 );
@@ -24,19 +24,19 @@ test( "change", function() {
 
 	element.one( "progressbarchange", function() {
 		equal( element.progressbar( "value" ), 5, "change triggered for middle value" );
-	});
+	} );
 	element.progressbar( "value", 5 );
 	element.one( "progressbarchange", function() {
 		equal( element.progressbar( "value" ), 100, "change triggered for final value" );
-	});
+	} );
 	element.progressbar( "value", 100 );
-});
+} );
 
 test( "complete", function() {
 	expect( 5 );
 	var value,
 		changes = 0,
-		element = $( "#progressbar" ).progressbar({
+		element = $( "#progressbar" ).progressbar( {
 			change: function() {
 				changes++;
 				equal( element.progressbar( "value" ), value, "change at " + value );
@@ -45,7 +45,7 @@ test( "complete", function() {
 				equal( changes, 3, "complete triggered after change and not on indeterminate" );
 				equal( element.progressbar( "value" ), 100, "value is 100" );
 			}
-		});
+		} );
 
 	value = 5;
 	element.progressbar( "value", value );
@@ -53,6 +53,6 @@ test( "complete", function() {
 	element.progressbar( "value", value );
 	value = 100;
 	element.progressbar( "value", value );
-});
+} );
 
 } );
diff --git a/tests/unit/progressbar/methods.js b/tests/unit/progressbar/methods.js
index 00de2f46e84..4bc4fa65ea5 100644
--- a/tests/unit/progressbar/methods.js
+++ b/tests/unit/progressbar/methods.js
@@ -9,8 +9,8 @@ test( "destroy", function( assert ) {
 	expect( 1 );
 	assert.domEqual( "#progressbar", function() {
 		$( "#progressbar" ).progressbar().progressbar( "destroy" );
-	});
-});
+	} );
+} );
 
 test( "disable", function( assert ) {
 	expect( 3 );
@@ -20,16 +20,16 @@ test( "disable", function( assert ) {
 	assert.hasClasses( element.progressbar( "widget" ), "ui-state-disabled" );
 	ok( element.progressbar( "widget" ).attr( "aria-disabled" ), "element gets aria-disabled" );
 	assert.hasClasses( element.progressbar( "widget" ), "ui-progressbar-disabled" );
-});
+} );
 
 test( "value", function() {
 	expect( 3 );
 
-	var element = $( "<div>" ).progressbar({ value: 20 });
+	var element = $( "<div>" ).progressbar( { value: 20 } );
 	equal( element.progressbar( "value" ), 20, "correct value as getter" );
 	strictEqual( element.progressbar( "value", 30 ), element, "chainable as setter" );
 	equal( element.progressbar( "option", "value" ), 30, "correct value after setter" );
-});
+} );
 
 test( "widget", function() {
 	expect( 2 );
@@ -37,6 +37,6 @@ test( "widget", function() {
 		widgetElement = element.progressbar( "widget" );
 	equal( widgetElement.length, 1, "one element" );
 	strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
-});
+} );
 
 } );
diff --git a/tests/unit/progressbar/options.js b/tests/unit/progressbar/options.js
index 533c1535136..fb6faac9a36 100644
--- a/tests/unit/progressbar/options.js
+++ b/tests/unit/progressbar/options.js
@@ -9,14 +9,14 @@ test( "{ value: 0 }, default", function() {
 	expect( 1 );
 	$( "#progressbar" ).progressbar();
 	equal( $( "#progressbar" ).progressbar( "value" ), 0 );
-});
+} );
 
 // Ticket #7231 - valueDiv should be hidden when value is at 0%
 test( "value: visibility of valueDiv", function() {
 	expect( 4 );
-	var element = $( "#progressbar" ).progressbar({
+	var element = $( "#progressbar" ).progressbar( {
 		value: 0
-	});
+	} );
 	ok( element.children( ".ui-progressbar-value" ).is( ":hidden" ),
 		"valueDiv hidden when value is initialized at 0" );
 	element.progressbar( "value", 1 );
@@ -28,52 +28,52 @@ test( "value: visibility of valueDiv", function() {
 	element.progressbar( "value", 0 );
 	ok( element.children( ".ui-progressbar-value" ).is( ":hidden" ),
 		"valueDiv hidden when value is set to 0" );
-});
+} );
 
 test( "{ value: 5 }", function() {
 	expect( 1 );
-	$( "#progressbar" ).progressbar({
+	$( "#progressbar" ).progressbar( {
 		value: 5
-	});
+	} );
 	equal( $( "#progressbar" ).progressbar( "value" ), 5 );
-});
+} );
 
 test( "{ value: -5 }", function() {
 	expect( 1 );
-	$( "#progressbar" ).progressbar({
+	$( "#progressbar" ).progressbar( {
 		value: -5
-	});
+	} );
 	equal( $( "#progressbar" ).progressbar( "value" ), 0,
 		"value constrained at min" );
-});
+} );
 
 test( "{ value: 105 }", function() {
 	expect( 1 );
-	$( "#progressbar" ).progressbar({
+	$( "#progressbar" ).progressbar( {
 		value: 105
-	});
+	} );
 	equal( $( "#progressbar" ).progressbar( "value" ), 100,
 		"value constrained at max" );
-});
+} );
 
 test( "{ value: 10, max: 5 }", function() {
 	expect( 1 );
-	$("#progressbar").progressbar({
+	$( "#progressbar" ).progressbar( {
 		max: 5,
 		value: 10
-	});
+	} );
 	equal( $( "#progressbar" ).progressbar( "value" ), 5,
 		"value constrained at max" );
-});
+} );
 
 test( "change max below value", function() {
 	expect( 1 );
-	$("#progressbar").progressbar({
+	$( "#progressbar" ).progressbar( {
 		max: 10,
 		value: 10
-	}).progressbar( "option", "max", 5 );
+	} ).progressbar( "option", "max", 5 );
 	equal( $( "#progressbar" ).progressbar( "value" ), 5,
 		"value constrained at max" );
-});
+} );
 
 } );
diff --git a/ui/widgets/progressbar.js b/ui/widgets/progressbar.js
index 07ffaa97f8d..b2c7259ba03 100644
--- a/ui/widgets/progressbar.js
+++ b/ui/widgets/progressbar.js
@@ -100,6 +100,7 @@ return $.widget( "ui.progressbar", {
 	},
 
 	_setOptions: function( options ) {
+
 		// Ensure "value" option is set after other values (like max)
 		var value = options.value;
 		delete options.value;
@@ -112,6 +113,7 @@ return $.widget( "ui.progressbar", {
 
 	_setOption: function( key, value ) {
 		if ( key === "max" ) {
+
 			// Don't allow a max less than min
 			value = Math.max( this.min, value );
 		}

From 27a0e3854be5669c6a8f49ffd9437ee2bfaad626 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 08:59:04 -0400
Subject: [PATCH 10/27] Mouse: Style updates

Ref #14246
---
 ui/widgets/mouse.js | 116 +++++++++++++++++++++++---------------------
 1 file changed, 60 insertions(+), 56 deletions(-)

diff --git a/ui/widgets/mouse.js b/ui/widgets/mouse.js
index 2114f187000..4ead891a3e1 100644
--- a/ui/widgets/mouse.js
+++ b/ui/widgets/mouse.js
@@ -12,11 +12,11 @@
 //>>description: Abstracts mouse-based interactions to assist in creating certain widgets.
 //>>docs: http://api.jqueryui.com/mouse/
 
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([
+		define( [
 			"jquery",
 			"../ie",
 			"../version",
@@ -27,14 +27,14 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}(function( $ ) {
+}( function( $ ) {
 
 var mouseHandled = false;
 $( document ).on( "mouseup", function() {
 	mouseHandled = false;
-});
+} );
 
-return $.widget("ui.mouse", {
+return $.widget( "ui.mouse", {
 	version: "@VERSION",
 	options: {
 		cancel: "input, textarea, button, select, option",
@@ -45,16 +45,16 @@ return $.widget("ui.mouse", {
 		var that = this;
 
 		this.element
-			.on("mousedown." + this.widgetName, function(event) {
-				return that._mouseDown(event);
-			})
-			.on("click." + this.widgetName, function(event) {
-				if (true === $.data(event.target, that.widgetName + ".preventClickEvent")) {
-					$.removeData(event.target, that.widgetName + ".preventClickEvent");
+			.on( "mousedown." + this.widgetName, function( event ) {
+				return that._mouseDown( event );
+			} )
+			.on( "click." + this.widgetName, function( event ) {
+				if ( true === $.data( event.target, that.widgetName + ".preventClickEvent" ) ) {
+					$.removeData( event.target, that.widgetName + ".preventClickEvent" );
 					event.stopImmediatePropagation();
 					return false;
 				}
-			});
+			} );
 
 		this.started = false;
 	},
@@ -62,15 +62,16 @@ return $.widget("ui.mouse", {
 	// TODO: make sure destroying one instance of mouse doesn't mess with
 	// other instances of mouse
 	_mouseDestroy: function() {
-		this.element.off("." + this.widgetName);
+		this.element.off( "." + this.widgetName );
 		if ( this._mouseMoveDelegate ) {
 			this.document
-				.off("mousemove." + this.widgetName, this._mouseMoveDelegate)
-				.off("mouseup." + this.widgetName, this._mouseUpDelegate);
+				.off( "mousemove." + this.widgetName, this._mouseMoveDelegate )
+				.off( "mouseup." + this.widgetName, this._mouseUpDelegate );
 		}
 	},
 
-	_mouseDown: function(event) {
+	_mouseDown: function( event ) {
+
 		// don't let more than one widget handle mouseStart
 		if ( mouseHandled ) {
 			return;
@@ -79,45 +80,46 @@ return $.widget("ui.mouse", {
 		this._mouseMoved = false;
 
 		// We may have missed mouseup (out of window)
-		(this._mouseStarted && this._mouseUp(event));
+		( this._mouseStarted && this._mouseUp( event ) );
 
 		this._mouseDownEvent = event;
 
 		var that = this,
-			btnIsLeft = (event.which === 1),
+			btnIsLeft = ( event.which === 1 ),
+
 			// event.target.nodeName works around a bug in IE 8 with
 			// disabled inputs (#7620)
-			elIsCancel = (typeof this.options.cancel === "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false);
-		if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
+			elIsCancel = ( typeof this.options.cancel === "string" && event.target.nodeName ? $( event.target ).closest( this.options.cancel ).length : false );
+		if ( !btnIsLeft || elIsCancel || !this._mouseCapture( event ) ) {
 			return true;
 		}
 
 		this.mouseDelayMet = !this.options.delay;
-		if (!this.mouseDelayMet) {
-			this._mouseDelayTimer = setTimeout(function() {
+		if ( !this.mouseDelayMet ) {
+			this._mouseDelayTimer = setTimeout( function() {
 				that.mouseDelayMet = true;
-			}, this.options.delay);
+			}, this.options.delay );
 		}
 
-		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
-			this._mouseStarted = (this._mouseStart(event) !== false);
-			if (!this._mouseStarted) {
+		if ( this._mouseDistanceMet( event ) && this._mouseDelayMet( event ) ) {
+			this._mouseStarted = ( this._mouseStart( event ) !== false );
+			if ( !this._mouseStarted ) {
 				event.preventDefault();
 				return true;
 			}
 		}
 
 		// Click event may never have fired (Gecko & Opera)
-		if (true === $.data(event.target, this.widgetName + ".preventClickEvent")) {
-			$.removeData(event.target, this.widgetName + ".preventClickEvent");
+		if ( true === $.data( event.target, this.widgetName + ".preventClickEvent" ) ) {
+			$.removeData( event.target, this.widgetName + ".preventClickEvent" );
 		}
 
 		// These delegates are required to keep context
-		this._mouseMoveDelegate = function(event) {
-			return that._mouseMove(event);
+		this._mouseMoveDelegate = function( event ) {
+			return that._mouseMove( event );
 		};
-		this._mouseUpDelegate = function(event) {
-			return that._mouseUp(event);
+		this._mouseUpDelegate = function( event ) {
+			return that._mouseUp( event );
 		};
 
 		this.document
@@ -130,15 +132,17 @@ return $.widget("ui.mouse", {
 		return true;
 	},
 
-	_mouseMove: function(event) {
+	_mouseMove: function( event ) {
+
 		// Only check for mouseups outside the document if you've moved inside the document
 		// at least once. This prevents the firing of mouseup in the case of IE<9, which will
 		// fire a mousemove event if content is placed under the cursor. See #7778
 		// Support: IE <9
 		if ( this._mouseMoved ) {
+
 			// IE mouseup check - mouseup happened when mouse was out of window
-			if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) {
-				return this._mouseUp(event);
+			if ( $.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button ) {
+				return this._mouseUp( event );
 
 			// Iframe mouseup check - mouseup occurred in another document
 			} else if ( !event.which ) {
@@ -150,56 +154,56 @@ return $.widget("ui.mouse", {
 			this._mouseMoved = true;
 		}
 
-		if (this._mouseStarted) {
-			this._mouseDrag(event);
+		if ( this._mouseStarted ) {
+			this._mouseDrag( event );
 			return event.preventDefault();
 		}
 
-		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+		if ( this._mouseDistanceMet( event ) && this._mouseDelayMet( event ) ) {
 			this._mouseStarted =
-				(this._mouseStart(this._mouseDownEvent, event) !== false);
-			(this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event));
+				( this._mouseStart( this._mouseDownEvent, event ) !== false );
+			( this._mouseStarted ? this._mouseDrag( event ) : this._mouseUp( event ) );
 		}
 
 		return !this._mouseStarted;
 	},
 
-	_mouseUp: function(event) {
+	_mouseUp: function( event ) {
 		this.document
 			.off( "mousemove." + this.widgetName, this._mouseMoveDelegate )
 			.off( "mouseup." + this.widgetName, this._mouseUpDelegate );
 
-		if (this._mouseStarted) {
+		if ( this._mouseStarted ) {
 			this._mouseStarted = false;
 
-			if (event.target === this._mouseDownEvent.target) {
-				$.data(event.target, this.widgetName + ".preventClickEvent", true);
+			if ( event.target === this._mouseDownEvent.target ) {
+				$.data( event.target, this.widgetName + ".preventClickEvent", true );
 			}
 
-			this._mouseStop(event);
+			this._mouseStop( event );
 		}
 
 		mouseHandled = false;
 		return false;
 	},
 
-	_mouseDistanceMet: function(event) {
-		return (Math.max(
-				Math.abs(this._mouseDownEvent.pageX - event.pageX),
-				Math.abs(this._mouseDownEvent.pageY - event.pageY)
+	_mouseDistanceMet: function( event ) {
+		return ( Math.max(
+				Math.abs( this._mouseDownEvent.pageX - event.pageX ),
+				Math.abs( this._mouseDownEvent.pageY - event.pageY )
 			) >= this.options.distance
 		);
 	},
 
-	_mouseDelayMet: function(/* event */) {
+	_mouseDelayMet: function( /* event */ ) {
 		return this.mouseDelayMet;
 	},
 
 	// These are placeholder methods, to be overriden by extending plugin
-	_mouseStart: function(/* event */) {},
-	_mouseDrag: function(/* event */) {},
-	_mouseStop: function(/* event */) {},
-	_mouseCapture: function(/* event */) { return true; }
-});
+	_mouseStart: function( /* event */ ) {},
+	_mouseDrag: function( /* event */ ) {},
+	_mouseStop: function( /* event */ ) {},
+	_mouseCapture: function( /* event */ ) { return true; }
+} );
 
-}));
+} ) );

From 1b0d1485224a5481679666ea12910fc7e4d80786 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 08:59:13 -0400
Subject: [PATCH 11/27] Menu: Style updates

Ref #14246
---
 tests/unit/menu/common.js  |   2 +-
 tests/unit/menu/core.js    |  16 ++--
 tests/unit/menu/events.js  | 162 +++++++++++++++++++------------------
 tests/unit/menu/methods.js |  24 +++---
 tests/unit/menu/options.js |  66 +++++++--------
 ui/widgets/menu.js         |   3 +
 6 files changed, 139 insertions(+), 134 deletions(-)

diff --git a/tests/unit/menu/common.js b/tests/unit/menu/common.js
index adb74cf0a9a..96815c6b27f 100644
--- a/tests/unit/menu/common.js
+++ b/tests/unit/menu/common.js
@@ -24,6 +24,6 @@ common.testWidget( "menu", {
 		focus: null,
 		select: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/menu/core.js b/tests/unit/menu/core.js
index 68f613ee1da..a8e0ece00a3 100644
--- a/tests/unit/menu/core.js
+++ b/tests/unit/menu/core.js
@@ -23,9 +23,9 @@ test( "markup structure", function( assert ) {
 	equal( items.eq( 1 ).children().length, 1, "Item has exactly 1 child when it does not have a sub menu" );
 	assert.hasClasses( items[ 2 ], "ui-menu-item" );
 	equal( items.eq( 2 ).children().length, 1, "Item has exactly 1 child when it does not have a sub menu" );
-});
+} );
 
-test( "accessibility", function () {
+test( "accessibility", function() {
 	expect( 4 );
 	var element = $( "#menu1" ).menu();
 
@@ -39,7 +39,7 @@ test( "accessibility", function () {
 	ok( /^ui-id-\d+$/.test( element.attr( "aria-activedescendant" ) ), "aria-activedescendant from generated id" );
 
 	// Item roles are tested in the role option tests
-});
+} );
 
 asyncTest( "#9044: Autofocus issue with dialog opened from menu widget", function() {
 	expect( 1 );
@@ -49,15 +49,15 @@ asyncTest( "#9044: Autofocus issue with dialog opened from menu widget", functio
 
 	$( "#testID1" ).on( "click", function() {
 		$( "#test9044" ).trigger( "focus" );
-	});
+	} );
 
 	testHelper.click( element, "3" );
 	setTimeout( function() {
 		equal( document.activeElement.id, "test9044", "Focus was swallowed by menu" );
 		$( "#test9044" ).remove();
 		start();
-	});
-});
+	} );
+} );
 
 asyncTest( "#9532: Need a way in Menu to keep ui-state-active class on selected item for Selectmenu", function( assert ) {
 	expect( 1 );
@@ -70,7 +70,7 @@ asyncTest( "#9532: Need a way in Menu to keep ui-state-active class on selected
 	setTimeout( function() {
 		assert.hasClasses( wrapper, "ui-state-active" );
 		start();
-	});
-});
+	} );
+} );
 
 } );
diff --git a/tests/unit/menu/events.js b/tests/unit/menu/events.js
index 790e5912c23..1500c3478b0 100644
--- a/tests/unit/menu/events.js
+++ b/tests/unit/menu/events.js
@@ -12,15 +12,15 @@ module( "menu: events", {
 	setup: function() {
 		testHelper.clearLog();
 	}
-});
+} );
 
 test( "handle click on menu", function() {
 	expect( 1 );
-	var element = $( "#menu1" ).menu({
+	var element = $( "#menu1" ).menu( {
 		select: function() {
 			log();
 		}
-	});
+	} );
 	log( "click", true );
 	click( element, "1" );
 	log( "afterclick" );
@@ -28,16 +28,16 @@ test( "handle click on menu", function() {
 	click( element, "3" );
 	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 element = $( "#menu5" ).menu({
+	var element = $( "#menu5" ).menu( {
 		select: function() {
 			log();
 		},
 		menus: ".menu"
-	});
+	} );
 	log( "click", true );
 	click( element, "1" );
 	log( "afterclick" );
@@ -45,75 +45,77 @@ test( "handle click on custom item menu", function() {
 	click( element, "3" );
 	click( element, "1" );
 	equal( logOutput(), "click,1,afterclick,2,3,1", "Click order not valid." );
-});
+} );
 
 asyncTest( "handle blur", function() {
 	expect( 1 );
 	var blurHandled = false,
-		element = $( "#menu1" ).menu({
+		element = $( "#menu1" ).menu( {
 			blur: function( event ) {
+
 				// Ignore duplicate blur event fired by IE
 				if ( !blurHandled ) {
 					blurHandled = true;
 					equal( event.type, "menublur", "blur event.type is 'menublur'" );
 				}
 			}
-		});
+		} );
 
 	click( element, "1" );
-	setTimeout(function() {
+	setTimeout( function() {
 		element.trigger( "blur" );
-		setTimeout(function() {
+		setTimeout( function() {
 			start();
 		}, 350 );
-	});
-});
+	} );
+} );
 
 asyncTest( "handle blur via click outside", function() {
 	expect( 1 );
 	var blurHandled = false,
-		element = $( "#menu1" ).menu({
+		element = $( "#menu1" ).menu( {
 			blur: function( event ) {
+
 				// Ignore duplicate blur event fired by IE
 				if ( !blurHandled ) {
 					blurHandled = true;
 					equal( event.type, "menublur", "blur event.type is 'menublur'" );
 				}
 			}
-		});
+		} );
 
 	click( element, "1" );
-	setTimeout(function() {
-		$( "<a>", { id: "remove"} ).appendTo( "body" ).trigger( "click" );
-		setTimeout(function() {
+	setTimeout( function() {
+		$( "<a>", { id: "remove" } ).appendTo( "body" ).trigger( "click" );
+		setTimeout( function() {
 			start();
 		}, 350 );
-	});
-});
+	} );
+} );
 
 asyncTest( "handle focus of menu with active item", function() {
 	expect( 1 );
-	var element = $( "#menu1" ).menu({
+	var element = $( "#menu1" ).menu( {
 		focus: function( event ) {
 			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
 		}
-	});
+	} );
 
 	log( "focus", true );
 	element[ 0 ].focus();
-	setTimeout(function() {
+	setTimeout( function() {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element[ 0 ].blur();
-		setTimeout(function() {
+		setTimeout( function() {
 			element[ 0 ].focus();
-			setTimeout(function() {
+			setTimeout( function() {
 				equal( logOutput(), "focus,0,1,2,2", "current active item remains active" );
 				start();
-			});
-		});
-	});
-});
+			} );
+		} );
+	} );
+} );
 
 test( "handle mouseenter on nested menu item", function( assert ) {
 	assert.expect( 8 );
@@ -186,12 +188,12 @@ asyncTest( "handle submenu auto collapse: mouseleave, default markup", function(
 
 	element.find( "li:nth-child(7)" ).trigger( "mouseenter" );
 	setTimeout( menumouseleave1, 25 );
-});
+} );
 
 asyncTest( "handle submenu auto collapse: mouseleave, custom markup", function() {
 	expect( 4 );
 	$.ui.menu.prototype.delay = 1;
-	var element = $( "#menu5" ).menu({ menus: ".menu" }),
+	var element = $( "#menu5" ).menu( { menus: ".menu" } ),
 		event = $.Event( "mouseenter" );
 
 	function menumouseleave1() {
@@ -217,22 +219,22 @@ asyncTest( "handle submenu auto collapse: mouseleave, custom markup", function()
 
 	element.find( ":nth-child(7)" ).trigger( "mouseenter" );
 	setTimeout( menumouseleave1, 25 );
-});
+} );
 
 asyncTest( "handle keyboard navigation on menu without scroll and without submenus", function() {
 	expect( 12 );
-	var element = $( "#menu1" ).menu({
+	var element = $( "#menu1" ).menu( {
 		select: function( event, ui ) {
 			log( $( ui.item[ 0 ] ).text() );
 		},
 		focus: function( event ) {
 			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
 		}
-	});
+	} );
 
 	log( "keydown", true );
 	element[ 0 ].focus();
-	setTimeout(function() {
+	setTimeout( function() {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		equal( logOutput(), "keydown,0,1,2", "Keydown DOWN" );
@@ -282,19 +284,19 @@ asyncTest( "handle keyboard navigation on menu without scroll and without submen
 		equal( logOutput(), "keydown,Aberdeen", "Keydown ENTER" );
 
 		start();
-	});
-});
+	} );
+} );
 
 asyncTest( "handle keyboard navigation on menu without scroll and with submenus", function() {
 	expect( 16 );
-	var element = $( "#menu2" ).menu({
+	var element = $( "#menu2" ).menu( {
 		select: function( event, ui ) {
-			log( $( ui.item[0] ).text() );
+			log( $( ui.item[ 0 ] ).text() );
 		},
 		focus: function( event ) {
 			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active:last" ).parent().index() );
 		}
-	});
+	} );
 
 	log( "keydown", true );
 	element.one( "menufocus", function() {
@@ -302,7 +304,7 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		equal( logOutput(), "keydown,1,2", "Keydown DOWN" );
 		setTimeout( menukeyboard1 );
-	});
+	} );
 	element.trigger( "focus" );
 
 	function menukeyboard1() {
@@ -322,7 +324,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.RIGHT } );
 
-		setTimeout(function() {
+		setTimeout( function() {
 			equal( logOutput(), "keydown,1,2,3,4,0", "Keydown RIGHT (open submenu)" );
 			setTimeout( menukeyboard2 );
 		} );
@@ -403,22 +405,22 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
 		equal( logOutput(), "keydown,Ada", "Keydown ENTER (open submenu)" );
 		start();
 	}
-});
+} );
 
 asyncTest( "handle keyboard navigation on menu with scroll and without submenus", function() {
 	expect( 14 );
-	var element = $( "#menu3" ).menu({
+	var element = $( "#menu3" ).menu( {
 		select: function( event, ui ) {
 			log( $( ui.item[ 0 ] ).text() );
 		},
 		focus: function( event ) {
 			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active:last" ).parent().index() );
 		}
-	});
+	} );
 
 	log( "keydown", true );
 	element[ 0 ].focus();
-	setTimeout(function() {
+	setTimeout( function() {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		equal( logOutput(), "keydown,0,1,2", "Keydown DOWN" );
@@ -477,19 +479,19 @@ asyncTest( "handle keyboard navigation on menu with scroll and without submenus"
 		equal( logOutput(), "keydown,Aberdeen", "Keydown ENTER" );
 
 		start();
-	});
-});
+	} );
+} );
 
 asyncTest( "handle keyboard navigation on menu with scroll and with submenus", function() {
 	expect( 14 );
-	var element = $( "#menu4" ).menu({
+	var element = $( "#menu4" ).menu( {
 		select: function( event, ui ) {
 			log( $( ui.item[ 0 ] ).text() );
 		},
 		focus: function( event ) {
-			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active:last" ).parent().index());
+			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active:last" ).parent().index() );
 		}
-	});
+	} );
 
 	log( "keydown", true );
 	element.one( "menufocus", function() {
@@ -497,7 +499,7 @@ asyncTest( "handle keyboard navigation on menu with scroll and with submenus", f
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		equal( logOutput(), "keydown,1,2", "Keydown DOWN" );
 		setTimeout( menukeyboard1 );
-	});
+	} );
 	element.trigger( "focus" );
 
 	function menukeyboard1() {
@@ -573,18 +575,18 @@ asyncTest( "handle keyboard navigation on menu with scroll and with submenus", f
 
 		start();
 	}
-});
+} );
 
 asyncTest( "handle keyboard navigation and mouse click on menu with disabled items", function() {
 	expect( 6 );
-	var element = $( "#menu6" ).menu({
+	var element = $( "#menu6" ).menu( {
 		select: function( event, ui ) {
-			log( $( ui.item[0] ).text() );
+			log( $( ui.item[ 0 ] ).text() );
 		},
 		focus: function( event ) {
-			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index());
+			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
 		}
-	});
+	} );
 
 	log( "keydown", true );
 	element.one( "menufocus", function() {
@@ -592,7 +594,7 @@ asyncTest( "handle keyboard navigation and mouse click on menu with disabled ite
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 		equal( logOutput(), "keydown,1", "Keydown focus but not select disabled item" );
 		setTimeout( menukeyboard1, 50 );
-	});
+	} );
 	element.trigger( "focus" );
 
 	function menukeyboard1() {
@@ -624,19 +626,19 @@ asyncTest( "handle keyboard navigation and mouse click on menu with disabled ite
 			}, 50 );
 		}, 50 );
 	}
-});
+} );
 
 asyncTest( "handle keyboard navigation and mouse click on menu with dividers and group labels", function() {
 	expect( 2 );
-	var element = $( "#menu7" ).menu({
+	var element = $( "#menu7" ).menu( {
 		items: "> :not('.ui-menu-group')",
 		select: function( event, ui ) {
-			log( $( ui.item[0] ).text() );
+			log( $( ui.item[ 0 ] ).text() );
 		},
 		focus: function( event ) {
 			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
 		}
-	});
+	} );
 
 	log( "keydown", true );
 	element.one( "menufocus", function() {
@@ -644,7 +646,7 @@ asyncTest( "handle keyboard navigation and mouse click on menu with dividers and
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 		equal( logOutput(), "keydown,2,Ada", "Keydown skips initial group label" );
 		setTimeout( menukeyboard1, 50 );
-	});
+	} );
 	element.trigger( "focus" );
 
 	function menukeyboard1() {
@@ -655,15 +657,15 @@ asyncTest( "handle keyboard navigation and mouse click on menu with dividers and
 		equal( logOutput(), "keydown,3,4,7", "Keydown focus skips divider and group label" );
 		start();
 	}
-});
+} );
 
 asyncTest( "handle keyboard navigation with spelling of menu items", function() {
 	expect( 3 );
-	var element = $( "#menu2" ).menu({
+	var element = $( "#menu2" ).menu( {
 		focus: function( event ) {
 			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
 		}
-	});
+	} );
 
 	log( "keydown", true );
 	element.one( "menufocus", function() {
@@ -676,17 +678,17 @@ asyncTest( "handle keyboard navigation with spelling of menu items", function()
 		element.simulate( "keydown", { keyCode: 83 } );
 		equal( logOutput(), "keydown,0,1,3,4,5", "Keydown focus Saarland ignoring leading space" );
 		start();
-	});
+	} );
 	element[ 0 ].focus();
-});
+} );
 
 asyncTest( "Keep focus on selected item (see #10644)", function() {
 	expect( 1 );
-	var element = $( "#menu2" ).menu({
+	var element = $( "#menu2" ).menu( {
 		focus: function( event ) {
 			log( $( event.target ).find( ".ui-menu-item-wrapper.ui-state-active" ).parent().index() );
 		}
-	});
+	} );
 
 	log( "keydown", true );
 	element.one( "menufocus", function() {
@@ -698,40 +700,40 @@ asyncTest( "Keep focus on selected item (see #10644)", function() {
 		equal( logOutput(), "keydown,0,1,3,3,3",
 			"Focus stays on 'Addyston', even after other options are eliminated" );
 		start();
-	});
+	} );
 	element[ 0 ].focus();
-});
+} );
 
 test( "#9469: Stopping propagation in a select event should not suppress subsequent select events.", function() {
 	expect( 1 );
-	var element = $( "#menu1" ).menu({
+	var element = $( "#menu1" ).menu( {
 		select: function( event ) {
 			log();
 			event.stopPropagation();
 		}
-	});
+	} );
 
 	click( element, "1" );
 	click( element, "2" );
 
 	equal( logOutput(), "1,2", "Both select events were not triggered." );
-});
+} );
 
 asyncTest( "#10571: When typing in a menu, only menu-items should be focused", function( assert ) {
 	expect( 3 );
 
-	var element = $( "#menu8" ).menu({
+	var element = $( "#menu8" ).menu( {
 		focus: function( event, ui ) {
 			equal( ui.item.length, 1, "There should only be one match when filtering" );
 			assert.hasClasses( ui.item, "ui-menu-item" );
 			equal( ui.item.text(), "-Saarland", "element has correct text" );
 		}
-	});
+	} );
 
-	setTimeout(function() {
+	setTimeout( function() {
 		element.menu( "widget" ).simulate( "keydown", { keyCode: "-".charCodeAt( 0 ) } );
 		start();
-	});
-});
+	} );
+} );
 
 } );
diff --git a/tests/unit/menu/methods.js b/tests/unit/menu/methods.js
index 28482d65db6..dc857cc42d3 100644
--- a/tests/unit/menu/methods.js
+++ b/tests/unit/menu/methods.js
@@ -12,25 +12,25 @@ module( "menu: methods", {
 	setup: function() {
 		testHelper.clearLog();
 	}
-});
+} );
 
 test( "destroy", function( assert ) {
 	expect( 2 );
 	assert.domEqual( "#menu2", function() {
 		$( "#menu2" ).menu().menu( "destroy" );
-	});
+	} );
 	assert.domEqual( "#menu5", function() {
-		$( "#menu5").menu().menu( "destroy" );
-	});
-});
+		$( "#menu5" ).menu().menu( "destroy" );
+	} );
+} );
 
 test( "enable/disable", function( assert ) {
 	expect( 3 );
-	var element = $( "#menu1" ).menu({
+	var element = $( "#menu1" ).menu( {
 		select: function() {
 			log();
 		}
-	});
+	} );
 	element.menu( "disable" );
 	assert.hasClasses( element, "ui-state-disabled" );
 	log( "click", true );
@@ -42,7 +42,7 @@ test( "enable/disable", function( assert ) {
 	click( element, "1" );
 	log( "afterclick" );
 	equal( logOutput(), "click,afterclick,click,1,afterclick", "Click order not valid." );
-});
+} );
 
 test( "refresh", function() {
 	expect( 5 );
@@ -56,7 +56,7 @@ test( "refresh", function() {
 	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( "refresh submenu", function() {
 	expect( 2 );
@@ -65,7 +65,7 @@ test( "refresh submenu", function() {
 	element.find( "ul" ).addBack().append( "<li><a href=\"#\">New Item</a></li>" );
 	element.menu( "refresh" );
 	equal( element.find( "ul:first .ui-menu-item" ).length, 4 );
-});
+} );
 
 test( "refresh icons (see #9377)", function( assert ) {
 	expect( 3 );
@@ -79,7 +79,7 @@ test( "refresh icons (see #9377)", function( assert ) {
 	element.find( "li:first .ui-menu-item-wrapper" ).html( "Save" );
 	element.menu( "refresh" );
 	assert.lacksClasses( element, "ui-menu-icons" );
-});
+} );
 
 test( "widget", function() {
 	expect( 2 );
@@ -87,7 +87,7 @@ test( "widget", function() {
 		widgetElement = element.menu( "widget" );
 	equal( widgetElement.length, 1, "one element" );
 	strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
-});
+} );
 
 // TODO: test focus method
 
diff --git a/tests/unit/menu/options.js b/tests/unit/menu/options.js
index e22adccf68a..dd27ec5c209 100644
--- a/tests/unit/menu/options.js
+++ b/tests/unit/menu/options.js
@@ -12,62 +12,62 @@ module( "menu: options", {
 	setup: function() {
 		testHelper.clearLog();
 	}
-});
+} );
 
 test( "{ disabled: true }", function( assert ) {
 	expect( 2 );
-	var element = $( "#menu1" ).menu({
+	var element = $( "#menu1" ).menu( {
 		disabled: true,
 		select: function() {
 			log();
 		}
-	});
+	} );
 	assert.hasClasses( element, "ui-state-disabled" );
 	log( "click", true );
 	click( element, "1" );
 	log( "afterclick" );
 	equal( logOutput(), "click,afterclick", "Click order not valid." );
-});
+} );
 
 test( "{ disabled: false }", function( assert ) {
 	expect( 2 );
-	var element = $( "#menu1" ).menu({
+	var element = $( "#menu1" ).menu( {
 		disabled: false,
 		select: function() {
 			log();
 		}
-	});
+	} );
 	assert.lacksClasses( element, "ui-state-disabled" );
 	log( "click", true );
 	click( element, "1" );
 	log( "afterclick" );
 	equal( logOutput(), "click,1,afterclick", "Click order not valid." );
-});
+} );
 
 test( "{ icons: default }", function( assert ) {
 	expect( 8 );
 	var element = $( "#menu2" ).menu();
 	element.find( ".ui-menu-icon" ).each( function() {
 		assert.hasClasses( this, "ui-menu-icon ui-icon ui-icon-caret-1-e" );
-	});
+	} );
 
 	element.menu( "option", "icons.submenu", "ui-icon-triangle-1-e" );
 	element.find( ".ui-menu-icon" ).each( function() {
 		assert.hasClasses( this, "ui-menu-icon ui-icon ui-icon-triangle-1-e" );
-	});
-});
+	} );
+} );
 
 test( "{ icons: { submenu: 'custom' } }", function( assert ) {
 	expect( 4 );
-	var element = $( "#menu2" ).menu({
+	var element = $( "#menu2" ).menu( {
 		icons: {
 			submenu: "custom-class"
 		}
-	});
+	} );
 	element.find( ".ui-menu-icon" ).each( function() {
 		assert.hasClasses( this, "ui-menu-icon ui-icon custom-class" );
-	});
-});
+	} );
+} );
 
 // TODO: test menus option
 
@@ -79,47 +79,47 @@ test( "{ role: 'menu' } ", function( assert ) {
 	expect( 2 + 3 * items.length );
 	equal( element.attr( "role" ), "menu" );
 	ok( items.length > 0, "number of menu items" );
-	items.each(function( item ) {
+	items.each( function( item ) {
 		assert.hasClasses( $( this ), "ui-menu-item" );
 		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "role" ),
-			"menuitem", "menu item ("+ item + ") role" );
+			"menuitem", "menu item (" + item + ") role" );
 		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "tabindex" ), "-1",
-			"tabindex for menu item ("+ item + ")" );
-	});
-});
+			"tabindex for menu item (" + item + ")" );
+	} );
+} );
 
 test( "{ role: 'listbox' } ", function( assert ) {
-	var element = $( "#menu1" ).menu({
+	var element = $( "#menu1" ).menu( {
 			role: "listbox"
-		}),
+		} ),
 		items = element.find( "li" );
 	expect( 2 + 3 * items.length );
 	equal( element.attr( "role" ), "listbox" );
 	ok( items.length > 0, "number of menu items" );
-	items.each(function( item ) {
+	items.each( function( item ) {
 		assert.hasClasses( $( this ), "ui-menu-item" );
 		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "role" ), "option",
-			"menu item ("+ item + ") role" );
+			"menu item (" + item + ") role" );
 		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "tabindex" ), "-1",
-			"tabindex for menu item ("+ item + ")" );
-	});
-});
+			"tabindex for menu item (" + item + ")" );
+	} );
+} );
 
 test( "{ role: null }", function( assert ) {
-	var element = $( "#menu1" ).menu({
+	var element = $( "#menu1" ).menu( {
 			role: null
-		}),
+		} ),
 		items = element.find( "li" );
 	expect( 2 + 3 * items.length );
 	equal( element.attr( "role" ), null );
 	ok( items.length > 0, "number of menu items" );
-	items.each(function( item ) {
+	items.each( function( item ) {
 		assert.hasClasses( $( this ), "ui-menu-item" );
 		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "role" ), null,
-			"menu item ("+ item + ") role" );
+			"menu item (" + item + ") role" );
 		equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "tabindex" ), "-1",
-			"tabindex for menu item ("+ item + ")" );
-	});
-});
+			"tabindex for menu item (" + item + ")" );
+	} );
+} );
 
 } );
diff --git a/ui/widgets/menu.js b/ui/widgets/menu.js
index 48258e85e95..f7fa2b65193 100644
--- a/ui/widgets/menu.js
+++ b/ui/widgets/menu.js
@@ -136,6 +136,7 @@ return $.widget( "ui.menu", {
 			mouseleave: "collapseAll",
 			"mouseleave .ui-menu": "collapseAll",
 			focus: function( event, keepActiveItem ) {
+
 				// If there's already an active item, keep it active
 				// If not, activate the first item
 				var item = this.active || this.element.find( this.options.items ).eq( 0 );
@@ -475,6 +476,7 @@ return $.widget( "ui.menu", {
 	collapseAll: function( event, all ) {
 		clearTimeout( this.timer );
 		this.timer = this._delay( function() {
+
 			// If we were passed an event, look for the submenu that contains the event
 			var currentMenu = all ? this.element :
 				$( event && event.target ).closest( this.element.find( ".ui-menu" ) );
@@ -633,6 +635,7 @@ return $.widget( "ui.menu", {
 	},
 
 	select: function( event ) {
+
 		// TODO: It should never be possible to not have an active item at this
 		// point, but the tests don't trigger mouseenter before click.
 		this.active = this.active || $( event.target ).closest( ".ui-menu-item" );

From e62e6c2610c5ae439e716d61ff9f58a763f7df03 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 08:59:32 -0400
Subject: [PATCH 12/27] Droppable: Style updates

Ref #14246
---
 tests/unit/droppable/common-deprecated.js |  2 +-
 tests/unit/droppable/common.js            |  2 +-
 tests/unit/droppable/core.js              | 22 +++----
 tests/unit/droppable/events.js            |  6 +-
 tests/unit/droppable/helper.js            |  6 +-
 tests/unit/droppable/methods.js           | 80 +++++++++++------------
 tests/unit/droppable/options.js           | 58 ++++++++--------
 ui/widgets/droppable.js                   | 47 +++++++------
 8 files changed, 116 insertions(+), 107 deletions(-)

diff --git a/tests/unit/droppable/common-deprecated.js b/tests/unit/droppable/common-deprecated.js
index ecbc9b1a1b7..fc086757f35 100644
--- a/tests/unit/droppable/common-deprecated.js
+++ b/tests/unit/droppable/common-deprecated.js
@@ -23,6 +23,6 @@ common.testWidget( "droppable", {
 		out: null,
 		over: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/droppable/common.js b/tests/unit/droppable/common.js
index 5d0e55d6f7a..d4bdb9dc02c 100644
--- a/tests/unit/droppable/common.js
+++ b/tests/unit/droppable/common.js
@@ -21,6 +21,6 @@ common.testWidget( "droppable", {
 		out: null,
 		over: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/droppable/core.js b/tests/unit/droppable/core.js
index 75951c1bc32..c4ce0378c5d 100644
--- a/tests/unit/droppable/core.js
+++ b/tests/unit/droppable/core.js
@@ -4,26 +4,26 @@ define( [
 	"ui/widgets/droppable"
 ], function( $, testHelper ) {
 
-module("droppable: core");
+module( "droppable: core" );
 
-test("element types", function() {
-	var typeNames = ("p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form" +
+test( "element types", function() {
+	var typeNames = ( "p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form" +
 		",table,fieldset,address,ins,del,em,strong,q,cite,dfn,abbr" +
 		",acronym,code,samp,kbd,var,img,hr" +
-		",input,button,label,select,iframe").split(",");
+		",input,button,label,select,iframe" ).split( "," );
 
 	expect( typeNames.length );
 
-	$.each(typeNames, function(i) {
-		var typeName = typeNames[i],
-			el = $(document.createElement(typeName)).appendTo("body");
+	$.each( typeNames, function( i ) {
+		var typeName = typeNames[ i ],
+			el = $( document.createElement( typeName ) ).appendTo( "body" );
 
-		(typeName === "table" && el.append("<tr><td>content</td></tr>"));
+		( typeName === "table" && el.append( "<tr><td>content</td></tr>" ) );
 		el.droppable();
 		testHelper.shouldDrop();
-		el.droppable("destroy");
+		el.droppable( "destroy" );
 		el.remove();
-	});
-});
+	} );
+} );
 
 } );
diff --git a/tests/unit/droppable/events.js b/tests/unit/droppable/events.js
index 9c84b099f14..68df6e506fb 100644
--- a/tests/unit/droppable/events.js
+++ b/tests/unit/droppable/events.js
@@ -13,7 +13,7 @@ test( "droppable destruction/recreation on drop event", function( assert ) {
 			drop: function() {
 				var element = $( this ),
 					newDroppable = $( "<div>" )
-						.css({ width: 100, height: 100 })
+						.css( { width: 100, height: 100 } )
 						.text( "Droppable" );
 				element.after( newDroppable );
 				element.remove();
@@ -33,10 +33,10 @@ test( "droppable destruction/recreation on drop event", function( assert ) {
 	draggable.simulate( "drag", {
 		dx: dx,
 		dy: dy
-	});
+	} );
 
 	assert.lacksClasses( droppable2, "active", "subsequent droppable no longer active" );
-});
+} );
 
 // todo: comment the following in when ready to actually test
 /*
diff --git a/tests/unit/droppable/helper.js b/tests/unit/droppable/helper.js
index 460fa1aa6c0..b9bc5d6fb28 100644
--- a/tests/unit/droppable/helper.js
+++ b/tests/unit/droppable/helper.js
@@ -5,13 +5,15 @@ define( [
 
 return $.extend( helper, {
 	shouldDrop: function() {
+
 		// todo: actually implement this
-		ok(true, "missing test - untested code is broken code");
+		ok( true, "missing test - untested code is broken code" );
 	},
 
 	shouldNotDrop: function() {
+
 		// todo: actually implement this
-		ok(true, "missing test - untested code is broken code");
+		ok( true, "missing test - untested code is broken code" );
 	}
 } );
 
diff --git a/tests/unit/droppable/methods.js b/tests/unit/droppable/methods.js
index 10ac484996f..c159be56f5b 100644
--- a/tests/unit/droppable/methods.js
+++ b/tests/unit/droppable/methods.js
@@ -4,78 +4,78 @@ define( [
 	"ui/widgets/droppable"
 ], function( $, testHelper ) {
 
-module("droppable: methods");
+module( "droppable: methods" );
 
-test("init", function() {
+test( "init", function() {
 	expect( 5 );
 
-	$("<div></div>").appendTo("body").droppable().remove();
-	ok(true, ".droppable() called on element");
+	$( "<div></div>" ).appendTo( "body" ).droppable().remove();
+	ok( true, ".droppable() called on element" );
 
-	$([]).droppable();
-	ok(true, ".droppable() called on empty collection");
+	$( [] ).droppable();
+	ok( true, ".droppable() called on empty collection" );
 
-	$("<div></div>").droppable();
-	ok(true, ".droppable() called on disconnected DOMElement");
+	$( "<div></div>" ).droppable();
+	ok( true, ".droppable() called on disconnected DOMElement" );
 
-	$("<div></div>").droppable().droppable("option", "foo");
-	ok(true, "arbitrary option getter after init");
+	$( "<div></div>" ).droppable().droppable( "option", "foo" );
+	ok( true, "arbitrary option getter after init" );
 
-	$("<div></div>").droppable().droppable("option", "foo", "bar");
-	ok(true, "arbitrary option setter after init");
-});
+	$( "<div></div>" ).droppable().droppable( "option", "foo", "bar" );
+	ok( true, "arbitrary option setter after init" );
+} );
 
-test("destroy", function() {
+test( "destroy", function() {
 	expect( 4 );
 
-	$("<div></div>").appendTo("body").droppable().droppable("destroy").remove();
-	ok(true, ".droppable('destroy') called on element");
+	$( "<div></div>" ).appendTo( "body" ).droppable().droppable( "destroy" ).remove();
+	ok( true, ".droppable('destroy') called on element" );
 
-	$([]).droppable().droppable("destroy");
-	ok(true, ".droppable('destroy') called on empty collection");
+	$( [] ).droppable().droppable( "destroy" );
+	ok( true, ".droppable('destroy') called on empty collection" );
 
-	$("<div></div>").droppable().droppable("destroy");
-	ok(true, ".droppable('destroy') called on disconnected DOMElement");
+	$( "<div></div>" ).droppable().droppable( "destroy" );
+	ok( true, ".droppable('destroy') called on disconnected DOMElement" );
 
-	var expected = $("<div></div>").droppable(),
-		actual = expected.droppable("destroy");
-	equal(actual, expected, "destroy is chainable");
-});
+	var expected = $( "<div></div>" ).droppable(),
+		actual = expected.droppable( "destroy" );
+	equal( actual, expected, "destroy is chainable" );
+} );
 
-test("enable", function() {
-	expect(7);
+test( "enable", function() {
+	expect( 7 );
 
 	var el, expected, actual;
 
-	el = $("#droppable1").droppable({ disabled: true });
+	el = $( "#droppable1" ).droppable( { disabled: true } );
 	testHelper.shouldNotDrop();
-	el.droppable("enable");
+	el.droppable( "enable" );
 	testHelper.shouldDrop();
-	equal(el.droppable("option", "disabled"), false, "disabled option getter");
-	el.droppable("destroy");
-	el.droppable({ disabled: true });
+	equal( el.droppable( "option", "disabled" ), false, "disabled option getter" );
+	el.droppable( "destroy" );
+	el.droppable( { disabled: true } );
 	testHelper.shouldNotDrop();
-	el.droppable("option", "disabled", false);
-	equal(el.droppable("option", "disabled"), false, "disabled option setter");
+	el.droppable( "option", "disabled", false );
+	equal( el.droppable( "option", "disabled" ), false, "disabled option setter" );
 	testHelper.shouldDrop();
 
-	expected = $("<div></div>").droppable(),
-	actual = expected.droppable("enable");
-	equal(actual, expected, "enable is chainable");
-});
+	expected = $( "<div></div>" ).droppable(),
+	actual = expected.droppable( "enable" );
+	equal( actual, expected, "enable is chainable" );
+} );
 
 test( "disable", function( assert ) {
 	expect( 10 );
 
 	var actual, expected,
-		element = $( "#droppable1" ).droppable({ disabled: false });
+		element = $( "#droppable1" ).droppable( { disabled: false } );
 
 	testHelper.shouldDrop();
 	element.droppable( "disable" );
 	testHelper.shouldNotDrop();
 	equal( element.droppable( "option", "disabled" ), true, "disabled option getter" );
 	element.droppable( "destroy" );
-	element.droppable({ disabled: false });
+	element.droppable( { disabled: false } );
 	testHelper.shouldDrop();
 	element.droppable( "option", "disabled", true );
 	assert.lacksClasses( element.droppable( "widget" ), "ui-state-disabled" );
@@ -87,6 +87,6 @@ test( "disable", function( assert ) {
 	expected = $( "<div></div>" ).droppable();
 	actual = expected.droppable( "disable" );
 	equal( actual, expected, "disable is chainable" );
-});
+} );
 
 } );
diff --git a/tests/unit/droppable/options.js b/tests/unit/droppable/options.js
index c2035ce8cc4..856c2d21517 100644
--- a/tests/unit/droppable/options.js
+++ b/tests/unit/droppable/options.js
@@ -24,23 +24,23 @@ test( "activeClass", function() {
 */
 test( "{ addClasses: true }, default", function( assert ) {
 	expect( 1 );
-	var el = $( "<div />" ).droppable({ addClasses: true });
+	var el = $( "<div />" ).droppable( { addClasses: true } );
 	assert.hasClasses( el, "ui-droppable" );
 	el.droppable( "destroy" );
-});
+} );
 
 test( "{ addClasses: false }", function( assert ) {
 	expect( 1 );
-	var el = $( "<div />" ).droppable({ addClasses: false });
+	var el = $( "<div />" ).droppable( { addClasses: false } );
 
 	assert.lacksClasses( el, "ui-droppable" );
 	el.droppable( "destroy" );
-});
+} );
 
 test( "scope", function() {
 	expect( 4 );
 	var droppableOffset, draggableOffset, oldDraggableOffset, dx, dy,
-		draggable1 = $( "<div />" ).appendTo( "#qunit-fixture" ).draggable({ revert: "invalid" }),
+		draggable1 = $( "<div />" ).appendTo( "#qunit-fixture" ).draggable( { revert: "invalid" } ),
 		draggable2 = $( "<div />" ).appendTo( "#qunit-fixture" ).droppable(),
 		droppable = $( "<div />" ).appendTo( "#qunit-fixture" ).droppable(),
 		newScope = "test";
@@ -57,7 +57,7 @@ test( "scope", function() {
 	draggable1.simulate( "drag", {
 		dx: dx,
 		dy: dy
-	});
+	} );
 
 	draggableOffset = draggable1.offset();
 	equal( draggableOffset.left, droppableOffset.left );
@@ -72,12 +72,12 @@ test( "scope", function() {
 	draggable2.simulate( "drag", {
 		dx: dx,
 		dy: dy
-	});
+	} );
 
 	draggableOffset = draggable2.offset();
 	equal( draggableOffset.left, oldDraggableOffset.left );
 	equal( draggableOffset.top, oldDraggableOffset.top );
-});
+} );
 /*
 test( "greedy", function() {
 	ok(false, 'missing test - untested code is broken code');
@@ -109,7 +109,7 @@ test( "tolerance, intersect", function() {
 
 	draggable = $( "<div />" )
 		.appendTo( "#qunit-fixture" )
-		.css({
+		.css( {
 			width: 10,
 			height: 10,
 			position: "absolute",
@@ -118,32 +118,32 @@ test( "tolerance, intersect", function() {
 			// Droppable: droppable region is offset by draggables margin
 			marginTop: 3,
 			marginLeft: 3
-		})
+		} )
 		.draggable();
 
 	droppable = $( "<div />" )
 		.appendTo( "#qunit-fixture" )
-		.css({ width: 10, height: 10, position: "absolute", top: 13, left: 13 })
-		.droppable({ tolerance: "intersect" });
+		.css( { width: 10, height: 10, position: "absolute", top: 13, left: 13 } )
+		.droppable( { tolerance: "intersect" } );
 
 	$.each( dataset, function() {
 		var data = this;
 
-		draggable.css({
+		draggable.css( {
 			top: 0,
 			left: 0
-		});
+		} );
 
 		droppable.off( "drop" ).on( "drop", function() {
 			equal( true, data[ 2 ], data[ 3 ] );
-		});
+		} );
 
 		$( draggable ).simulate( "drag", {
 			dx: data[ 0 ],
 			dy: data[ 1 ]
-		});
-	});
-});
+		} );
+	} );
+} );
 
 test( "tolerance, pointer", function() {
 	expect( 3 );
@@ -162,40 +162,40 @@ test( "tolerance, pointer", function() {
 
 	draggable = $( "<div />" )
 		.appendTo( "#qunit-fixture" )
-		.css({ width: 10, height: 10, position: "absolute" })
+		.css( { width: 10, height: 10, position: "absolute" } )
 		.draggable();
 
 	droppable = $( "<div />" )
 		.appendTo( "#qunit-fixture" )
-		.css({ width: 10, height: 10, position: "absolute", top: 5, left: 5 })
-		.droppable({ tolerance: "pointer" });
+		.css( { width: 10, height: 10, position: "absolute", top: 5, left: 5 } )
+		.droppable( { tolerance: "pointer" } );
 
 	$.each( dataset, function() {
 		var data = this;
 
 		droppable.off( "drop" ).on( "drop", function() {
 			equal( true, data[ 2 ], data[ 3 ] );
-		});
+		} );
 
 		$( draggable ).simulate( "drag", {
 			dx: ( data[ 0 ] - $( draggable ).position().left ),
 			dy: ( data[ 1 ] - $( draggable ).position().top )
-		});
-	});
+		} );
+	} );
 
 	// Http://bugs.jqueryui.com/ticket/4977 - tolerance, pointer - bug when pointer outside draggable
-	draggable.css({ top: 0, left: 0 }).draggable( "option", "axis", "x" );
-	droppable.css({ top: 15, left: 15 });
+	draggable.css( { top: 0, left: 0 } ).draggable( "option", "axis", "x" );
+	droppable.css( { top: 15, left: 15 } );
 
 	droppable.off( "drop" ).on( "drop", function() {
 		ok( true, "drop fires as long as pointer is within droppable" );
-	});
+	} );
 
 	$( draggable ).simulate( "drag", {
 		dx: 10,
 		dy: 10
-	});
-});
+	} );
+} );
 
 /*
 test( "tolerance, touch", function() {
diff --git a/ui/widgets/droppable.js b/ui/widgets/droppable.js
index 6ba8d8c8090..136a32b800e 100644
--- a/ui/widgets/droppable.js
+++ b/ui/widgets/droppable.js
@@ -13,11 +13,11 @@
 //>>docs: http://api.jqueryui.com/droppable/
 //>>demos: http://jqueryui.com/droppable/
 
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([
+		define( [
 			"jquery",
 			"./draggable",
 			"./mouse",
@@ -29,7 +29,7 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}(function( $ ) {
+}( function( $ ) {
 
 $.widget( "ui.droppable", {
 	version: "@VERSION",
@@ -63,9 +63,11 @@ $.widget( "ui.droppable", {
 
 		this.proportions = function( /* valueToWrite */ ) {
 			if ( arguments.length ) {
+
 				// Store the droppable's proportions
 				proportions = arguments[ 0 ];
 			} else {
+
 				// Retrieve or derive the droppable's proportions
 				return proportions ?
 					proportions :
@@ -83,6 +85,7 @@ $.widget( "ui.droppable", {
 	},
 
 	_addToManager: function( scope ) {
+
 		// Add the reference and positions to the manager
 		$.ui.ddmanager.droppables[ scope ] = $.ui.ddmanager.droppables[ scope ] || [];
 		$.ui.ddmanager.droppables[ scope ].push( this );
@@ -123,7 +126,7 @@ $.widget( "ui.droppable", {
 		var draggable = $.ui.ddmanager.current;
 
 		this._addActiveClass();
-		if ( draggable ){
+		if ( draggable ) {
 			this._trigger( "activate", event, this.ui( draggable ) );
 		}
 	},
@@ -132,7 +135,7 @@ $.widget( "ui.droppable", {
 		var draggable = $.ui.ddmanager.current;
 
 		this._removeActiveClass();
-		if ( draggable ){
+		if ( draggable ) {
 			this._trigger( "deactivate", event, this.ui( draggable ) );
 		}
 	},
@@ -179,7 +182,7 @@ $.widget( "ui.droppable", {
 			return false;
 		}
 
-		this.element.find( ":data(ui-droppable)" ).not( ".ui-draggable-dragging" ).each(function() {
+		this.element.find( ":data(ui-droppable)" ).not( ".ui-draggable-dragging" ).each( function() {
 			var inst = $( this ).droppable( "instance" );
 			if (
 				inst.options.greedy &&
@@ -188,7 +191,7 @@ $.widget( "ui.droppable", {
 				inst.accept.call( inst.element[ 0 ], ( draggable.currentItem || draggable.element ) ) &&
 				intersect( draggable, $.extend( inst, { offset: inst.element.offset() } ), inst.options.tolerance, event )
 			) { childrenIntersection = true; return false; }
-		});
+		} );
 		if ( childrenIntersection ) {
 			return false;
 		}
@@ -231,9 +234,9 @@ $.widget( "ui.droppable", {
 	_removeActiveClass: function() {
 		this._removeClass( "ui-droppable-active" );
 	}
-});
+} );
 
-var intersect = (function() {
+var intersect = ( function() {
 	function isOverAxis( x, reference, size ) {
 		return ( x >= reference ) && ( x < ( reference + size ) );
 	}
@@ -277,7 +280,7 @@ var intersect = (function() {
 			return false;
 		}
 	};
-})();
+} )();
 
 /*
 	This manager tracks offsets of draggables and droppables
@@ -318,7 +321,7 @@ $.ui.ddmanager = {
 			}
 
 			m[ i ].offset = m[ i ].element.offset();
-			m[ i ].proportions({ width: m[ i ].element[ 0 ].offsetWidth, height: m[ i ].element[ 0 ].offsetHeight });
+			m[ i ].proportions( { width: m[ i ].element[ 0 ].offsetWidth, height: m[ i ].element[ 0 ].offsetHeight } );
 
 		}
 
@@ -326,6 +329,7 @@ $.ui.ddmanager = {
 	drop: function( draggable, event ) {
 
 		var dropped = false;
+
 		// Create a copy of the droppables in case the list changes during the drop (#9116)
 		$.each( ( $.ui.ddmanager.droppables[ draggable.options.scope ] || [] ).slice(), function() {
 
@@ -342,17 +346,18 @@ $.ui.ddmanager = {
 				this._deactivate.call( this, event );
 			}
 
-		});
+		} );
 		return dropped;
 
 	},
 	dragStart: function( draggable, event ) {
+
 		// Listen for scrolling so that if the dragging causes scrolling the position of the droppables can be recalculated (see #5003)
 		draggable.element.parentsUntil( "body" ).on( "scroll.droppable", function() {
 			if ( !draggable.options.refreshPositions ) {
 				$.ui.ddmanager.prepareOffsets( draggable, event );
 			}
-		});
+		} );
 	},
 	drag: function( draggable, event ) {
 
@@ -376,11 +381,12 @@ $.ui.ddmanager = {
 			}
 
 			if ( this.options.greedy ) {
+
 				// find droppable parents with same scope
 				scope = this.options.scope;
-				parent = this.element.parents( ":data(ui-droppable)" ).filter(function() {
+				parent = this.element.parents( ":data(ui-droppable)" ).filter( function() {
 					return $( this ).droppable( "instance" ).options.scope === scope;
-				});
+				} );
 
 				if ( parent.length ) {
 					parentInstance = $( parent[ 0 ] ).droppable( "instance" );
@@ -396,8 +402,8 @@ $.ui.ddmanager = {
 			}
 
 			this[ c ] = true;
-			this[c === "isout" ? "isover" : "isout"] = false;
-			this[c === "isover" ? "_over" : "_out"].call( this, event );
+			this[ c === "isout" ? "isover" : "isout" ] = false;
+			this[ c === "isover" ? "_over" : "_out" ].call( this, event );
 
 			// We just moved out of a greedy child
 			if ( parentInstance && c === "isout" ) {
@@ -405,11 +411,12 @@ $.ui.ddmanager = {
 				parentInstance.isover = true;
 				parentInstance._over.call( parentInstance, event );
 			}
-		});
+		} );
 
 	},
 	dragStop: function( draggable, event ) {
 		draggable.element.parentsUntil( "body" ).off( "scroll.droppable" );
+
 		// Call prepareOffsets one final time since IE does not fire return scroll events when overflow was caused by drag (see #5003)
 		if ( !draggable.options.refreshPositions ) {
 			$.ui.ddmanager.prepareOffsets( draggable, event );
@@ -451,9 +458,9 @@ if ( $.uiBackCompat !== false ) {
 				this.element.removeClass( this.options.hoverClass );
 			}
 		}
-	});
+	} );
 }
 
 return $.ui.droppable;
 
-}));
+} ) );

From ec215f8c984c81b8914120c54dcafbdd35e62318 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 08:59:44 -0400
Subject: [PATCH 13/27] Draggable: Style updates

Ref #14246
---
 tests/unit/draggable/common.js  |   2 +-
 tests/unit/draggable/core.js    | 114 +++----
 tests/unit/draggable/events.js  |  46 +--
 tests/unit/draggable/helper.js  |  32 +-
 tests/unit/draggable/methods.js |  40 +--
 tests/unit/draggable/options.js | 511 ++++++++++++++++----------------
 ui/widgets/draggable.js         | 394 ++++++++++++------------
 7 files changed, 579 insertions(+), 560 deletions(-)

diff --git a/tests/unit/draggable/common.js b/tests/unit/draggable/common.js
index c9a687ce3c7..228bba5dc1b 100644
--- a/tests/unit/draggable/common.js
+++ b/tests/unit/draggable/common.js
@@ -43,6 +43,6 @@ common.testWidget( "draggable", {
 		start: null,
 		stop: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/draggable/core.js b/tests/unit/draggable/core.js
index d6eaeb2aaba..8bc751e0ebe 100644
--- a/tests/unit/draggable/core.js
+++ b/tests/unit/draggable/core.js
@@ -14,84 +14,84 @@ test( "element types", function( assert ) {
 			",table,fieldset,address,ins,del,em,strong,q,cite,dfn,abbr" +
 			",acronym,code,samp,kbd,var,img,hr" +
 			",input,button,label,select,iframe"
-		).split(",");
+		).split( "," );
 
 	expect( typeNames.length * 2 );
 
 	$.each( typeNames, function( i ) {
 		var offsetBefore, offsetAfter,
 			typeName = typeNames[ i ],
-			el = $( document.createElement( typeName ) ).appendTo("#qunit-fixture");
+			el = $( document.createElement( typeName ) ).appendTo( "#qunit-fixture" );
 
 		if ( typeName === "table" ) {
-			el.append("<tr><td>content</td></tr>");
+			el.append( "<tr><td>content</td></tr>" );
 		}
 
-		el.draggable({ cancel: "" });
+		el.draggable( { cancel: "" } );
 		offsetBefore = el.offset();
 		el.simulate( "drag", {
 			dx: 50,
 			dy: 50
-		});
+		} );
 		offsetAfter = el.offset();
 
 		// Support: FF, Chrome, and IE9,
 		// there are some rounding errors in so we can't say equal, we have to settle for close enough
 		assert.close( offsetBefore.left, offsetAfter.left - 50, 1, "dragged[50, 50] " + "<" + typeName + "> left" );
 		assert.close( offsetBefore.top, offsetAfter.top - 50, 1, "dragged[50, 50] " + "<" + typeName + "> top" );
-		el.draggable("destroy");
+		el.draggable( "destroy" );
 		el.remove();
-	});
-});
+	} );
+} );
 
 test( "No options, relative", function() {
 	expect( 2 );
 	testHelper.shouldMove( $( "#draggable1" ).draggable(), "no options, relative" );
-});
+} );
 
 test( "No options, absolute", function() {
 	expect( 2 );
 	testHelper.shouldMove( $( "#draggable2" ).draggable(), "no options, absolute" );
-});
+} );
 
 test( "resizable handle with complex markup (#8756 / #8757)", function() {
 	expect( 2 );
 
 	$( "#draggable1" )
 		.append(
-			$("<div>")
-				.addClass("ui-resizable-handle ui-resizable-w")
-				.append( $("<div>") )
+			$( "<div>" )
+				.addClass( "ui-resizable-handle ui-resizable-w" )
+				.append( $( "<div>" ) )
 		);
 
-	var handle = $(".ui-resizable-w div"),
-		target = $( "#draggable1" ).draggable().resizable({ handles: "all" });
+	var handle = $( ".ui-resizable-w div" ),
+		target = $( "#draggable1" ).draggable().resizable( { handles: "all" } );
 
 	// Todo: fix resizable so it doesn't require a mouseover
-	handle.simulate("mouseover").simulate( "drag", { dx: -50 } );
+	handle.simulate( "mouseover" ).simulate( "drag", { dx: -50 } );
 	equal( target.width(), 250, "compare width" );
 
 	// Todo: fix resizable so it doesn't require a mouseover
-	handle.simulate("mouseover").simulate( "drag", { dx: 50 } );
+	handle.simulate( "mouseover" ).simulate( "drag", { dx: 50 } );
 	equal( target.width(), 200, "compare width" );
-});
+} );
 
 test( "#8269: Removing draggable element on drop", function() {
 	expect( 2 );
 
-	var element = $( "#draggable1" ).wrap( "<div id='wrapper' />" ).draggable({
+	var element = $( "#draggable1" ).wrap( "<div id='wrapper' />" ).draggable( {
 			stop: function() {
 				ok( true, "stop still called despite element being removed from DOM on drop" );
 			}
-		}),
+		} ),
 		dropOffset = $( "#droppable" ).offset();
 
-	$( "#droppable" ).droppable({
+	$( "#droppable" ).droppable( {
 		drop: function() {
 			$( "#wrapper" ).remove();
 			ok( true, "element removed from DOM on drop" );
 		}
-	});
+	} );
 
 	// Support: Opera 12.10, Safari 5.1, jQuery <1.8
 	if ( testHelper.unreliableContains ) {
@@ -102,31 +102,31 @@ test( "#8269: Removing draggable element on drop", function() {
 			handle: "corner",
 			x: dropOffset.left,
 			y: dropOffset.top
-		});
+		} );
 	}
-});
+} );
 
 // http://bugs.jqueryui.com/ticket/7778
 // drag element breaks in IE8 when its content is replaced onmousedown
 test( "Stray mousemove after mousedown still drags", function() {
 	expect( 2 );
 
-	var element = $( "#draggable1" ).draggable({ scroll: false });
+	var element = $( "#draggable1" ).draggable( { scroll: false } );
 
 	// In IE8, when content is placed under the mouse (e.g. when draggable content is replaced
 	// on mousedown), mousemove is triggered on those elements even though the mouse hasn't moved.
 	// Support: IE <9
 	element.on( "mousedown", function() {
-		$( document ).simulate( "mousemove", { button: -1 });
-	});
+		$( document ).simulate( "mousemove", { button: -1 } );
+	} );
 
 	testHelper.shouldMove( element, "element is draggable" );
-});
+} );
 
 test( "#6258: not following mouse when scrolled and using overflow-y: scroll", function() {
 	expect( 2 );
 
-	var element = $( "#draggable1" ).draggable({
+	var element = $( "#draggable1" ).draggable( {
 			stop: function( event, ui ) {
 				equal( ui.position.left, 1, "left position is correct despite overflow on HTML" );
 				equal( ui.position.top, 1, "top position is correct despite overflow on HTML" );
@@ -136,7 +136,7 @@ test( "#6258: not following mouse when scrolled and using overflow-y: scroll", f
 					.scrollTop( 0 )
 					.scrollLeft( 0 );
 			}
-		}),
+		} ),
 		oldOverflowY = $( "html" ).css( "overflow-y" ),
 		oldOverflowX = $( "html" ).css( "overflow-x" );
 
@@ -152,19 +152,19 @@ test( "#6258: not following mouse when scrolled and using overflow-y: scroll", f
 			dx: 1,
 			dy: 1,
 			moves: 1
-		});
-});
+		} );
+} );
 
 test( "#9315: jumps down with offset of scrollbar", function() {
 	expect( 2 );
 
-	var element = $( "#draggable2" ).draggable({
+	var element = $( "#draggable2" ).draggable( {
 			stop: function( event, ui ) {
 				equal( ui.position.left, 11, "left position is correct when position is absolute" );
 				equal( ui.position.top, 11, "top position is correct when position is absolute" );
 				$( "html" ).scrollTop( 0 ).scrollLeft( 0 );
 			}
-		});
+		} );
 
 		testHelper.forceScrollableWindow();
 
@@ -174,21 +174,23 @@ test( "#9315: jumps down with offset of scrollbar", function() {
 			dx: 1,
 			dy: 1,
 			moves: 1
-		});
-});
+		} );
+} );
 
 test( "scroll offset with fixed ancestors", function() {
 	expect( 2 );
 
 	var startValue = 300,
 		element = $( "#draggable1" )
+
 			// http://bugs.jqueryui.com/ticket/5009
 			// scroll not working with parent's position fixed
 			.wrap( "<div id='wrapper' />" )
+
 			// http://bugs.jqueryui.com/ticket/9612
 			// abspos elements inside of fixed elements moving away from the mouse when scrolling
 			.wrap( "<div id='wrapper2' />" )
-			.draggable({
+			.draggable( {
 				drag: function() {
 					startValue += 100;
 					$( document ).scrollTop( startValue ).scrollLeft( startValue );
@@ -198,7 +200,7 @@ test( "scroll offset with fixed ancestors", function() {
 					equal( ui.position.top, 10, "top position is correct when parent position is fixed" );
 					$( document ).scrollTop( 0 ).scrollLeft( 0 );
 				}
-			});
+			} );
 
 	testHelper.forceScrollableWindow();
 
@@ -209,10 +211,10 @@ test( "scroll offset with fixed ancestors", function() {
 		dx: 10,
 		dy: 10,
 		moves: 3
-	});
-});
+	} );
+} );
 
-$( [ "hidden", "auto", "scroll" ] ).each(function() {
+$( [ "hidden", "auto", "scroll" ] ).each( function() {
 	var overflow = this;
 
 	// Http://bugs.jqueryui.com/ticket/9379 - position bug in scrollable div
@@ -221,9 +223,9 @@ $( [ "hidden", "auto", "scroll" ] ).each(function() {
 		expect( 2 );
 
 		$( "#qunit-fixture" ).html( "<div id='outer'><div id='inner'></div><div id='dragged'>a</div></div>" );
-		$( "#inner" ).css({ position: "absolute", width: "500px", height: "500px" });
-		$( "#outer" ).css({ position: "absolute", width: "300px", height: "300px" });
-		$( "#dragged" ).css({ width: "10px", height: "10px" });
+		$( "#inner" ).css( { position: "absolute", width: "500px", height: "500px" } );
+		$( "#outer" ).css( { position: "absolute", width: "300px", height: "300px" } );
+		$( "#dragged" ).css( { width: "10px", height: "10px" } );
 
 		var moves = 3,
 			startValue = 0,
@@ -232,7 +234,7 @@ $( [ "hidden", "auto", "scroll" ] ).each(function() {
 
 			// We scroll after each drag event, so subtract 1 from number of moves for expected
 			expected = delta + ( ( moves - 1 ) * dragDelta ),
-			element = $( "#dragged" ).draggable({
+			element = $( "#dragged" ).draggable( {
 				drag: function() {
 					startValue += dragDelta;
 					$( "#outer" ).scrollTop( startValue ).scrollLeft( startValue );
@@ -241,7 +243,7 @@ $( [ "hidden", "auto", "scroll" ] ).each(function() {
 					equal( ui.position.left, expected, "left position is correct when grandparent is scrolled" );
 					equal( ui.position.top, expected, "top position is correct when grandparent is scrolled" );
 				}
-			});
+			} );
 
 		$( "#outer" ).css( "overflow", overflow );
 
@@ -249,9 +251,9 @@ $( [ "hidden", "auto", "scroll" ] ).each(function() {
 			dy: delta,
 			dx: delta,
 			moves: moves
-		});
-	});
-});
+		} );
+	} );
+} );
 
 test( "#5727: draggable from iframe", function() {
 	expect( 1 );
@@ -273,7 +275,7 @@ test( "#5727: draggable from iframe", function() {
 	// TODO: fix draggable within an IFRAME to fire events on the element properly
 	// and these testHelper.shouldMove relies on events for testing
 	//testHelper.shouldMove( draggable1, "draggable from an iframe" );
-});
+} );
 
 test( "#8399: A draggable should become the active element after you are finished interacting with it, but not before.", function() {
 	expect( 2 );
@@ -282,12 +284,12 @@ test( "#8399: A draggable should become the active element after you are finishe
 
 	$( document ).one( "mousemove", function() {
 		notStrictEqual( document.activeElement, element.get( 0 ), "moving a draggable anchor did not make it the active element" );
-	});
+	} );
 
 	testHelper.move( element, 50, 50 );
 
 	strictEqual( document.activeElement, element.get( 0 ), "finishing moving a draggable anchor made it the active element" );
-});
+} );
 
 asyncTest( "blur behavior", function() {
 	expect( 3 );
@@ -310,8 +312,8 @@ asyncTest( "blur behavior", function() {
 		// active element should blur when mousing down on a draggable
 		notStrictEqual( document.activeElement, focusElement.get( 0 ), "test element is no longer focused after mousing down on a draggable" );
 		start();
-	});
-});
+	} );
+} );
 
 test( "ui-draggable-handle assigned to appropriate element", function( assert ) {
 	expect( 5 );
@@ -328,7 +330,7 @@ test( "ui-draggable-handle assigned to appropriate element", function( assert )
 
 	element.draggable( "destroy" );
 	assert.lacksClasses( element.find( "p" ), "ui-draggable-handle" );
-});
+} );
 
 test( "ui-draggable-handle managed correctly in nested draggables", function( assert ) {
 	expect( 4 );
@@ -341,6 +343,6 @@ test( "ui-draggable-handle managed correctly in nested draggables", function( as
 	parent.draggable( "destroy" );
 	assert.lacksClasses( parent, "ui-draggable-handle", "parent loses class name on destroy" );
 	assert.hasClasses( child, "ui-draggable-handle", "child retains class name on destroy" );
-});
+} );
 
 } );
diff --git a/tests/unit/draggable/events.js b/tests/unit/draggable/events.js
index 7e276092bb9..36a5a870543 100644
--- a/tests/unit/draggable/events.js
+++ b/tests/unit/draggable/events.js
@@ -7,12 +7,12 @@ var element;
 
 module( "draggable: events", {
 	setup: function() {
-		element = $("<div>").appendTo("#qunit-fixture");
+		element = $( "<div>" ).appendTo( "#qunit-fixture" );
 	},
 	teardown: function() {
-		element.draggable("destroy");
+		element.draggable( "destroy" );
 	}
-});
+} );
 
 test( "callbacks occurrence count", function() {
 	expect( 3 );
@@ -21,7 +21,7 @@ test( "callbacks occurrence count", function() {
 		stop = 0,
 		dragc = 0;
 
-	element.draggable({
+	element.draggable( {
 		start: function() {
 			start++;
 		},
@@ -31,17 +31,17 @@ test( "callbacks occurrence count", function() {
 		stop: function() {
 			stop++;
 		}
-	});
+	} );
 
 	element.simulate( "drag", {
 		dx: 10,
 		dy: 10
-	});
+	} );
 
 	equal( start, 1, "start callback should happen exactly once" );
 	equal( dragc, 3, "drag callback should happen exactly once per mousemove" );
 	equal( stop, 1, "stop callback should happen exactly once" );
-});
+} );
 
 test( "stopping the start callback", function() {
 	expect( 3 );
@@ -50,7 +50,7 @@ test( "stopping the start callback", function() {
 		stop = 0,
 		dragc = 0;
 
-	element.draggable({
+	element.draggable( {
 		start: function() {
 			start++;
 			return false;
@@ -61,17 +61,17 @@ test( "stopping the start callback", function() {
 		stop: function() {
 			stop++;
 		}
-	});
+	} );
 
 	element.simulate( "drag", {
 		dx: 10,
 		dy: 10
-	});
+	} );
 
 	equal( start, 1, "start callback should happen exactly once" );
 	equal( dragc, 0, "drag callback should not happen at all" );
 	equal( stop, 0, "stop callback should not happen if there wasnt even a start" );
-});
+} );
 
 test( "stopping the drag callback", function() {
 	expect( 2 );
@@ -80,7 +80,7 @@ test( "stopping the drag callback", function() {
 		stop = 0,
 		dragc = 0;
 
-	element.draggable({
+	element.draggable( {
 		start: function() {
 			start++;
 		},
@@ -91,34 +91,34 @@ test( "stopping the drag callback", function() {
 		stop: function() {
 			stop++;
 		}
-	});
+	} );
 
 	element.simulate( "drag", {
 		dx: 10,
 		dy: 10
-	});
+	} );
 
 	equal( start, 1, "start callback should happen exactly once" );
 	equal( stop, 1, "stop callback should happen, as we need to actively stop the drag" );
-});
+} );
 
 test( "stopping the stop callback", function() {
 	expect( 1 );
 
-	element.draggable({
+	element.draggable( {
 		helper: "clone",
 		stop: function() {
 			return false;
 		}
-	});
+	} );
 
 	element.simulate( "drag", {
 		dx: 10,
 		dy: 10
-	});
+	} );
 
 	ok( element.draggable( "instance" ).helper, "the clone should not be deleted if the stop callback is stopped" );
-});
+} );
 
 // http://bugs.jqueryui.com/ticket/6884
 // Draggable: ui.offset.left differs between the "start" and "drag" hooks
@@ -129,7 +129,7 @@ test( "position and offset in hash is consistent between start, drag, and stop",
 
 	element = $( "<div style='margin: 2px;'></div>" ).appendTo( "#qunit-fixture" );
 
-	element.draggable({
+	element.draggable( {
 		start: function( event, ui ) {
 			startPos = ui.position;
 			startOffset = ui.offset;
@@ -142,13 +142,13 @@ test( "position and offset in hash is consistent between start, drag, and stop",
 			stopPos = ui.position;
 			stopOffset = ui.offset;
 		}
-	});
+	} );
 
 	element.simulate( "drag", {
 		dx: 10,
 		dy: 10,
 		moves: 1
-	});
+	} );
 
 	startPos.left += 10;
 	startPos.top += 10;
@@ -159,6 +159,6 @@ test( "position and offset in hash is consistent between start, drag, and stop",
 	deepEqual( dragPos, stopPos, "drag position equals stop position" );
 	deepEqual( startOffset, dragOffset, "start offset equals drag offset plus distance" );
 	deepEqual( dragOffset, stopOffset, "drag offset equals stop offset" );
-});
+} );
 
 } );
diff --git a/tests/unit/draggable/helper.js b/tests/unit/draggable/helper.js
index 7aabe2a00f7..02a6ddaf535 100644
--- a/tests/unit/draggable/helper.js
+++ b/tests/unit/draggable/helper.js
@@ -8,12 +8,13 @@ return $.extend( helper, {
 
 	// TODO: remove the unreliable offset hacks
 	unreliableOffset: $.ui.ie && ( !document.documentMode || document.documentMode < 8 ) ? 2 : 0,
+
 	// Support: Opera 12.10, Safari 5.1, jQuery <1.8
 
-	unreliableContains: (function() {
+	unreliableContains: ( function() {
 		var element = $( "<div>" );
 		return $.contains( element[ 0 ].ownerDocument, element[ 0 ] );
-	})(),
+	} )(),
 
 	testDragPosition: function( el, dx, dy, expectedDX, expectedDY, msg ) {
 		msg = msg ? msg + "." : "";
@@ -21,7 +22,7 @@ return $.extend( helper, {
 		$( el ).one( "dragstop", function( event, ui ) {
 			var positionExpected = { left: ui.originalPosition.left + expectedDX, top: ui.originalPosition.top + expectedDY };
 			deepEqual( ui.position, positionExpected, "position dragged[" + dx + ", " + dy + "] " + msg );
-		});
+		} );
 	},
 
 	testDragOffset: function( el, dx, dy, expectedDX, expectedDY, msg ) {
@@ -32,7 +33,7 @@ return $.extend( helper, {
 
 		$( el ).one( "dragstop", function( event, ui ) {
 			deepEqual( ui.offset, offsetExpected, "offset dragged[" + dx + ", " + dy + "] " + msg );
-		});
+		} );
 	},
 
 	testDragHelperOffset: function( el, dx, dy, expectedDX, expectedDY, msg ) {
@@ -43,7 +44,7 @@ return $.extend( helper, {
 
 		$( el ).one( "dragstop", function( event, ui ) {
 			deepEqual( ui.helper.offset(), offsetExpected, "offset dragged[" + dx + ", " + dy + "] " + msg );
-		});
+		} );
 	},
 
 	testDrag: function( el, handle, dx, dy, expectedDX, expectedDY, msg ) {
@@ -53,7 +54,7 @@ return $.extend( helper, {
 		$( handle ).simulate( "drag", {
 			dx: dx,
 			dy: dy
-		});
+		} );
 	},
 
 	shouldMovePositionButNotOffset: function( el, msg, handle ) {
@@ -64,7 +65,7 @@ return $.extend( helper, {
 		$( handle ).simulate( "drag", {
 			dx: 100,
 			dy: 100
-		});
+		} );
 	},
 
 	shouldMove: function( el, msg, handle ) {
@@ -86,12 +87,12 @@ return $.extend( helper, {
 
 		element.on( "dragstop", function() {
 			ok( false, "should not drag " + msg );
-		});
+		} );
 
 		$( handle ).simulate( "drag", {
 			dx: 100,
 			dy: 100
-		});
+		} );
 
 		newOffset = element.offset();
 
@@ -105,12 +106,12 @@ return $.extend( helper, {
 
 	setScrollable: function( what, isScrollable ) {
 		var overflow = isScrollable ? "scroll" : "hidden";
-		$( what ).css({ overflow: overflow, overflowX: overflow, overflowY: overflow });
+		$( what ).css( { overflow: overflow, overflowX: overflow, overflowY: overflow } );
 	},
 
 	testScroll: function( el, position ) {
 		var oldPosition = $( "#main" ).css( "position" );
-		$( "#main" ).css({ position: position, top: "0px", left: "0px" });
+		$( "#main" ).css( { position: position, top: "0px", left: "0px" } );
 		this.shouldMove( el, position + " parent" );
 		$( "#main" ).css( "position", oldPosition );
 	},
@@ -135,23 +136,24 @@ return $.extend( helper, {
 		$( el ).simulate( "drag", {
 			dx: x,
 			dy: y
-		});
+		} );
 	},
 
 	trackMouseCss: function( el ) {
 		el.on( "drag", function() {
 			el.data( "last_dragged_cursor", $( "body" ).css( "cursor" ) );
-		});
+		} );
 	},
 
 	trackAppendedParent: function( el ) {
+
 		// TODO: appendTo is currently ignored if helper is original (see #7044)
 		el.draggable( "option", "helper", "clone" );
 
 		// Get what parent is at time of drag
-		el.on( "drag", function(e, ui) {
+		el.on( "drag", function( e, ui ) {
 			el.data( "last_dragged_parent", ui.helper.parent()[ 0 ] );
-		});
+		} );
 	}
 } );
 
diff --git a/tests/unit/draggable/methods.js b/tests/unit/draggable/methods.js
index 10a17efdbb4..77ba2434f90 100644
--- a/tests/unit/draggable/methods.js
+++ b/tests/unit/draggable/methods.js
@@ -8,12 +8,12 @@ var element;
 
 module( "draggable: methods", {
 	setup: function() {
-		element = $("<div style='background: green; width: 200px; height: 100px; position: absolute; top: 10px; left: 10px;'><span>Absolute</span></div>").appendTo("#qunit-fixture");
+		element = $( "<div style='background: green; width: 200px; height: 100px; position: absolute; top: 10px; left: 10px;'><span>Absolute</span></div>" ).appendTo( "#qunit-fixture" );
 	},
 	teardown: function() {
 		element.remove();
 	}
-});
+} );
 
 test( "init", function() {
 	expect( 5 );
@@ -21,10 +21,10 @@ test( "init", function() {
 	element.draggable();
 	ok( true, ".draggable() called on element" );
 
-	$([]).draggable();
+	$( [] ).draggable();
 	ok( true, ".draggable() called on empty collection" );
 
-	$("<div></div>").draggable();
+	$( "<div></div>" ).draggable();
 	ok( true, ".draggable() called on disconnected DOMElement" );
 
 	element.draggable( "option", "foo" );
@@ -32,52 +32,52 @@ test( "init", function() {
 
 	element.draggable( "option", "foo", "bar" );
 	ok( true, "arbitrary option setter after init" );
-});
+} );
 
 test( "destroy", function() {
 	expect( 4 );
 
-	element.draggable().draggable("destroy");
+	element.draggable().draggable( "destroy" );
 	ok( true, ".draggable('destroy') called on element" );
 
-	$([]).draggable().draggable("destroy");
+	$( [] ).draggable().draggable( "destroy" );
 	ok( true, ".draggable('destroy') called on empty collection" );
 
-	element.draggable().draggable("destroy");
+	element.draggable().draggable( "destroy" );
 	ok( true, ".draggable('destroy') called on disconnected DOMElement" );
 
 	var expected = element.draggable(),
-		actual = expected.draggable("destroy");
+		actual = expected.draggable( "destroy" );
 	equal( actual, expected, "destroy is chainable" );
-});
+} );
 
 test( "enable", function() {
 	expect( 11 );
 
-	element.draggable({ disabled: true });
+	element.draggable( { disabled: true } );
 	testHelper.shouldNotDrag( element, ".draggable({ disabled: true })" );
 
-	element.draggable("enable");
+	element.draggable( "enable" );
 	testHelper.shouldMove( element, ".draggable('enable')" );
 	equal( element.draggable( "option", "disabled" ), false, "disabled option getter" );
 
-	element.draggable("destroy");
-	element.draggable({ disabled: true });
+	element.draggable( "destroy" );
+	element.draggable( { disabled: true } );
 	testHelper.shouldNotDrag( element, ".draggable({ disabled: true })" );
 
 	element.draggable( "option", "disabled", false );
-	equal(element.draggable( "option", "disabled" ), false, "disabled option setter" );
+	equal( element.draggable( "option", "disabled" ), false, "disabled option setter" );
 	testHelper.shouldMove( element, ".draggable('option', 'disabled', false)" );
 
 	var expected = element.draggable(),
-		actual = expected.draggable("enable");
+		actual = expected.draggable( "enable" );
 	equal( actual, expected, "enable is chainable" );
-});
+} );
 
 test( "disable", function( assert ) {
 	expect( 14 );
 
-	element = $( "#draggable2" ).draggable({ disabled: false });
+	element = $( "#draggable2" ).draggable( { disabled: false } );
 	testHelper.shouldMove( element, ".draggable({ disabled: false })" );
 
 	element.draggable( "disable" );
@@ -85,7 +85,7 @@ test( "disable", function( assert ) {
 	equal( element.draggable( "option", "disabled" ), true, "disabled option getter" );
 
 	element.draggable( "destroy" );
-	element.draggable({ disabled: false });
+	element.draggable( { disabled: false } );
 	testHelper.shouldMove( element, ".draggable({ disabled: false })" );
 
 	element.draggable( "option", "disabled", true );
@@ -99,6 +99,6 @@ test( "disable", function( assert ) {
 	var expected = element.draggable(),
 		actual = expected.draggable( "disable" );
 	equal( actual, expected, "disable is chainable" );
-});
+} );
 
 } );
diff --git a/tests/unit/draggable/options.js b/tests/unit/draggable/options.js
index bc7370e8b5c..2c8de5a0ac2 100644
--- a/tests/unit/draggable/options.js
+++ b/tests/unit/draggable/options.js
@@ -9,33 +9,33 @@ define( [
 // TODO: This doesn't actually test whether append happened, possibly remove
 test( "{ appendTo: 'parent' }, default, no clone", function() {
 	expect( 4 );
-	var element = $( "#draggable2" ).draggable({ appendTo: "parent" });
+	var element = $( "#draggable2" ).draggable( { appendTo: "parent" } );
 	testHelper.shouldMove( element, "absolute appendTo: parent" );
 
-	element = $( "#draggable1" ).draggable({ appendTo: "parent" });
+	element = $( "#draggable1" ).draggable( { appendTo: "parent" } );
 	testHelper.shouldMove( element, "relative appendTo: parent" );
-});
+} );
 
 // TODO: This doesn't actually test whether append happened, possibly remove
 test( "{ appendTo: Element }, no clone", function() {
 	expect( 4 );
-	var element = $( "#draggable2" ).draggable({ appendTo: $( "#draggable2" ).parent()[ 0 ] });
+	var element = $( "#draggable2" ).draggable( { appendTo: $( "#draggable2" ).parent()[ 0 ] } );
 
 	testHelper.shouldMove( element, "absolute appendTo: Element" );
 
-	element = $( "#draggable1" ).draggable({ appendTo: $( "#draggable2" ).parent()[ 0 ] });
+	element = $( "#draggable1" ).draggable( { appendTo: $( "#draggable2" ).parent()[ 0 ] } );
 	testHelper.shouldMove( element, "relative appendTo: Element" );
-});
+} );
 
 // TODO: This doesn't actually test whether append happened, possibly remove
 test( "{ appendTo: Selector }, no clone", function() {
 	expect( 4 );
-	var element = $( "#draggable2" ).draggable({ appendTo: "#main" });
+	var element = $( "#draggable2" ).draggable( { appendTo: "#main" } );
 	testHelper.shouldMove( element, "absolute appendTo: Selector" );
 
-	element = $( "#draggable1" ).draggable({ appendTo: "#main" });
+	element = $( "#draggable1" ).draggable( { appendTo: "#main" } );
 	testHelper.shouldMove( element, "relative appendTo: Selector" );
-});
+} );
 
 test( "{ appendTo: 'parent' }, default", function() {
 	expect( 2 );
@@ -48,48 +48,48 @@ test( "{ appendTo: 'parent' }, default", function() {
 
 	testHelper.move( element, 1, 1 );
 	equal( element.data( "last_dragged_parent" ), $( "#main" )[ 0 ] );
-});
+} );
 
 test( "{ appendTo: Element }", function() {
 	expect( 1 );
 
 	var appendTo = $( "#draggable2" ).parent()[ 0 ],
-		element = $( "#draggable1" ).draggable({ appendTo: appendTo });
+		element = $( "#draggable1" ).draggable( { appendTo: appendTo } );
 
 	testHelper.trackAppendedParent( element );
 
 	testHelper.move( element, 1, 1 );
 	equal( element.data( "last_dragged_parent" ), appendTo );
-});
+} );
 
 test( "{ appendTo: jQuery }", function() {
 	expect( 1 );
 
 	var appendTo = $( "#draggable2" ).parent(),
-		element = $( "#draggable1" ).draggable({ appendTo: appendTo });
+		element = $( "#draggable1" ).draggable( { appendTo: appendTo } );
 
 	testHelper.trackAppendedParent( element );
 
 	testHelper.move( element, 1, 1 );
 	equal( element.data( "last_dragged_parent" ), appendTo[ 0 ] );
-});
+} );
 
 test( "{ appendTo: Selector }", function() {
 	expect( 1 );
 
 	var appendTo = "#main",
-		element = $( "#draggable1" ).draggable({ appendTo: appendTo });
+		element = $( "#draggable1" ).draggable( { appendTo: appendTo } );
 
 	testHelper.trackAppendedParent( element );
 
 	testHelper.move( element, 1, 1 );
-	equal( element.data( "last_dragged_parent" ), $(appendTo)[ 0 ] );
-});
+	equal( element.data( "last_dragged_parent" ), $( appendTo )[ 0 ] );
+} );
 
 test( "appendTo, default, switching after initialization", function() {
 	expect( 2 );
 
-	var element = $( "#draggable1" ).draggable({ helper: "clone" });
+	var element = $( "#draggable1" ).draggable( { helper: "clone" } );
 
 	testHelper.trackAppendedParent( element );
 
@@ -101,25 +101,25 @@ test( "appendTo, default, switching after initialization", function() {
 	element.draggable( "option", "appendTo", $( "#qunit-fixture" ) );
 	testHelper.move( element, 2, 2 );
 	equal( element.data( "last_dragged_parent" ), $( "#qunit-fixture" )[ 0 ] );
-});
+} );
 
 test( "{ axis: false }, default", function() {
 	expect( 2 );
-	var element = $( "#draggable2" ).draggable({ axis: false });
+	var element = $( "#draggable2" ).draggable( { axis: false } );
 	testHelper.shouldMove( element, "axis: false" );
-});
+} );
 
 test( "{ axis: 'x' }", function() {
 	expect( 2 );
-	var element = $( "#draggable2" ).draggable({ axis: "x" });
+	var element = $( "#draggable2" ).draggable( { axis: "x" } );
 	testHelper.testDrag( element, element, 50, 50, 50, 0, "axis: x" );
-});
+} );
 
 test( "{ axis: 'y' }", function() {
 	expect( 2 );
-	var element = $( "#draggable2" ).draggable({ axis: "y" });
+	var element = $( "#draggable2" ).draggable( { axis: "y" } );
 	testHelper.testDrag( element, element, 50, 50, 0, 50, "axis: y" );
-});
+} );
 
 test( "{ axis: ? }, unexpected", function() {
 	var element,
@@ -134,17 +134,17 @@ test( "{ axis: ? }, unexpected", function() {
 
 	expect( 12 );
 
-	$.each(unexpected, function(key, val) {
-		element = $( "#draggable2" ).draggable({ axis: val });
+	$.each( unexpected, function( key, val ) {
+		element = $( "#draggable2" ).draggable( { axis: val } );
 		testHelper.shouldMove( element, "axis: " + key );
 		element.draggable( "destroy" );
-	});
-});
+	} );
+} );
 
 test( "axis, default, switching after initialization", function() {
 	expect( 6 );
 
-	var element = $( "#draggable1" ).draggable({ axis: false });
+	var element = $( "#draggable1" ).draggable( { axis: false } );
 
 	// Any Direction
 	testHelper.shouldMove( element, "axis: default" );
@@ -157,22 +157,22 @@ test( "axis, default, switching after initialization", function() {
 	element.draggable( "option", "axis", "y" );
 	testHelper.testDrag( element, element, 50, 50, 0, 50, "axis: y as option" );
 
-});
+} );
 
 test( "{ cancel: 'input,textarea,button,select,option' }, default", function() {
 	expect( 4 );
 
 	$( "<div id='draggable-option-cancel-default'><input type='text'></div>" ).appendTo( "#qunit-fixture" );
 
-	var element = $( "#draggable-option-cancel-default" ).draggable({ cancel: "input,textarea,button,select,option" });
+	var element = $( "#draggable-option-cancel-default" ).draggable( { cancel: "input,textarea,button,select,option" } );
 	testHelper.shouldMove( element, "cancel: default, element dragged" );
 
 	element.draggable( "destroy" );
 
-	element = $( "#draggable-option-cancel-default" ).draggable({ cancel: "input,textarea,button,select,option" });
+	element = $( "#draggable-option-cancel-default" ).draggable( { cancel: "input,textarea,button,select,option" } );
 	testHelper.shouldNotDrag( element, "cancel: default, input dragged", "#draggable-option-cancel-default input" );
 	element.draggable( "destroy" );
-});
+} );
 
 test( "{ cancel: 'span' }", function() {
 	expect( 4 );
@@ -182,9 +182,9 @@ test( "{ cancel: 'span' }", function() {
 
 	element.draggable( "destroy" );
 
-	element = $( "#draggable2" ).draggable({ cancel: "span" });
+	element = $( "#draggable2" ).draggable( { cancel: "span" } );
 	testHelper.shouldNotDrag( element, "cancel: span, span dragged", "#draggable2 span" );
-});
+} );
 
 test( "{ cancel: ? }, unexpected", function() {
 	expect( 12 );
@@ -200,11 +200,11 @@ test( "{ cancel: ? }, unexpected", function() {
 		};
 
 	$.each( unexpected, function( key, val ) {
-		element = $( "#draggable2" ).draggable({ cancel: val });
+		element = $( "#draggable2" ).draggable( { cancel: val } );
 		testHelper.shouldMove( element, "cancel: " + key );
 		element.draggable( "destroy" );
-	});
-});
+	} );
+} );
 
 /*
 test( "{ cancel: Selectors }, matching parent selector", function() {
@@ -246,17 +246,17 @@ test( "cancelement, default, switching after initialization", function() {
 
 	element.draggable( "option", "cancel", "input" );
 	testHelper.shouldNotDrag( element, "cancel: input, input dragged", input );
-});
+} );
 
 test( "connectToSortable, dragging out of a sortable", function() {
 	expect( 4 );
 
 	var sortItem, dragHelper,
-		element = $( "#draggableSortable" ).draggable({
+		element = $( "#draggableSortable" ).draggable( {
 			scroll: false,
 			connectToSortable: "#sortable"
-		}),
-		sortable = $( "#sortable" ).sortable({ revert: 100 }),
+		} ),
+		sortable = $( "#sortable" ).sortable( { revert: 100 } ),
 		dx = 50,
 		dy = 50,
 		offsetBefore = element.offset(),
@@ -267,13 +267,14 @@ test( "connectToSortable, dragging out of a sortable", function() {
 
 	$( sortable ).one( "sortstart", function( event, ui ) {
 		sortItem = ui.item;
-	});
+	} );
 
 	$( element ).one( "drag", function( event, ui ) {
 		dragHelper = ui.helper;
-	});
+	} );
 
 	$( element ).one( "dragstop", function( event, ui ) {
+
 		// http://bugs.jqueryui.com/ticket/8809
 		// Position issue when connected to sortable
 		deepEqual( ui.helper.offset(), offsetExpected, "draggable offset is correct" );
@@ -286,61 +287,63 @@ test( "connectToSortable, dragging out of a sortable", function() {
 		// Http://bugs.jqueryui.com/ticket/9481
 		// connectToSortable causes sortable revert to fail on second attempt
 		equal( sortable.sortable( "option", "revert" ), 100, "sortable revert behavior is preserved" );
-	});
+	} );
 
 	element.simulate( "drag", {
 		dx: dx,
 		dy: dy
-	});
-});
+	} );
+} );
 
 asyncTest( "connectToSortable, dragging clone into sortable", function() {
 	expect( 3 );
 
 	var offsetPlaceholder,
-		element = $( "#draggableSortableClone" ).draggable({
+		element = $( "#draggableSortableClone" ).draggable( {
 			scroll: false,
 			connectToSortable: "#sortable",
 			helper: "clone"
-		}),
-		sortable = $( "#sortable" ).sortable({ revert: 100 }),
+		} ),
+		sortable = $( "#sortable" ).sortable( { revert: 100 } ),
 		offsetSortable = sortable.offset();
 
 	$( sortable ).one( "sort", function( event, ui ) {
 		offsetPlaceholder = ui.placeholder.offset();
+
 		// http://bugs.jqueryui.com/ticket/8809
 		// Position issue when connected to sortable
 		deepEqual( ui.helper.offset(), offsetSortable, "sortable offset is correct" );
 		notDeepEqual( ui.helper.offset(), offsetPlaceholder, "offset not equal to placeholder" );
-	});
+	} );
 
 	$( sortable ).one( "sortstop", function( event, ui ) {
+
 		// http://bugs.jqueryui.com/ticket/9675
 		// Animation issue with revert and connectToSortable
 		deepEqual( ui.item.offset(), offsetPlaceholder, "offset eventually equals placeholder" );
 		start();
-	});
+	} );
 
 	element.simulate( "drag", {
 		x: offsetSortable.left + 1,
 		y: offsetSortable.top + 1,
 		moves: 1
-	});
-});
+	} );
+} );
 
 test( "connectToSortable, dragging multiple elements in and out of sortable", function() {
 	expect( 1 );
 
-	var element = $( "#draggableSortableClone" ).draggable({
+	var element = $( "#draggableSortableClone" ).draggable( {
 			scroll: false,
 			connectToSortable: "#sortable",
 			helper: "clone"
-		}),
-		element2 = $( "#draggableSortable" ).draggable({
+		} ),
+		element2 = $( "#draggableSortable" ).draggable( {
 			scroll: false,
 			connectToSortable: "#sortable"
-		}),
-		sortable = $( "#sortable" ).sortable({ revert: false }),
+		} ),
+		sortable = $( "#sortable" ).sortable( { revert: false } ),
 		sortableOffset = sortable.offset();
 
 	// Move element into sortable
@@ -348,40 +351,40 @@ test( "connectToSortable, dragging multiple elements in and out of sortable", fu
 		x: sortableOffset.left + 1,
 		y: sortableOffset.top + 1,
 		moves: 10
-	});
+	} );
 
 	// Move element in sortable out
 	element2.simulate( "drag", {
 		dx: 200,
 		dy: 200,
 		moves: 10
-	});
+	} );
 
 	// Http://bugs.jqueryui.com/ticket/9675
 	// Animation issue with revert and connectToSortable
 	sortable.one( "sortstop", function( event, ui ) {
 		ok( !$.contains( document, ui.placeholder[ 0 ] ), "placeholder was removed" );
-	});
+	} );
 
 	// Move the clone of the first element back out
 	$( "#sortable .sortable2Item" ).simulate( "drag", {
 		dx: 200,
 		dy: 200,
 		moves: 10
-	});
-});
+	} );
+} );
 
 test( "connectToSortable, dragging through one sortable to a second", function() {
 	expect( 2 );
 
 	var overCount = 0,
-		element = $( "#draggableSortable" ).draggable({
+		element = $( "#draggableSortable" ).draggable( {
 			scroll: false,
 			connectToSortable: ".sortable"
-		}),
+		} ),
 		delta = 200,
-		sortable = $( "#sortable" ).sortable({ revert: false }),
-		sortable2 = $( "#sortable2" ).sortable({ revert: false }),
+		sortable = $( "#sortable" ).sortable( { revert: false } ),
+		sortable2 = $( "#sortable2" ).sortable( { revert: false } ),
 		sortable2Offset = sortable2.offset(),
 		dragParams = {
 			x: sortable2Offset.left + 25,
@@ -392,30 +395,30 @@ test( "connectToSortable, dragging through one sortable to a second", function()
 	$( sortable ).one( "sortover", function() {
 		overCount++;
 		sortable2.css( "top", "+=" + delta );
-	});
+	} );
 
 	$( sortable2 ).on( "sortupdate", function() {
 		ok( true, "second sortable is updated" );
-	});
+	} );
 
 	$( sortable2 ).one( "sortover", function() {
 		overCount++;
-	});
+	} );
 
 	$( sortable2 ).one( "sortstop", function() {
 		equal( overCount, 2, "went over both sortables" );
-	});
+	} );
 
 	element.simulate( "drag", dragParams );
-});
+} );
 
 test( "connectToSortable, dragging through a sortable", function() {
 	expect( 1 );
 
-	var draggable = $( "#draggableSortable" ).draggable({
+	var draggable = $( "#draggableSortable" ).draggable( {
 			scroll: false,
 			connectToSortable: "#sortable2"
-		}),
+		} ),
 		sortable = $( "#sortable2" ).sortable(),
 		sortableOffset = sortable.offset();
 
@@ -423,20 +426,20 @@ test( "connectToSortable, dragging through a sortable", function() {
 	// Draggable: Position issue with connectToSortable
 	draggable.one( "dragstop", function() {
 		equal( draggable.parent().attr( "id" ), "sortable", "restored draggable to original parent" );
-	});
+	} );
 
 	draggable.simulate( "drag", {
 		x: sortableOffset.left + 25,
 		y: sortableOffset.top + sortable.outerHeight() + 400,
 		moves: 20
-	});
-});
+	} );
+} );
 
 test( "{ containment: Element }", function() {
 	expect( 1 );
 
 	var offsetAfter,
-		element = $( "#draggable1" ).draggable({ containment: $( "#draggable1" ).parent()[ 0 ] }),
+		element = $( "#draggable1" ).draggable( { containment: $( "#draggable1" ).parent()[ 0 ] } ),
 		p = element.parent(),
 		po = p.offset(),
 		expected = {
@@ -447,16 +450,16 @@ test( "{ containment: Element }", function() {
 	element.simulate( "drag", {
 		dx: -100,
 		dy: -100
-	});
+	} );
 	offsetAfter = element.offset();
 	deepEqual( offsetAfter, expected, "compare offset to parent" );
-});
+} );
 
 test( "{ containment: Selector }", function() {
 	expect( 1 );
 
 	var offsetAfter,
-		element = $( "#draggable1" ).draggable({ containment: $( "#qunit-fixture" ) }),
+		element = $( "#draggable1" ).draggable( { containment: $( "#qunit-fixture" ) } ),
 		p = element.parent(),
 		po = p.offset(),
 		expected = {
@@ -467,10 +470,10 @@ test( "{ containment: Selector }", function() {
 	element.simulate( "drag", {
 		dx: -100,
 		dy: -100
-	});
+	} );
 	offsetAfter = element.offset();
 	deepEqual( offsetAfter, expected, "compare offset to parent" );
-});
+} );
 
 test( "{ containment: [x1, y1, x2, y2] }", function() {
 	expect( 2 );
@@ -481,13 +484,13 @@ test( "{ containment: [x1, y1, x2, y2] }", function() {
 	element.draggable( "option", "containment", [ eo.left, eo.top, eo.left + element.width() + 5, eo.top + element.height() + 5 ] );
 
 	testHelper.testDrag( element, element, -100, -100, 0, 0, "containment: [x1, y1, x2, y2]" );
-});
+} );
 
 test( "{ containment: 'parent' }, relative", function() {
 	expect( 1 );
 
 	var offsetAfter,
-		element = $( "#draggable1" ).draggable({ containment: "parent" }),
+		element = $( "#draggable1" ).draggable( { containment: "parent" } ),
 		p = element.parent(),
 		po = p.offset(),
 		expected = {
@@ -498,16 +501,16 @@ test( "{ containment: 'parent' }, relative", function() {
 	element.simulate( "drag", {
 		dx: -100,
 		dy: -100
-	});
+	} );
 	offsetAfter = element.offset();
 	deepEqual( offsetAfter, expected, "compare offset to parent" );
-});
+} );
 
 test( "{ containment: 'parent' }, absolute", function() {
 	expect( 1 );
 
 	var offsetAfter,
-		element = $( "#draggable2" ).draggable({ containment: "parent" }),
+		element = $( "#draggable2" ).draggable( { containment: "parent" } ),
 		p = element.parent(),
 		po = p.offset(),
 		expected = {
@@ -518,41 +521,41 @@ test( "{ containment: 'parent' }, absolute", function() {
 	element.simulate( "drag", {
 		dx: -100,
 		dy: -100
-	});
+	} );
 	offsetAfter = element.offset();
 	deepEqual( offsetAfter, expected, "compare offset to parent" );
-});
+} );
 
 test( "containment, account for border", function( assert ) {
 	expect( 2 );
 
 	var el = $( "#draggable1" ).appendTo( "#scrollParent" ),
-		parent = el.parent().css({
+		parent = el.parent().css( {
 			height: "100px",
 			width: "100px",
 			borderStyle: "solid",
 			borderWidth: "5px 10px 15px 20px"
-		}),
+		} ),
 		parentBottom = parent.offset().top + parent.outerHeight(),
 		parentRight = parent.offset().left + parent.outerWidth(),
 		parentBorderBottom = testHelper.border( parent, "bottom" ),
 		parentBorderRight = testHelper.border( parent, "right" );
 
-	el.css({
+	el.css( {
 		height: "5px",
 		width: "5px"
-	}).draggable({ containment: "parent", scroll: false });
+	} ).draggable( { containment: "parent", scroll: false } );
 
 	el.simulate( "drag", {
 		dx: 100,
 		dy: 100
-	});
+	} );
 
 	assert.close( el.offset().top, parentBottom - parentBorderBottom - el.height(), 1,
 		"The draggable should be on top of its parent's bottom border" );
 	assert.close( el.offset().left, parentRight - parentBorderRight - el.width(), 1,
 		"The draggable should be to the right of its parent's right border" );
-});
+} );
 
 // http://bugs.jqueryui.com/ticket/7016
 // draggable can be pulled out of containment in Chrome and IE8
@@ -560,48 +563,48 @@ test( "containment, element cant be pulled out of container", function() {
 	expect( 1 );
 
 	var offsetBefore,
-		parent = $( "<div>").css({ width: 200, height: 200 }).appendTo( "#qunit-fixture" ),
+		parent = $( "<div>" ).css( { width: 200, height: 200 } ).appendTo( "#qunit-fixture" ),
 		element = $( "#draggable1" ).appendTo( parent );
 
 	element
-		.css({
+		.css( {
 			height: "5px",
 			width: "5px"
-		})
-		.draggable({ containment: "parent" })
+		} )
+		.draggable( { containment: "parent" } )
 		.simulate( "drag", {
 			dx: 500,
 			dy: 500
-		});
+		} );
 
 	offsetBefore = element.offset();
 
 	element.simulate( "drag", {
 		dx: 200,
 		dy: 200
-	});
+	} );
 
 	deepEqual( element.offset(), offsetBefore, "The draggable should not move past bottom right edge" );
-});
+} );
 
 test( "containment, default, switching after initialization", function() {
 	expect( 8 );
 
-	var element = $( "#draggable1" ).draggable({ containment: false, scroll: false }),
+	var element = $( "#draggable1" ).draggable( { containment: false, scroll: false } ),
 		po = element.parent().offset(),
 		containment = [ po.left - 100, po.top - 100, po.left + 500, po.top + 500 ];
 
 	testHelper.testDrag( element, element, -100, -100, -100, -100, "containment: default" );
 
-	element.draggable( "option", "containment", "parent" ).css({ top: 0, left: 0 });
+	element.draggable( "option", "containment", "parent" ).css( { top: 0, left: 0 } );
 	testHelper.testDrag( element, element, -100, -100, 0, 0, "containment: parent as option" );
 
-	element.draggable( "option", "containment", containment ).css({ top: 0, left: 0 });
+	element.draggable( "option", "containment", containment ).css( { top: 0, left: 0 } );
 	testHelper.testDrag( element, element, -100, -100, -100, -100, "containment: array as option" );
 
 	element.draggable( "option", "containment", false );
 	testHelper.testDrag( element, element, -100, -100, -100, -100, "containment: false as option" );
-});
+} );
 
 test( "{ cursor: 'auto' }, default", function() {
 	function getCursor() {
@@ -612,23 +615,23 @@ test( "{ cursor: 'auto' }, default", function() {
 
 	var actual, after,
 		expected = "auto",
-		element = $( "#draggable2" ).draggable({
+		element = $( "#draggable2" ).draggable( {
 			cursor: expected,
 			start: function() {
 				actual = getCursor();
 			}
-		}),
+		} ),
 		before = getCursor();
 
 	element.simulate( "drag", {
 		dx: -1,
 		dy: -1
-	});
+	} );
 	after = getCursor();
 
 	equal( actual, expected, "start callback: cursor '" + expected + "'" );
 	equal( after, before, "after drag: cursor restored" );
-});
+} );
 
 test( "{ cursor: 'move' }", function() {
 	function getCursor() {
@@ -639,23 +642,23 @@ test( "{ cursor: 'move' }", function() {
 
 	var actual, after,
 		expected = "move",
-		element = $( "#draggable2" ).draggable({
+		element = $( "#draggable2" ).draggable( {
 			cursor: expected,
 			start: function() {
 				actual = getCursor();
 			}
-		}),
+		} ),
 		before = getCursor();
 
 	element.simulate( "drag", {
 		dx: -1,
 		dy: -1
-	});
+	} );
 	after = getCursor();
 
 	equal( actual, expected, "start callback: cursor '" + expected + "'" );
 	equal( after, before, "after drag: cursor restored" );
-});
+} );
 
 test( "#6889: Cursor doesn't revert to pre-dragging state after revert action when original element is removed", function() {
 	function getCursor() {
@@ -664,7 +667,7 @@ test( "#6889: Cursor doesn't revert to pre-dragging state after revert action wh
 
 	expect( 2 );
 
-	var element = $( "#draggable1" ).wrap( "<div id='wrapper' />" ).draggable({
+	var element = $( "#draggable1" ).wrap( "<div id='wrapper' />" ).draggable( {
 			cursor: "move",
 			revert: true,
 			revertDuration: 0,
@@ -675,7 +678,7 @@ test( "#6889: Cursor doesn't revert to pre-dragging state after revert action wh
 			stop: function() {
 				equal( getCursor(), expected, "after drag: cursor restored" );
 			}
-		}),
+		} ),
 		expected = getCursor();
 
 	if ( testHelper.unreliableContains ) {
@@ -685,9 +688,9 @@ test( "#6889: Cursor doesn't revert to pre-dragging state after revert action wh
 		element.simulate( "drag", {
 			dx: -1,
 			dy: -1
-		});
+		} );
 	}
-});
+} );
 
 test( "cursor, default, switching after initialization", function() {
 	expect( 3 );
@@ -706,7 +709,7 @@ test( "cursor, default, switching after initialization", function() {
 	element.draggable( "option", "cursor", "ns-resize" );
 	testHelper.move( element, 1, 1 );
 	equal( element.data( "last_dragged_cursor" ), "ns-resize" );
-});
+} );
 
 test( "cursorAt", function() {
 	expect( 24 );
@@ -724,7 +727,7 @@ test( "cursorAt", function() {
 
 	$.each( tests, function( testName, testData ) {
 		$.each( [ "relative", "absolute" ], function( i, position ) {
-			var element = $( "#draggable" + ( i + 1 ) ).draggable({
+			var element = $( "#draggable" + ( i + 1 ) ).draggable( {
 					cursorAt: testData.cursorAt,
 					drag: function( event, ui ) {
 						if ( !testData.cursorAt ) {
@@ -738,16 +741,16 @@ test( "cursorAt", function() {
 							equal( event.clientY - ui.offset.top, testData.y + testHelper.unreliableOffset, testName + " " + position + " top" );
 						}
 					}
-			});
+			} );
 
 			element.simulate( "drag", {
 				moves: 1,
 				dx: deltaX,
 				dy: deltaY
-			});
-		});
-	});
-});
+			} );
+		} );
+	} );
+} );
 
 test( "cursorAt, switching after initialization", function() {
 	expect( 24 );
@@ -767,7 +770,7 @@ test( "cursorAt, switching after initialization", function() {
 		$.each( [ "relative", "absolute" ], function( i, position ) {
 			var element = $( "#draggable" + ( i + 1 ) );
 
-			element.draggable({
+			element.draggable( {
 					drag: function( event, ui ) {
 						if ( !testData.cursorAt ) {
 							equal( ui.position.left - ui.originalPosition.left, deltaX, testName + " " + position + " left" );
@@ -780,7 +783,7 @@ test( "cursorAt, switching after initialization", function() {
 							equal( event.clientY - ui.offset.top, testData.y + testHelper.unreliableOffset, testName + " " + position + " top" );
 						}
 					}
-			});
+			} );
 
 			element.draggable( "option", "cursorAt", false );
 			element.draggable( "option", "cursorAt", testData.cursorAt );
@@ -789,10 +792,10 @@ test( "cursorAt, switching after initialization", function() {
 				moves: 1,
 				dx: deltaX,
 				dy: deltaY
-			});
-		});
-	});
-});
+			} );
+		} );
+	} );
+} );
 
 test( "disabled", function() {
 	expect( 6 );
@@ -806,23 +809,23 @@ test( "disabled", function() {
 
 	element.draggable( "option", "disabled", false );
 	testHelper.shouldMove( element, "option: disabled false" );
-});
+} );
 
 test( "{ grid: [50, 50] }, relative", function() {
 	expect( 4 );
 
-	var element = $( "#draggable1" ).draggable({ grid: [ 50, 50 ] });
+	var element = $( "#draggable1" ).draggable( { grid: [ 50, 50 ] } );
 	testHelper.testDrag( element, element, 24, 24, 0, 0, "grid: [50, 50] relative" );
 	testHelper.testDrag( element, element, 26, 25, 50, 50, "grid: [50, 50] relative" );
-});
+} );
 
 test( "{ grid: [50, 50] }, absolute", function() {
 	expect( 4 );
 
-	var element = $( "#draggable2" ).draggable({ grid: [ 50, 50 ] });
+	var element = $( "#draggable2" ).draggable( { grid: [ 50, 50 ] } );
 	testHelper.testDrag( element, element, 24, 24, 0, 0, "grid: [50, 50] absolute" );
 	testHelper.testDrag( element, element, 26, 25, 50, 50, "grid: [50, 50] absolute" );
-});
+} );
 
 test( "grid, switching after initialization", function() {
 	expect( 8 );
@@ -837,17 +840,17 @@ test( "grid, switching after initialization", function() {
 
 	testHelper.testDrag( element, element, 24, 24, 0, 0, "grid: [50, 50] as option" );
 	testHelper.testDrag( element, element, 26, 25, 50, 50, "grid: [50, 50] as option" );
-});
+} );
 
 test( "{ handle: 'span' }", function() {
 	expect( 6 );
 
-	var element = $( "#draggable2" ).draggable({ handle: "span" });
+	var element = $( "#draggable2" ).draggable( { handle: "span" } );
 
-	testHelper.shouldMove( element, "handle: span", "#draggable2 span");
+	testHelper.shouldMove( element, "handle: span", "#draggable2 span" );
 	testHelper.shouldMove( element, "handle: span child", "#draggable2 span em" );
 	testHelper.shouldNotDrag( element, "handle: span element" );
-});
+} );
 
 test( "handle, default, switching after initialization", function() {
 	expect( 12 );
@@ -866,7 +869,7 @@ test( "handle, default, switching after initialization", function() {
 	element.draggable( "option", "handle", false );
 	testHelper.shouldMove( element, "handle: false as option, element dragged" );
 	testHelper.shouldMove( element, "handle: false as option, span dragged", "#draggable2 span" );
-});
+} );
 
 test( "helper, default, switching after initialization", function() {
 	expect( 6 );
@@ -879,36 +882,36 @@ test( "helper, default, switching after initialization", function() {
 
 	element.draggable( "option", "helper", "original" );
 	testHelper.shouldMove( element, "helper: original" );
-});
+} );
 
 // http://bugs.jqueryui.com/ticket/9446
 // Draggable: helper function cannot emulate default behavior
 test( "helper, function returning original element", function() {
 	expect( 1 );
 
-	var element = $( "#draggable1" ).css( "position", "static" ).draggable({
+	var element = $( "#draggable1" ).css( "position", "static" ).draggable( {
 		helper: function() {
 			return this;
 		}
-	});
+	} );
 
 	testHelper.testDragHelperOffset( element, 100, 100, 100, 100, "original element is draggable" );
 
 	element.simulate( "drag", {
 		dx: 100,
 		dy: 100
-	});
-});
+	} );
+} );
 
 function testHelperPosition( scrollPositions, position, helper, scrollElements, scrollElementsTitle ) {
 	test( "{ helper: '" + helper + "' }, " + position + ", with scroll offset on " + scrollElementsTitle, function() {
 		expect( scrollPositions.length * 2 );
 
 		var i, j,
-			element = $( "#draggable1" ).css({ position: position, top: 0, left: 0 }).draggable({
+			element = $( "#draggable1" ).css( { position: position, top: 0, left: 0 } ).draggable( {
 				helper: helper,
 				scroll: false
-			});
+			} );
 
 		if ( scrollElements.length === 1 && scrollElements[ 0 ] === "#scrollParent" ) {
 			testHelper.setScrollable( "#main", false );
@@ -931,10 +934,10 @@ function testHelperPosition( scrollPositions, position, helper, scrollElements,
 			testHelper.setScrollable( "#main", true );
 			testHelper.setScrollable( "#scrollParent", false );
 		}
-	});
+	} );
 }
 
-(function() {
+( function() {
 	var scrollElementsMap = {
 			"no elements": [],
 			"parent": [ "#main" ],
@@ -944,6 +947,7 @@ function testHelperPosition( scrollPositions, position, helper, scrollElements,
 		},
 		positions = [ "absolute", "fixed", "relative", "static" ],
 		helpers = [ "original", "clone" ],
+
 		// static is not an option here since the fixture is in an absolute container
 		scrollPositions = [ "relative", "absolute", "fixed" ];
 
@@ -953,39 +957,39 @@ function testHelperPosition( scrollPositions, position, helper, scrollElements,
 			var position = this;
 			$.each( scrollElementsMap, function( scrollElementsTitle, scrollElements ) {
 				testHelperPosition( scrollPositions, position, helper, scrollElements, scrollElementsTitle );
-			});
-		});
-	});
-})();
+			} );
+		} );
+	} );
+} )();
 
 test( "{ opacity: 0.5 }", function() {
 	expect( 1 );
 
 	var opacity = null,
-		element = $( "#draggable2" ).draggable({
+		element = $( "#draggable2" ).draggable( {
 			opacity: 0.5,
 			start: function() {
-				opacity = $(this).css( "opacity" );
+				opacity = $( this ).css( "opacity" );
 			}
-		});
+		} );
 
 	element.simulate( "drag", {
 		dx: -1,
 		dy: -1
-	});
+	} );
 
 	equal( opacity, 0.5, "start callback: opacity is" );
-});
+} );
 
 test( "opacity, default, switching after initialization", function() {
 	expect( 3 );
 
 	var opacity = null,
-		element = $( "#draggable2" ).draggable({
+		element = $( "#draggable2" ).draggable( {
 			start: function() {
-				opacity = $(this).css( "opacity" );
+				opacity = $( this ).css( "opacity" );
 			}
-		});
+		} );
 
 	testHelper.move( element, 1, 1 );
 	equal( opacity, 1 );
@@ -997,15 +1001,15 @@ test( "opacity, default, switching after initialization", function() {
 	element.draggable( "option", "opacity", false );
 	testHelper.move( element, 3, 1 );
 	equal( opacity, 1 );
-});
+} );
 
 asyncTest( "revert and revertDuration", function() {
 	expect( 7 );
 
-	var element = $( "#draggable2" ).draggable({
+	var element = $( "#draggable2" ).draggable( {
 		revert: true,
 		revertDuration: 0
-	});
+	} );
 	testHelper.shouldMovePositionButNotOffset( element, "revert: true, revertDuration: 0 should revert immediately" );
 
 	$( "#draggable2" ).draggable( "option", "revert", "invalid" );
@@ -1020,45 +1024,45 @@ asyncTest( "revert and revertDuration", function() {
 		stop: function() {
 			start();
 		}
-	});
+	} );
 
 	// Animation are async, so test for it asynchronously
 	testHelper.move( element, 50, 50 );
 	setTimeout( function() {
 		ok( $( "#draggable2" ).is( ":animated" ), "revert: true with revertDuration should animate" );
-	});
-});
+	} );
+} );
 
 test( "revert: valid", function() {
 	expect( 2 );
 
-	var element = $( "#draggable2" ).draggable({
+	var element = $( "#draggable2" ).draggable( {
 			revert: "valid",
 			revertDuration: 0
-		});
+		} );
 
 	$( "#droppable" ).droppable();
 
 	testHelper.shouldMovePositionButNotOffset( element, "revert: valid reverts when dropped on a droppable" );
-});
+} );
 
 test( "scope", function() {
 	expect( 4 );
 
-	var element = $( "#draggable2" ).draggable({
+	var element = $( "#draggable2" ).draggable( {
 		scope: "tasks",
 		revert: "valid",
 		revertDuration: 0
-	});
+	} );
 
-	$( "#droppable" ).droppable({ scope: "tasks" });
+	$( "#droppable" ).droppable( { scope: "tasks" } );
 
 	testHelper.shouldMovePositionButNotOffset( element, "revert: valid reverts when dropped on a droppable in scope" );
 
-	$( "#droppable" ).droppable( "destroy" ).droppable({ scope: "nottasks" });
+	$( "#droppable" ).droppable( "destroy" ).droppable( { scope: "nottasks" } );
 
 	testHelper.shouldMove( element, "revert: valid reverts when dropped on a droppable out of scope" );
-});
+} );
 
 test( "scroll, scrollSensitivity, and scrollSpeed", function() {
 	expect( 2 );
@@ -1067,46 +1071,46 @@ test( "scroll, scrollSensitivity, and scrollSpeed", function() {
 
 	var currentScrollTop,
 		viewportHeight = $( window ).height(),
-		element = $( "#draggable1" ).draggable({ scroll: true }).appendTo( "#qunit-fixture" ),
+		element = $( "#draggable1" ).draggable( { scroll: true } ).appendTo( "#qunit-fixture" ),
 		scrollSensitivity = element.draggable( "option", "scrollSensitivity" ),
 		scrollSpeed = element.draggable( "option", "scrollSpeed" );
 
-	element.offset({
+	element.offset( {
 		top: viewportHeight - scrollSensitivity - 1,
 		left: 1
-	});
+	} );
 
 	$( element ).one( "drag", function() {
 		equal( $( window ).scrollTop(), 0, "scroll: true doesn't scroll when the element is dragged outside of scrollSensitivity" );
-	});
+	} );
 
 	element.simulate( "drag", {
 		dx: 1,
 		y: viewportHeight - scrollSensitivity - 1,
 		moves: 1
-	});
+	} );
 
 	element.draggable( "option", "scrollSensitivity", scrollSensitivity + 10 );
 
-	element.offset({
+	element.offset( {
 		top: viewportHeight - scrollSensitivity - 1,
 		left: 1
-	});
+	} );
 
 	currentScrollTop = $( window ).scrollTop();
 
 	$( element ).one( "drag", function() {
 		ok( $( window ).scrollTop() - currentScrollTop, scrollSpeed, "scroll: true scrolls when the element is dragged within scrollSensitivity" );
-	});
+	} );
 
 	element.simulate( "drag", {
 		dx: 1,
 		y: viewportHeight - scrollSensitivity - 1,
 		moves: 1
-	});
+	} );
 
 	testHelper.restoreScroll( document );
-});
+} );
 
 test( "scroll ignores containers that are overflow: hidden", function() {
 	expect( 2 );
@@ -1119,7 +1123,7 @@ test( "scroll ignores containers that are overflow: hidden", function() {
 	element.simulate( "drag", {
 		dx: 1300,
 		dy: 1300
-	});
+	} );
 
 	// IE8 natively scrolls when dragging an element inside a overflow:hidden
 	// container, so skip this test if native scroll occurs.
@@ -1130,16 +1134,16 @@ test( "scroll ignores containers that are overflow: hidden", function() {
 		return;
 	}
 
-	element.css({ top: 0, left: 0 }).draggable( "option", "scroll", true );
+	element.css( { top: 0, left: 0 } ).draggable( "option", "scroll", true );
 
 	element.simulate( "drag", {
 		dx: 1300,
 		dy: 1300
-	});
+	} );
 
 	equal( scrollParent.scrollTop(), 0, "container doesn't scroll vertically" );
 	equal( scrollParent.scrollLeft(), 0, "container doesn't scroll horizontally" );
-});
+} );
 
 test( "#6817: auto scroll goes double distance when dragging", function( assert ) {
 	expect( 2 );
@@ -1149,22 +1153,23 @@ test( "#6817: auto scroll goes double distance when dragging", function( assert
 	var offsetBefore,
 		distance = 10,
 		viewportHeight = $( window ).height(),
-		element = $( "#draggable1" ).draggable({
+		element = $( "#draggable1" ).draggable( {
 			scroll: true,
 			stop: function( e, ui ) {
 				equal( ui.offset.top, newY, "offset of item matches pointer position after scroll" );
+
 				// TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal
 				assert.close( ui.offset.top - offsetBefore.top, distance, 1, "offset of item only moves expected distance after scroll" );
 			}
-		}),
+		} ),
 		scrollSensitivity = element.draggable( "option", "scrollSensitivity" ),
 		oldY = viewportHeight - scrollSensitivity,
 		newY = oldY + distance;
 
-	element.offset({
+	element.offset( {
 		top: oldY,
 		left: 1
-	});
+	} );
 
 	offsetBefore = element.offset();
 
@@ -1173,32 +1178,32 @@ test( "#6817: auto scroll goes double distance when dragging", function( assert
 		dx: 1,
 		y: newY,
 		moves: 1
-	});
+	} );
 
 	testHelper.restoreScroll( document );
-});
+} );
 
 test( "snap, snapMode, and snapTolerance", function( assert ) {
 	expect( 10 );
 
 	var newX, newY,
 		snapTolerance = 15,
-		element = $( "#draggable1" ).draggable({
+		element = $( "#draggable1" ).draggable( {
 			snap: true,
 			scroll: false,
 			snapMode: "both",
 			snapTolerance: snapTolerance
-		}),
+		} ),
 		element2 = $( "#draggable2" ).draggable();
 
 	// Http://bugs.jqueryui.com/ticket/9724
 	// Draggable: Snapping coordinates thrown off by margin on draggable
 	element.css( "margin", "3px" );
 
-	element.offset({
+	element.offset( {
 		top: 1,
 		left: 1
-	});
+	} );
 
 	newX = element2.offset().left - element.outerWidth() - snapTolerance - 2;
 	newY = element2.offset().top;
@@ -1208,7 +1213,7 @@ test( "snap, snapMode, and snapTolerance", function( assert ) {
 		x: newX,
 		y: newY,
 		moves: 1
-	});
+	} );
 
 	// TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal
 	assert.close( element.offset().left, newX, 1, "doesn't snap outside the snapTolerance" );
@@ -1221,7 +1226,7 @@ test( "snap, snapMode, and snapTolerance", function( assert ) {
 		x: newX,
 		y: newY,
 		moves: 1
-	});
+	} );
 
 	notDeepEqual( element.offset(), { top: newY, left: newX }, "snaps inside the snapTolerance" );
 
@@ -1232,7 +1237,7 @@ test( "snap, snapMode, and snapTolerance", function( assert ) {
 		x: newX,
 		y: newY,
 		moves: 1
-	});
+	} );
 
 	notDeepEqual( element.offset(), { top: newY, left: newX }, "snaps based on selector" );
 
@@ -1243,7 +1248,7 @@ test( "snap, snapMode, and snapTolerance", function( assert ) {
 		x: newX,
 		y: newY,
 		moves: 1
-	});
+	} );
 
 	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap based on invalid selector" );
 
@@ -1254,7 +1259,7 @@ test( "snap, snapMode, and snapTolerance", function( assert ) {
 		x: newX,
 		y: newY,
 		moves: 1
-	});
+	} );
 
 	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap outside the modified snapTolerance" );
 
@@ -1266,7 +1271,7 @@ test( "snap, snapMode, and snapTolerance", function( assert ) {
 		x: newX,
 		y: newY,
 		moves: 1
-	});
+	} );
 
 	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap inside the outer snapTolerance area when snapMode is inner" );
 
@@ -1278,7 +1283,7 @@ test( "snap, snapMode, and snapTolerance", function( assert ) {
 		x: newX,
 		y: newY,
 		moves: 1
-	});
+	} );
 
 	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap inside the outer snapTolerance area when snapMode is inner" );
 
@@ -1289,7 +1294,7 @@ test( "snap, snapMode, and snapTolerance", function( assert ) {
 		x: newX,
 		y: newY,
 		moves: 1
-	});
+	} );
 
 	notDeepEqual( element.offset(), { top: newY, left: newX }, "snaps inside the inner snapTolerance area when snapMode is inner" );
 
@@ -1300,17 +1305,17 @@ test( "snap, snapMode, and snapTolerance", function( assert ) {
 		x: newX,
 		y: newY,
 		moves: 1
-	});
+	} );
 
 	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap on the inner snapTolerance area when snapMode is outer" );
-});
+} );
 
 test( "#8459: element can snap to an element that was removed during drag", function( assert ) {
 	expect( 2 );
 
 	var newX, newY,
 		snapTolerance = 15,
-		element = $( "#draggable1" ).draggable({
+		element = $( "#draggable1" ).draggable( {
 			snap: true,
 			scroll: false,
 			snapMode: "both",
@@ -1318,13 +1323,13 @@ test( "#8459: element can snap to an element that was removed during drag", func
 			start: function() {
 				element2.remove();
 			}
-		}),
+		} ),
 		element2 = $( "#draggable2" ).draggable();
 
-	element.offset({
+	element.offset( {
 		top: 1,
 		left: 1
-	});
+	} );
 
 	newX = element2.offset().left - element.outerWidth() - snapTolerance + 1;
 	newY = element2.offset().top;
@@ -1334,18 +1339,19 @@ test( "#8459: element can snap to an element that was removed during drag", func
 		x: newX,
 		y: newY,
 		moves: 1
-	});
+	} );
 
 	// Support: Opera 12.10, Safari 5.1, jQuery <1.8
 	if ( testHelper.unreliableContains ) {
 		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
 		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
 	} else {
+
 		// TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal
 		assert.close( element.offset().left, newX, 1, "doesn't snap to a removed element" );
 		assert.close( element.offset().top, newY, 1, "doesn't snap to a removed element" );
 	}
-});
+} );
 
 test( "#8165: Snapping large rectangles to small rectangles doesn't snap properly", function() {
 	expect( 1 );
@@ -1353,85 +1359,85 @@ test( "#8165: Snapping large rectangles to small rectangles doesn't snap properl
 	var snapTolerance = 20,
 		y = 1,
 		element = $( "#draggable1" )
-			.css({
+			.css( {
 				width: "50px",
 				height: "200px"
-			}).offset({
+			} ).offset( {
 				top: y,
 				left: 1
-			}),
+			} ),
 		element2 = $( "#draggable2" )
-			.css({
+			.css( {
 				width: "50px",
 				height: "50px"
-			}).offset({
+			} ).offset( {
 				top: y + snapTolerance + 1,
 				left: 200
-			}),
+			} ),
 		newX = element2.offset().left - element.outerWidth() - snapTolerance + 1;
 
-	$( "#draggable1, #draggable2" ).draggable({
+	$( "#draggable1, #draggable2" ).draggable( {
 		snap: true,
 		snapTolerance: snapTolerance
-	});
+	} );
 
 	element.simulate( "drag", {
 		handle: "corner",
 		x: newX,
 		moves: 1
-	});
+	} );
 
 	notDeepEqual( element.offset(), { top: y, left: newX }, "snaps even if only a side (not a corner) is inside the snapTolerance" );
-});
+} );
 
 test( "stack", function() {
 	expect( 2 );
 
-	var element = $( "#draggable1" ).draggable({
+	var element = $( "#draggable1" ).draggable( {
 			stack: "#draggable1, #draggable2"
-		}),
-		element2 = $( "#draggable2" ).draggable({
+		} ),
+		element2 = $( "#draggable2" ).draggable( {
 			stack: "#draggable1, #draggable2"
-		});
+		} );
 
 	testHelper.move( element, 1, 1 );
 	equal( element.css( "zIndex" ), "2", "stack increments zIndex correctly" );
 
 	testHelper.move( element2, 1, 1 );
 	equal( element2.css( "zIndex" ), "3", "stack increments zIndex correctly" );
-});
+} );
 
 test( "{ zIndex: 10 }", function() {
 	expect( 1 );
 
 	var actual,
 		expected = 10,
-		element = $( "#draggable2" ).draggable({
+		element = $( "#draggable2" ).draggable( {
 			zIndex: expected,
 			start: function() {
-				actual = $(this).css( "zIndex" );
+				actual = $( this ).css( "zIndex" );
 			}
-		});
+		} );
 
 	element.simulate( "drag", {
 		dx: -1,
 		dy: -1
-	});
+	} );
 
 	equal( actual, expected, "start callback: zIndex is" );
 
-});
+} );
 
 test( "zIndex, default, switching after initialization", function() {
 
 	expect( 3 );
 
 	var zindex = null,
-		element = $( "#draggable2" ).draggable({
+		element = $( "#draggable2" ).draggable( {
 			start: function() {
-				zindex = $(this).css( "z-index" );
+				zindex = $( this ).css( "z-index" );
 			}
-		});
+		} );
 
 	element.css( "z-index", 1 );
 
@@ -1446,48 +1452,49 @@ test( "zIndex, default, switching after initialization", function() {
 	testHelper.move( element, 3, 1 );
 	equal( zindex, 1 );
 
-});
+} );
 
 test( "iframeFix", function() {
 	expect( 5 );
 
-	var element = $( "<div>" ).appendTo( "#qunit-fixture" ).draggable({ iframeFix: true }),
-		element2 = $( "<div>" ).appendTo( "#qunit-fixture" ).draggable({ iframeFix: ".iframe" }),
+	var element = $( "<div>" ).appendTo( "#qunit-fixture" ).draggable( { iframeFix: true } ),
+		element2 = $( "<div>" ).appendTo( "#qunit-fixture" ).draggable( { iframeFix: ".iframe" } ),
 		iframe = $( "<iframe>" ).appendTo( element );
 
 	element2
 		.append( "<iframe class='iframe'></iframe>" )
 		.append( "<iframe>" );
 
-	iframe.css({
+	iframe.css( {
 		width: 1,
 		height: 1
-	});
+	} );
 
 	element.one( "drag", function() {
 		var div = $( this ).children().not( "iframe" );
+
 		// http://bugs.jqueryui.com/ticket/9671
 		// iframeFix doesn't handle iframes that move
 		equal( div.length, 1, "blocking div added as sibling" );
 		equal( div.outerWidth(), iframe.outerWidth(), "blocking div is wide enough" );
 		equal( div.outerHeight(), iframe.outerHeight(), "blocking div is tall enough" );
 		deepEqual( div.offset(), iframe.offset(), "blocking div is tall enough" );
-	});
+	} );
 
 	element.simulate( "drag", {
 		dx: 1,
 		dy: 1
-	});
+	} );
 
 	element2.one( "drag", function() {
 		var div = $( this ).children().not( "iframe" );
 		equal( div.length, 1, "blocking div added as sibling only to matching selector" );
-	});
+	} );
 
 	element2.simulate( "drag", {
 		dx: 1,
 		dy: 1
-	});
-});
+	} );
+} );
 
 } );
diff --git a/ui/widgets/draggable.js b/ui/widgets/draggable.js
index b2c56509fd5..fc340626ea6 100644
--- a/ui/widgets/draggable.js
+++ b/ui/widgets/draggable.js
@@ -14,11 +14,11 @@
 //>>demos: http://jqueryui.com/draggable/
 //>>css.structure: ../themes/base/draggable.css
 
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([
+		define( [
 			"jquery",
 			"./mouse",
 			"../data",
@@ -34,9 +34,9 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}(function( $ ) {
+}( function( $ ) {
 
-$.widget("ui.draggable", $.ui.mouse, {
+$.widget( "ui.draggable", $.ui.mouse, {
 	version: "@VERSION",
 	widgetEventPrefix: "drag",
 	options: {
@@ -75,10 +75,10 @@ $.widget("ui.draggable", $.ui.mouse, {
 		if ( this.options.helper === "original" ) {
 			this._setPositionRelative();
 		}
-		if (this.options.addClasses){
+		if ( this.options.addClasses ) {
 			this._addClass( "ui-draggable" );
 		}
-		if (this.options.disabled){
+		if ( this.options.disabled ) {
 			this._addClass( "ui-draggable-disabled" );
 		}
 		this._setHandleClassName();
@@ -103,19 +103,19 @@ $.widget("ui.draggable", $.ui.mouse, {
 		this._mouseDestroy();
 	},
 
-	_mouseCapture: function(event) {
+	_mouseCapture: function( event ) {
 		var o = this.options;
 
 		this._blurActiveElement( event );
 
 		// Among others, prevent a drag on a resizable-handle
-		if (this.helper || o.disabled || $(event.target).closest(".ui-resizable-handle").length > 0) {
+		if ( this.helper || o.disabled || $( event.target ).closest( ".ui-resizable-handle" ).length > 0 ) {
 			return false;
 		}
 
 		//Quit if we're not on a valid handle
-		this.handle = this._getHandle(event);
-		if (!this.handle) {
+		this.handle = this._getHandle( event );
+		if ( !this.handle ) {
 			return false;
 		}
 
@@ -126,7 +126,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 	},
 
 	_blockFrames: function( selector ) {
-		this.iframeBlocks = this.document.find( selector ).map(function() {
+		this.iframeBlocks = this.document.find( selector ).map( function() {
 			var iframe = $( this );
 
 			return $( "<div>" )
@@ -135,7 +135,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 				.outerWidth( iframe.outerWidth() )
 				.outerHeight( iframe.outerHeight() )
 				.offset( iframe.offset() )[ 0 ];
-		});
+		} );
 	},
 
 	_unblockFrames: function() {
@@ -156,12 +156,12 @@ $.widget("ui.draggable", $.ui.mouse, {
 		$.ui.safeBlur( $.ui.safeActiveElement( this.document[ 0 ] ) );
 	},
 
-	_mouseStart: function(event) {
+	_mouseStart: function( event ) {
 
 		var o = this.options;
 
 		//Create and append the visible helper
-		this.helper = this._createHelper(event);
+		this.helper = this._createHelper( event );
 
 		this._addClass( this.helper, "ui-draggable-dragging" );
 
@@ -169,7 +169,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 		this._cacheHelperProportions();
 
 		//If ddmanager is used for droppables, set the global draggable
-		if ($.ui.ddmanager) {
+		if ( $.ui.ddmanager ) {
 			$.ui.ddmanager.current = this;
 		}
 
@@ -185,9 +185,9 @@ $.widget("ui.draggable", $.ui.mouse, {
 		this.cssPosition = this.helper.css( "position" );
 		this.scrollParent = this.helper.scrollParent( true );
 		this.offsetParent = this.helper.offsetParent();
-		this.hasFixedAncestor = this.helper.parents().filter(function() {
+		this.hasFixedAncestor = this.helper.parents().filter( function() {
 				return $( this ).css( "position" ) === "fixed";
-			}).length > 0;
+			} ).length > 0;
 
 		//The element's absolute position on the page minus margins
 		this.positionAbs = this.element.offset();
@@ -199,13 +199,13 @@ $.widget("ui.draggable", $.ui.mouse, {
 		this.originalPageY = event.pageY;
 
 		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
-		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+		( o.cursorAt && this._adjustOffsetFromHelper( o.cursorAt ) );
 
 		//Set a containment if given in the options
 		this._setContainment();
 
 		//Trigger event + callbacks
-		if (this._trigger("start", event) === false) {
+		if ( this._trigger( "start", event ) === false ) {
 			this._clear();
 			return false;
 		}
@@ -214,15 +214,15 @@ $.widget("ui.draggable", $.ui.mouse, {
 		this._cacheHelperProportions();
 
 		//Prepare the droppable offsets
-		if ($.ui.ddmanager && !o.dropBehaviour) {
-			$.ui.ddmanager.prepareOffsets(this, event);
+		if ( $.ui.ddmanager && !o.dropBehaviour ) {
+			$.ui.ddmanager.prepareOffsets( this, event );
 		}
 
-		this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+		this._mouseDrag( event, true ); //Execute the drag once - this causes the helper not to be visible before getting its correct position
 
 		//If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003)
 		if ( $.ui.ddmanager ) {
-			$.ui.ddmanager.dragStart(this, event);
+			$.ui.ddmanager.dragStart( this, event );
 		}
 
 		return true;
@@ -243,7 +243,8 @@ $.widget("ui.draggable", $.ui.mouse, {
 		};
 	},
 
-	_mouseDrag: function(event, noPropagation) {
+	_mouseDrag: function( event, noPropagation ) {
+
 		// reset any necessary cached properties (see #5009)
 		if ( this.hasFixedAncestor ) {
 			this.offset.parent = this._getParentOffset();
@@ -251,13 +252,13 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 		//Compute the helpers position
 		this.position = this._generatePosition( event, true );
-		this.positionAbs = this._convertPositionTo("absolute");
+		this.positionAbs = this._convertPositionTo( "absolute" );
 
 		//Call plugins and callbacks and use the resulting position if something is returned
-		if (!noPropagation) {
+		if ( !noPropagation ) {
 			var ui = this._uiHash();
-			if (this._trigger("drag", event, ui) === false) {
-				this._mouseUp({});
+			if ( this._trigger( "drag", event, ui ) === false ) {
+				this._mouseUp( {} );
 				return false;
 			}
 			this.position = ui.position;
@@ -266,36 +267,36 @@ $.widget("ui.draggable", $.ui.mouse, {
 		this.helper[ 0 ].style.left = this.position.left + "px";
 		this.helper[ 0 ].style.top = this.position.top + "px";
 
-		if ($.ui.ddmanager) {
-			$.ui.ddmanager.drag(this, event);
+		if ( $.ui.ddmanager ) {
+			$.ui.ddmanager.drag( this, event );
 		}
 
 		return false;
 	},
 
-	_mouseStop: function(event) {
+	_mouseStop: function( event ) {
 
 		//If we are using droppables, inform the manager about the drop
 		var that = this,
 			dropped = false;
-		if ($.ui.ddmanager && !this.options.dropBehaviour) {
-			dropped = $.ui.ddmanager.drop(this, event);
+		if ( $.ui.ddmanager && !this.options.dropBehaviour ) {
+			dropped = $.ui.ddmanager.drop( this, event );
 		}
 
 		//if a drop comes from outside (a sortable)
-		if (this.dropped) {
+		if ( this.dropped ) {
 			dropped = this.dropped;
 			this.dropped = false;
 		}
 
-		if ((this.options.revert === "invalid" && !dropped) || (this.options.revert === "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
-			$(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() {
-				if (that._trigger("stop", event) !== false) {
+		if ( ( this.options.revert === "invalid" && !dropped ) || ( this.options.revert === "valid" && dropped ) || this.options.revert === true || ( $.isFunction( this.options.revert ) && this.options.revert.call( this.element, dropped ) ) ) {
+			$( this.helper ).animate( this.originalPosition, parseInt( this.options.revertDuration, 10 ), function() {
+				if ( that._trigger( "stop", event ) !== false ) {
 					that._clear();
 				}
-			});
+			} );
 		} else {
-			if (this._trigger("stop", event) !== false) {
+			if ( this._trigger( "stop", event ) !== false ) {
 				this._clear();
 			}
 		}
@@ -308,22 +309,23 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 		//If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
 		if ( $.ui.ddmanager ) {
-			$.ui.ddmanager.dragStop(this, event);
+			$.ui.ddmanager.dragStop( this, event );
 		}
 
 		// Only need to focus if the event occurred on the draggable itself, see #10527
 		if ( this.handleElement.is( event.target ) ) {
+
 			// The interaction is over; whether or not the click resulted in a drag, focus the element
 			this.element.trigger( "focus" );
 		}
 
-		return $.ui.mouse.prototype._mouseUp.call(this, event);
+		return $.ui.mouse.prototype._mouseUp.call( this, event );
 	},
 
 	cancel: function() {
 
-		if (this.helper.is(".ui-draggable-dragging")) {
-			this._mouseUp({});
+		if ( this.helper.is( ".ui-draggable-dragging" ) ) {
+			this._mouseUp( {} );
 		} else {
 			this._clear();
 		}
@@ -332,7 +334,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 	},
 
-	_getHandle: function(event) {
+	_getHandle: function( event ) {
 		return this.options.handle ?
 			!!$( event.target ).closest( this.element.find( this.options.handle ) ).length :
 			true;
@@ -348,7 +350,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 		this._removeClass( this.handleElement, "ui-draggable-handle" );
 	},
 
-	_createHelper: function(event) {
+	_createHelper: function( event ) {
 
 		var o = this.options,
 			helperIsFunction = $.isFunction( o.helper ),
@@ -358,8 +360,8 @@ $.widget("ui.draggable", $.ui.mouse, {
 					this.element.clone().removeAttr( "id" ) :
 					this.element );
 
-		if (!helper.parents("body").length) {
-			helper.appendTo((o.appendTo === "parent" ? this.element[0].parentNode : o.appendTo));
+		if ( !helper.parents( "body" ).length ) {
+			helper.appendTo( ( o.appendTo === "parent" ? this.element[ 0 ].parentNode : o.appendTo ) );
 		}
 
 		// Http://bugs.jqueryui.com/ticket/9446
@@ -369,8 +371,8 @@ $.widget("ui.draggable", $.ui.mouse, {
 			this._setPositionRelative();
 		}
 
-		if (helper[0] !== this.element[0] && !(/(fixed|absolute)/).test(helper.css("position"))) {
-			helper.css("position", "absolute");
+		if ( helper[ 0 ] !== this.element[ 0 ] && !( /(fixed|absolute)/ ).test( helper.css( "position" ) ) ) {
+			helper.css( "position", "absolute" );
 		}
 
 		return helper;
@@ -383,23 +385,23 @@ $.widget("ui.draggable", $.ui.mouse, {
 		}
 	},
 
-	_adjustOffsetFromHelper: function(obj) {
-		if (typeof obj === "string") {
-			obj = obj.split(" ");
+	_adjustOffsetFromHelper: function( obj ) {
+		if ( typeof obj === "string" ) {
+			obj = obj.split( " " );
 		}
-		if ($.isArray(obj)) {
-			obj = { left: +obj[0], top: +obj[1] || 0 };
+		if ( $.isArray( obj ) ) {
+			obj = { left: +obj[ 0 ], top: +obj[ 1 ] || 0 };
 		}
-		if ("left" in obj) {
+		if ( "left" in obj ) {
 			this.offset.click.left = obj.left + this.margins.left;
 		}
-		if ("right" in obj) {
+		if ( "right" in obj ) {
 			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
 		}
-		if ("top" in obj) {
+		if ( "top" in obj ) {
 			this.offset.click.top = obj.top + this.margins.top;
 		}
-		if ("bottom" in obj) {
+		if ( "bottom" in obj ) {
 			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
 		}
 	},
@@ -418,7 +420,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
 		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
 		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
-		if (this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
+		if ( this.cssPosition === "absolute" && this.scrollParent[ 0 ] !== document && $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) {
 			po.left += this.scrollParent.scrollLeft();
 			po.top += this.scrollParent.scrollTop();
 		}
@@ -428,8 +430,8 @@ $.widget("ui.draggable", $.ui.mouse, {
 		}
 
 		return {
-			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"), 10) || 0),
-			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"), 10) || 0)
+			top: po.top + ( parseInt( this.offsetParent.css( "borderTopWidth" ), 10 ) || 0 ),
+			left: po.left + ( parseInt( this.offsetParent.css( "borderLeftWidth" ), 10 ) || 0 )
 		};
 
 	},
@@ -443,18 +445,18 @@ $.widget("ui.draggable", $.ui.mouse, {
 			scrollIsRootNode = this._isRootNode( this.scrollParent[ 0 ] );
 
 		return {
-			top: p.top - ( parseInt(this.helper.css( "top" ), 10) || 0 ) + ( !scrollIsRootNode ? this.scrollParent.scrollTop() : 0 ),
-			left: p.left - ( parseInt(this.helper.css( "left" ), 10) || 0 ) + ( !scrollIsRootNode ? this.scrollParent.scrollLeft() : 0 )
+			top: p.top - ( parseInt( this.helper.css( "top" ), 10 ) || 0 ) + ( !scrollIsRootNode ? this.scrollParent.scrollTop() : 0 ),
+			left: p.left - ( parseInt( this.helper.css( "left" ), 10 ) || 0 ) + ( !scrollIsRootNode ? this.scrollParent.scrollLeft() : 0 )
 		};
 
 	},
 
 	_cacheMargins: function() {
 		this.margins = {
-			left: (parseInt(this.element.css("marginLeft"), 10) || 0),
-			top: (parseInt(this.element.css("marginTop"), 10) || 0),
-			right: (parseInt(this.element.css("marginRight"), 10) || 0),
-			bottom: (parseInt(this.element.css("marginBottom"), 10) || 0)
+			left: ( parseInt( this.element.css( "marginLeft" ), 10 ) || 0 ),
+			top: ( parseInt( this.element.css( "marginTop" ), 10 ) || 0 ),
+			right: ( parseInt( this.element.css( "marginRight" ), 10 ) || 0 ),
+			bottom: ( parseInt( this.element.css( "marginBottom" ), 10 ) || 0 )
 		};
 	},
 
@@ -488,7 +490,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 			return;
 		}
 
-		if ( o.containment === "document") {
+		if ( o.containment === "document" ) {
 			this.containment = [
 				0,
 				0,
@@ -535,9 +537,9 @@ $.widget("ui.draggable", $.ui.mouse, {
 		this.relativeContainer = c;
 	},
 
-	_convertPositionTo: function(d, pos) {
+	_convertPositionTo: function( d, pos ) {
 
-		if (!pos) {
+		if ( !pos ) {
 			pos = this.position;
 		}
 
@@ -549,13 +551,13 @@ $.widget("ui.draggable", $.ui.mouse, {
 				pos.top	+																// The absolute mouse position
 				this.offset.relative.top * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
 				this.offset.parent.top * mod -										// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.offset.scroll.top : ( scrollIsRootNode ? 0 : this.offset.scroll.top ) ) * mod)
+				( ( this.cssPosition === "fixed" ? -this.offset.scroll.top : ( scrollIsRootNode ? 0 : this.offset.scroll.top ) ) * mod )
 			),
 			left: (
 				pos.left +																// The absolute mouse position
 				this.offset.relative.left * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
 				this.offset.parent.left * mod	-										// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.offset.scroll.left : ( scrollIsRootNode ? 0 : this.offset.scroll.left ) ) * mod)
+				( ( this.cssPosition === "fixed" ? -this.offset.scroll.left : ( scrollIsRootNode ? 0 : this.offset.scroll.left ) ) * mod )
 			)
 		};
 
@@ -585,7 +587,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 		// If we are not dragging yet, we won't check for options
 		if ( constrainPosition ) {
 			if ( this.containment ) {
-				if ( this.relativeContainer ){
+				if ( this.relativeContainer ) {
 					co = this.relativeContainer.offset();
 					containment = [
 						this.containment[ 0 ] + co.left,
@@ -597,27 +599,28 @@ $.widget("ui.draggable", $.ui.mouse, {
 					containment = this.containment;
 				}
 
-				if (event.pageX - this.offset.click.left < containment[0]) {
-					pageX = containment[0] + this.offset.click.left;
+				if ( event.pageX - this.offset.click.left < containment[ 0 ] ) {
+					pageX = containment[ 0 ] + this.offset.click.left;
 				}
-				if (event.pageY - this.offset.click.top < containment[1]) {
-					pageY = containment[1] + this.offset.click.top;
+				if ( event.pageY - this.offset.click.top < containment[ 1 ] ) {
+					pageY = containment[ 1 ] + this.offset.click.top;
 				}
-				if (event.pageX - this.offset.click.left > containment[2]) {
-					pageX = containment[2] + this.offset.click.left;
+				if ( event.pageX - this.offset.click.left > containment[ 2 ] ) {
+					pageX = containment[ 2 ] + this.offset.click.left;
 				}
-				if (event.pageY - this.offset.click.top > containment[3]) {
-					pageY = containment[3] + this.offset.click.top;
+				if ( event.pageY - this.offset.click.top > containment[ 3 ] ) {
+					pageY = containment[ 3 ] + this.offset.click.top;
 				}
 			}
 
-			if (o.grid) {
+			if ( o.grid ) {
+
 				//Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE (see ticket #6950)
-				top = o.grid[1] ? this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1] : this.originalPageY;
-				pageY = containment ? ((top - this.offset.click.top >= containment[1] || top - this.offset.click.top > containment[3]) ? top : ((top - this.offset.click.top >= containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+				top = o.grid[ 1 ] ? this.originalPageY + Math.round( ( pageY - this.originalPageY ) / o.grid[ 1 ] ) * o.grid[ 1 ] : this.originalPageY;
+				pageY = containment ? ( ( top - this.offset.click.top >= containment[ 1 ] || top - this.offset.click.top > containment[ 3 ] ) ? top : ( ( top - this.offset.click.top >= containment[ 1 ] ) ? top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) : top;
 
-				left = o.grid[0] ? this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0] : this.originalPageX;
-				pageX = containment ? ((left - this.offset.click.left >= containment[0] || left - this.offset.click.left > containment[2]) ? left : ((left - this.offset.click.left >= containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+				left = o.grid[ 0 ] ? this.originalPageX + Math.round( ( pageX - this.originalPageX ) / o.grid[ 0 ] ) * o.grid[ 0 ] : this.originalPageX;
+				pageX = containment ? ( ( left - this.offset.click.left >= containment[ 0 ] || left - this.offset.click.left > containment[ 2 ] ) ? left : ( ( left - this.offset.click.left >= containment[ 0 ] ) ? left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) : left;
 			}
 
 			if ( o.axis === "y" ) {
@@ -650,7 +653,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 	_clear: function() {
 		this._removeClass( this.helper, "ui-draggable-dragging" );
-		if (this.helper[0] !== this.element[0] && !this.cancelHelperRemoval) {
+		if ( this.helper[ 0 ] !== this.element[ 0 ] && !this.cancelHelperRemoval ) {
 			this.helper.remove();
 		}
 		this.helper = null;
@@ -685,16 +688,16 @@ $.widget("ui.draggable", $.ui.mouse, {
 		};
 	}
 
-});
+} );
 
 $.ui.plugin.add( "draggable", "connectToSortable", {
 	start: function( event, ui, draggable ) {
 		var uiSortable = $.extend( {}, ui, {
 			item: draggable.element
-		});
+		} );
 
 		draggable.sortables = [];
-		$( draggable.options.connectToSortable ).each(function() {
+		$( draggable.options.connectToSortable ).each( function() {
 			var sortable = $( this ).sortable( "instance" );
 
 			if ( sortable && !sortable.options.disabled ) {
@@ -704,14 +707,14 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
 				// which is used in drag. This ensures it's initialized and synchronized
 				// with any changes that might have happened on the page since initialization.
 				sortable.refreshPositions();
-				sortable._trigger("activate", event, uiSortable);
+				sortable._trigger( "activate", event, uiSortable );
 			}
-		});
+		} );
 	},
 	stop: function( event, ui, draggable ) {
 		var uiSortable = $.extend( {}, ui, {
 			item: draggable.element
-		});
+		} );
 
 		draggable.cancelHelperRemoval = false;
 
@@ -734,12 +737,13 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
 					left: sortable.placeholder.css( "left" )
 				};
 
-				sortable._mouseStop(event);
+				sortable._mouseStop( event );
 
 				// Once drag has ended, the sortable should return to using
 				// its original helper, not the shared helper from draggable
 				sortable.options.helper = sortable.options._helper;
 			} else {
+
 				// Prevent this Sortable from removing the helper.
 				// However, don't set the draggable to remove the helper
 				// either as another connected Sortable may yet handle the removal.
@@ -747,7 +751,7 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
 
 				sortable._trigger( "deactivate", event, uiSortable );
 			}
-		});
+		} );
 	},
 	drag: function( event, ui, draggable ) {
 		$.each( draggable.sortables, function() {
@@ -763,6 +767,7 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
 				innermostIntersecting = true;
 
 				$.each( draggable.sortables, function() {
+
 					// Copy over variables that sortable's _intersectsWith uses
 					this.positionAbs = draggable.positionAbs;
 					this.helperProportions = draggable.helperProportions;
@@ -775,10 +780,11 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
 					}
 
 					return innermostIntersecting;
-				});
+				} );
 			}
 
 			if ( innermostIntersecting ) {
+
 				// If it intersects, we use a little isOver variable and set it once,
 				// so that the move-in stuff gets fired only once.
 				if ( !sortable.isOver ) {
@@ -823,7 +829,7 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
 					// adding to one sortable changes the location of the other sortables (#9675)
 					$.each( draggable.sortables, function() {
 						this.refreshPositions();
-					});
+					} );
 
 					// Hack so receive/update callbacks work (mostly)
 					draggable.currentItem = draggable.element;
@@ -832,12 +838,14 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
 
 				if ( sortable.currentItem ) {
 					sortable._mouseDrag( event );
+
 					// Copy the sortable's position because the draggable's can potentially reflect
 					// a relative position, while sortable is always absolute, which the dragged
 					// element has now become. (#8809)
 					ui.position = sortable.position;
 				}
 			} else {
+
 				// If it doesn't intersect with the sortable, and it intersected before,
 				// we fake the drag stop of the sortable, but make sure it doesn't remove
 				// the helper by using cancelHelperRemoval.
@@ -878,49 +886,49 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
 					// from one sortable changes the location of other sortables (#9675)
 					$.each( draggable.sortables, function() {
 						this.refreshPositions();
-					});
+					} );
 				}
 			}
-		});
+		} );
 	}
-});
+} );
 
-$.ui.plugin.add("draggable", "cursor", {
+$.ui.plugin.add( "draggable", "cursor", {
 	start: function( event, ui, instance ) {
 		var t = $( "body" ),
 			o = instance.options;
 
-		if (t.css("cursor")) {
-			o._cursor = t.css("cursor");
+		if ( t.css( "cursor" ) ) {
+			o._cursor = t.css( "cursor" );
 		}
-		t.css("cursor", o.cursor);
+		t.css( "cursor", o.cursor );
 	},
 	stop: function( event, ui, instance ) {
 		var o = instance.options;
-		if (o._cursor) {
-			$("body").css("cursor", o._cursor);
+		if ( o._cursor ) {
+			$( "body" ).css( "cursor", o._cursor );
 		}
 	}
-});
+} );
 
-$.ui.plugin.add("draggable", "opacity", {
+$.ui.plugin.add( "draggable", "opacity", {
 	start: function( event, ui, instance ) {
 		var t = $( ui.helper ),
 			o = instance.options;
-		if (t.css("opacity")) {
-			o._opacity = t.css("opacity");
+		if ( t.css( "opacity" ) ) {
+			o._opacity = t.css( "opacity" );
 		}
-		t.css("opacity", o.opacity);
+		t.css( "opacity", o.opacity );
 	},
 	stop: function( event, ui, instance ) {
 		var o = instance.options;
-		if (o._opacity) {
-			$(ui.helper).css("opacity", o._opacity);
+		if ( o._opacity ) {
+			$( ui.helper ).css( "opacity", o._opacity );
 		}
 	}
-});
+} );
 
-$.ui.plugin.add("draggable", "scroll", {
+$.ui.plugin.add( "draggable", "scroll", {
 	start: function( event, ui, i ) {
 		if ( !i.scrollParentNotHidden ) {
 			i.scrollParentNotHidden = i.helper.scrollParent( false );
@@ -956,49 +964,49 @@ $.ui.plugin.add("draggable", "scroll", {
 
 		} else {
 
-			if (!o.axis || o.axis !== "x") {
-				if (event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
-					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-				} else if ($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
-					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+			if ( !o.axis || o.axis !== "x" ) {
+				if ( event.pageY - $( document ).scrollTop() < o.scrollSensitivity ) {
+					scrolled = $( document ).scrollTop( $( document ).scrollTop() - o.scrollSpeed );
+				} else if ( $( window ).height() - ( event.pageY - $( document ).scrollTop() ) < o.scrollSensitivity ) {
+					scrolled = $( document ).scrollTop( $( document ).scrollTop() + o.scrollSpeed );
 				}
 			}
 
-			if (!o.axis || o.axis !== "y") {
-				if (event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
-					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-				} else if ($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
-					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+			if ( !o.axis || o.axis !== "y" ) {
+				if ( event.pageX - $( document ).scrollLeft() < o.scrollSensitivity ) {
+					scrolled = $( document ).scrollLeft( $( document ).scrollLeft() - o.scrollSpeed );
+				} else if ( $( window ).width() - ( event.pageX - $( document ).scrollLeft() ) < o.scrollSensitivity ) {
+					scrolled = $( document ).scrollLeft( $( document ).scrollLeft() + o.scrollSpeed );
 				}
 			}
 
 		}
 
-		if (scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
-			$.ui.ddmanager.prepareOffsets(i, event);
+		if ( scrolled !== false && $.ui.ddmanager && !o.dropBehaviour ) {
+			$.ui.ddmanager.prepareOffsets( i, event );
 		}
 
 	}
-});
+} );
 
-$.ui.plugin.add("draggable", "snap", {
+$.ui.plugin.add( "draggable", "snap", {
 	start: function( event, ui, i ) {
 
 		var o = i.options;
 
 		i.snapElements = [];
 
-		$(o.snap.constructor !== String ? ( o.snap.items || ":data(ui-draggable)" ) : o.snap).each(function() {
-			var $t = $(this),
+		$( o.snap.constructor !== String ? ( o.snap.items || ":data(ui-draggable)" ) : o.snap ).each( function() {
+			var $t = $( this ),
 				$o = $t.offset();
-			if (this !== i.element[0]) {
-				i.snapElements.push({
+			if ( this !== i.element[ 0 ] ) {
+				i.snapElements.push( {
 					item: this,
 					width: $t.outerWidth(), height: $t.outerHeight(),
 					top: $o.top, left: $o.left
-				});
+				} );
 			}
-		});
+		} );
 
 	},
 	drag: function( event, ui, inst ) {
@@ -1009,108 +1017,108 @@ $.ui.plugin.add("draggable", "snap", {
 			x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
 			y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height;
 
-		for (i = inst.snapElements.length - 1; i >= 0; i--){
+		for ( i = inst.snapElements.length - 1; i >= 0; i-- ) {
 
-			l = inst.snapElements[i].left - inst.margins.left;
-			r = l + inst.snapElements[i].width;
-			t = inst.snapElements[i].top - inst.margins.top;
-			b = t + inst.snapElements[i].height;
+			l = inst.snapElements[ i ].left - inst.margins.left;
+			r = l + inst.snapElements[ i ].width;
+			t = inst.snapElements[ i ].top - inst.margins.top;
+			b = t + inst.snapElements[ i ].height;
 
 			if ( x2 < l - d || x1 > r + d || y2 < t - d || y1 > b + d || !$.contains( inst.snapElements[ i ].item.ownerDocument, inst.snapElements[ i ].item ) ) {
-				if (inst.snapElements[i].snapping) {
-					(inst.options.snap.release && inst.options.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+				if ( inst.snapElements[ i ].snapping ) {
+					( inst.options.snap.release && inst.options.snap.release.call( inst.element, event, $.extend( inst._uiHash(), { snapItem: inst.snapElements[ i ].item } ) ) );
 				}
-				inst.snapElements[i].snapping = false;
+				inst.snapElements[ i ].snapping = false;
 				continue;
 			}
 
-			if (o.snapMode !== "inner") {
-				ts = Math.abs(t - y2) <= d;
-				bs = Math.abs(b - y1) <= d;
-				ls = Math.abs(l - x2) <= d;
-				rs = Math.abs(r - x1) <= d;
-				if (ts) {
-					ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top;
+			if ( o.snapMode !== "inner" ) {
+				ts = Math.abs( t - y2 ) <= d;
+				bs = Math.abs( b - y1 ) <= d;
+				ls = Math.abs( l - x2 ) <= d;
+				rs = Math.abs( r - x1 ) <= d;
+				if ( ts ) {
+					ui.position.top = inst._convertPositionTo( "relative", { top: t - inst.helperProportions.height, left: 0 } ).top;
 				}
-				if (bs) {
-					ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top;
+				if ( bs ) {
+					ui.position.top = inst._convertPositionTo( "relative", { top: b, left: 0 } ).top;
 				}
-				if (ls) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left;
+				if ( ls ) {
+					ui.position.left = inst._convertPositionTo( "relative", { top: 0, left: l - inst.helperProportions.width } ).left;
 				}
-				if (rs) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left;
+				if ( rs ) {
+					ui.position.left = inst._convertPositionTo( "relative", { top: 0, left: r } ).left;
 				}
 			}
 
-			first = (ts || bs || ls || rs);
+			first = ( ts || bs || ls || rs );
 
-			if (o.snapMode !== "outer") {
-				ts = Math.abs(t - y1) <= d;
-				bs = Math.abs(b - y2) <= d;
-				ls = Math.abs(l - x1) <= d;
-				rs = Math.abs(r - x2) <= d;
-				if (ts) {
-					ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top;
+			if ( o.snapMode !== "outer" ) {
+				ts = Math.abs( t - y1 ) <= d;
+				bs = Math.abs( b - y2 ) <= d;
+				ls = Math.abs( l - x1 ) <= d;
+				rs = Math.abs( r - x2 ) <= d;
+				if ( ts ) {
+					ui.position.top = inst._convertPositionTo( "relative", { top: t, left: 0 } ).top;
 				}
-				if (bs) {
-					ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top;
+				if ( bs ) {
+					ui.position.top = inst._convertPositionTo( "relative", { top: b - inst.helperProportions.height, left: 0 } ).top;
 				}
-				if (ls) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left;
+				if ( ls ) {
+					ui.position.left = inst._convertPositionTo( "relative", { top: 0, left: l } ).left;
 				}
-				if (rs) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left;
+				if ( rs ) {
+					ui.position.left = inst._convertPositionTo( "relative", { top: 0, left: r - inst.helperProportions.width } ).left;
 				}
 			}
 
-			if (!inst.snapElements[i].snapping && (ts || bs || ls || rs || first)) {
-				(inst.options.snap.snap && inst.options.snap.snap.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+			if ( !inst.snapElements[ i ].snapping && ( ts || bs || ls || rs || first ) ) {
+				( inst.options.snap.snap && inst.options.snap.snap.call( inst.element, event, $.extend( inst._uiHash(), { snapItem: inst.snapElements[ i ].item } ) ) );
 			}
-			inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
+			inst.snapElements[ i ].snapping = ( ts || bs || ls || rs || first );
 
 		}
 
 	}
-});
+} );
 
-$.ui.plugin.add("draggable", "stack", {
+$.ui.plugin.add( "draggable", "stack", {
 	start: function( event, ui, instance ) {
 		var min,
 			o = instance.options,
-			group = $.makeArray($(o.stack)).sort(function(a, b) {
-				return (parseInt($(a).css("zIndex"), 10) || 0) - (parseInt($(b).css("zIndex"), 10) || 0);
-			});
+			group = $.makeArray( $( o.stack ) ).sort( function( a, b ) {
+				return ( parseInt( $( a ).css( "zIndex" ), 10 ) || 0 ) - ( parseInt( $( b ).css( "zIndex" ), 10 ) || 0 );
+			} );
 
-		if (!group.length) { return; }
+		if ( !group.length ) { return; }
 
-		min = parseInt($(group[0]).css("zIndex"), 10) || 0;
-		$(group).each(function(i) {
-			$(this).css("zIndex", min + i);
-		});
-		this.css("zIndex", (min + group.length));
+		min = parseInt( $( group[ 0 ] ).css( "zIndex" ), 10 ) || 0;
+		$( group ).each( function( i ) {
+			$( this ).css( "zIndex", min + i );
+		} );
+		this.css( "zIndex", ( min + group.length ) );
 	}
-});
+} );
 
-$.ui.plugin.add("draggable", "zIndex", {
+$.ui.plugin.add( "draggable", "zIndex", {
 	start: function( event, ui, instance ) {
 		var t = $( ui.helper ),
 			o = instance.options;
 
-		if (t.css("zIndex")) {
-			o._zIndex = t.css("zIndex");
+		if ( t.css( "zIndex" ) ) {
+			o._zIndex = t.css( "zIndex" );
 		}
-		t.css("zIndex", o.zIndex);
+		t.css( "zIndex", o.zIndex );
 	},
 	stop: function( event, ui, instance ) {
 		var o = instance.options;
 
-		if (o._zIndex) {
-			$(ui.helper).css("zIndex", o._zIndex);
+		if ( o._zIndex ) {
+			$( ui.helper ).css( "zIndex", o._zIndex );
 		}
 	}
-});
+} );
 
 return $.ui.draggable;
 
-}));
+} ) );

From f7c3d2a56dd8a5bb43c90cf8bc83cab5db8b4173 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 08:59:54 -0400
Subject: [PATCH 14/27] Dialog: Style updates

Ref #14246
---
 tests/unit/dialog/common-deprecated.js |   2 +-
 tests/unit/dialog/common.js            |   2 +-
 tests/unit/dialog/core.js              | 108 +++---
 tests/unit/dialog/deprecated.js        |   6 +-
 tests/unit/dialog/events.js            | 498 ++++++++++++-------------
 tests/unit/dialog/helper.js            |  30 +-
 tests/unit/dialog/methods.js           | 230 ++++++------
 tests/unit/dialog/options.js           | 492 ++++++++++++------------
 ui/widgets/dialog.js                   |  15 +
 9 files changed, 702 insertions(+), 681 deletions(-)

diff --git a/tests/unit/dialog/common-deprecated.js b/tests/unit/dialog/common-deprecated.js
index 26f7cb201bd..1efdcb03018 100644
--- a/tests/unit/dialog/common-deprecated.js
+++ b/tests/unit/dialog/common-deprecated.js
@@ -49,6 +49,6 @@ common.testWidget( "dialog", {
 		resizeStart: null,
 		resizeStop: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/dialog/common.js b/tests/unit/dialog/common.js
index b1884b8cc4c..c8d885ad03f 100644
--- a/tests/unit/dialog/common.js
+++ b/tests/unit/dialog/common.js
@@ -48,6 +48,6 @@ common.testWidget( "dialog", {
 		resizeStart: null,
 		resizeStop: null
 	}
-});
+} );
 
 } );
diff --git a/tests/unit/dialog/core.js b/tests/unit/dialog/core.js
index b351b0aeb0e..7008a832d97 100644
--- a/tests/unit/dialog/core.js
+++ b/tests/unit/dialog/core.js
@@ -4,17 +4,17 @@ define( [
 ], function( $ ) {
 
 // TODO add teardown callback to remove dialogs
-module("dialog: core");
+module( "dialog: core" );
 
 test( "markup structure", function( assert ) {
 	expect( 11 );
 
-	var element = $( "<div>" ).dialog({
+	var element = $( "<div>" ).dialog( {
 			buttons: [ {
 				text: "Ok",
 				click: $.noop
 			} ]
-		}),
+		} ),
 		widget = element.dialog( "widget" ),
 		titlebar = widget.find( ".ui-dialog-titlebar" ),
 		title = titlebar.find( ".ui-dialog-title" ),
@@ -35,7 +35,7 @@ test( "markup structure", function( assert ) {
 	equal( buttonset.length, 1, "Buttonpane has exactly one buttonset" );
 	equal( buttons.length, 1, "Buttonset contains exactly 1 button when created with 1" );
 
-});
+} );
 
 test( "markup structure - no buttons", function( assert ) {
 	expect( 7 );
@@ -53,18 +53,18 @@ test( "markup structure - no buttons", function( assert ) {
 	equal( close.length, 1, "Titlebar has exactly one close button" );
 	equal( title.length, 1, "Titlebar has exactly one title" );
 	assert.hasClasses( element, "ui-dialog-content ui-widget-content" );
-});
+} );
 
-test("title id", function() {
-	expect(1);
+test( "title id", function() {
+	expect( 1 );
 
 	var titleId,
-		element = $("<div>").dialog();
+		element = $( "<div>" ).dialog();
 
-	titleId = element.dialog("widget").find(".ui-dialog-title").attr("id");
-	ok( /ui-id-\d+$/.test( titleId ), "auto-numbered title id");
+	titleId = element.dialog( "widget" ).find( ".ui-dialog-title" ).attr( "id" );
+	ok( /ui-id-\d+$/.test( titleId ), "auto-numbered title id" );
 	element.remove();
-});
+} );
 
 test( "ARIA", function() {
 	expect( 4 );
@@ -76,26 +76,26 @@ test( "ARIA", function() {
 	equal( wrapper.attr( "aria-describedby" ), element.attr( "id" ), "aria-describedby added" );
 	element.remove();
 
-	element = $("<div><div aria-describedby='section2'><p id='section2'>descriotion</p></div></div>").dialog();
+	element = $( "<div><div aria-describedby='section2'><p id='section2'>descriotion</p></div></div>" ).dialog();
 	equal( element.dialog( "widget" ).attr( "aria-describedby" ), null, "no aria-describedby added, as already present in markup" );
 	element.remove();
-});
+} );
 
-test("widget method", function() {
+test( "widget method", function() {
 	expect( 1 );
-	var dialog = $("<div>").appendTo("#qunit-fixture").dialog();
-	deepEqual(dialog.parent()[0], dialog.dialog("widget")[0]);
+	var dialog = $( "<div>" ).appendTo( "#qunit-fixture" ).dialog();
+	deepEqual( dialog.parent()[ 0 ], dialog.dialog( "widget" )[ 0 ] );
 	dialog.remove();
-});
+} );
 
 asyncTest( "focus tabbable", function() {
 	expect( 8 );
 	var element,
 		options = {
-			buttons: [{
+			buttons: [ {
 				text: "Ok",
 				click: $.noop
-			}]
+			} ]
 		};
 
 	function checkFocus( markup, options, testFn, next ) {
@@ -106,23 +106,23 @@ asyncTest( "focus tabbable", function() {
 		$( "body" ).trigger( "focus" );
 
 		element = $( markup ).dialog( options );
-		setTimeout(function() {
-			testFn(function done() {
+		setTimeout( function() {
+			testFn( function done() {
 				element.remove();
 				setTimeout( next );
-			});
-		});
+			} );
+		} );
 	}
 
 	function step1() {
 		checkFocus( "<div><input><input></div>", options, function( done ) {
 			var input = element.find( "input:last" ).trigger( "focus" ).trigger( "blur" );
 			element.dialog( "instance" )._focusTabbable();
-			setTimeout(function() {
+			setTimeout( function() {
 				equal( document.activeElement, input[ 0 ],
 					"1. an element that was focused previously." );
 				done();
-			});
+			} );
 		}, step2 );
 	}
 
@@ -164,10 +164,10 @@ asyncTest( "focus tabbable", function() {
 		checkFocus( "<div>text</div>", { autoOpen: false }, function( done ) {
 			element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).hide();
 			element.dialog( "open" );
-			setTimeout(function() {
+			setTimeout( function() {
 				equal( document.activeElement, element.parent()[ 0 ], "6. the dialog itself" );
 				done();
-			});
+			} );
 		}, step7 );
 	}
 
@@ -177,17 +177,17 @@ asyncTest( "focus tabbable", function() {
 			{
 				open: function() {
 					var inputs = $( this ).find( "input" );
-					inputs.last().on( "keydown",function( event ) {
+					inputs.last().on( "keydown", function( event ) {
 						event.preventDefault();
 						inputs.first().trigger( "focus" );
-					});
+					} );
 				}
 			},
 			function( done ) {
 				var inputs = element.find( "input" );
 				equal( document.activeElement, inputs[ 1 ], "Focus starts on second input" );
-				inputs.last().simulate( "keydown", { keyCode: $.ui.keyCode.TAB });
-				setTimeout(function() {
+				inputs.last().simulate( "keydown", { keyCode: $.ui.keyCode.TAB } );
+				setTimeout( function() {
 					equal( document.activeElement, inputs[ 0 ],
 						"Honor preventDefault, allowing custom focus management" );
 					done();
@@ -198,19 +198,19 @@ asyncTest( "focus tabbable", function() {
 	}
 
 	step1();
-});
+} );
 
 test( "#7960: resizable handles below modal overlays", function() {
 	expect( 1 );
 
 	var resizable = $( "<div>" ).resizable(),
-		dialog = $( "<div>" ).dialog({ modal: true }),
+		dialog = $( "<div>" ).dialog( { modal: true } ),
 		resizableZindex = parseInt( resizable.find( ".ui-resizable-handle" ).css( "zIndex" ), 10 ),
 		overlayZindex = parseInt( $( ".ui-widget-overlay" ).css( "zIndex" ), 10 );
 
 	ok( resizableZindex < overlayZindex, "Resizable handles have lower z-index than modal overlay" );
 	dialog.dialog( "destroy" );
-});
+} );
 
 asyncTest( "Prevent tabbing out of dialogs", function() {
 	expect( 3 );
@@ -219,13 +219,13 @@ asyncTest( "Prevent tabbing out of dialogs", function() {
 		inputs = element.find( "input" );
 
 	// Remove close button to test focus on just the two buttons
-	element.dialog( "widget" ).find( ".ui-button").remove();
+	element.dialog( "widget" ).find( ".ui-button" ).remove();
 
 	function checkTab() {
 		equal( document.activeElement, inputs[ 0 ], "Tab key event moved focus within the modal" );
 
 		// Check shift tab
-		$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB, shiftKey: true });
+		$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB, shiftKey: true } );
 		setTimeout( checkShiftTab );
 	}
 
@@ -237,27 +237,27 @@ asyncTest( "Prevent tabbing out of dialogs", function() {
 	}
 
 	inputs[ 1 ].focus();
-	setTimeout(function() {
+	setTimeout( function() {
 		equal( document.activeElement, inputs[ 1 ], "Focus set on second input" );
-		inputs.eq( 1 ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB });
+		inputs.eq( 1 ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB } );
 
 		setTimeout( checkTab );
-	});
-});
+	} );
+} );
 
 asyncTest( "#9048: multiple modal dialogs opened and closed in different order", function() {
 	expect( 1 );
-	$( "#dialog1, #dialog2" ).dialog({ autoOpen: false, modal:true });
+	$( "#dialog1, #dialog2" ).dialog( { autoOpen: false, modal:true } );
 	$( "#dialog1" ).dialog( "open" );
 	$( "#dialog2" ).dialog( "open" );
 	$( "#dialog1" ).dialog( "close" );
-	setTimeout(function() {
+	setTimeout( function() {
 		$( "#dialog2" ).dialog( "close" );
 		$( "#favorite-animal" ).trigger( "focus" );
 		ok( true, "event handlers cleaned up (no errors thrown)" );
 		start();
-	});
-});
+	} );
+} );
 
 asyncTest( "interaction between overlay and other dialogs", function() {
 	$.widget( "ui.testWidget", $.ui.dialog, {
@@ -265,11 +265,11 @@ asyncTest( "interaction between overlay and other dialogs", function() {
 			modal: true,
 			autoOpen: false
 		}
-	});
+	} );
 	expect( 2 );
-	var first = $( "<div><input id='input-1'></div>" ).dialog({
+	var first = $( "<div><input id='input-1'></div>" ).dialog( {
 			modal: true
-		}),
+		} ),
 		firstInput = first.find( "input" ),
 		second = $( "<div><input id='input-2'></div>" ).testWidget(),
 		secondInput = second.find( "input" );
@@ -280,18 +280,18 @@ asyncTest( "interaction between overlay and other dialogs", function() {
 	$( "body" ).trigger( "focus" );
 
 	// Wait for the modal to init
-	setTimeout(function() {
+	setTimeout( function() {
 		second.testWidget( "open" );
 
 		// Simulate user tabbing from address bar to an element outside the dialog
 		$( "#favorite-animal" ).trigger( "focus" );
-		setTimeout(function() {
+		setTimeout( function() {
 			equal( document.activeElement, secondInput[ 0 ] );
 
 			// Last active dialog must receive focus
 			firstInput.trigger( "focus" );
 			$( "#favorite-animal" ).trigger( "focus" );
-			setTimeout(function() {
+			setTimeout( function() {
 				equal( document.activeElement, firstInput[ 0 ] );
 
 				// Cleanup
@@ -300,9 +300,9 @@ asyncTest( "interaction between overlay and other dialogs", function() {
 				delete $.ui.testWidget;
 				delete $.fn.testWidget;
 				start();
-			});
-		});
-	});
-});
+			} );
+		} );
+	} );
+} );
 
 } );
diff --git a/tests/unit/dialog/deprecated.js b/tests/unit/dialog/deprecated.js
index 2d75cad0dc2..1a679433858 100644
--- a/tests/unit/dialog/deprecated.js
+++ b/tests/unit/dialog/deprecated.js
@@ -13,7 +13,7 @@ test( "dialogClass", function( assert ) {
 	assert.lacksClasses( widget, "foo", "dialogClass not specified. class not added" );
 	element.remove();
 
-	element = $( "<div>" ).dialog({ dialogClass: "foo" });
+	element = $( "<div>" ).dialog( { dialogClass: "foo" } );
 	widget = element.dialog( "widget" );
 	assert.hasClasses( widget, "foo", "dialogClass in init, foo class added" );
 	element.dialog( "option", "dialogClass", "foobar" );
@@ -21,10 +21,10 @@ test( "dialogClass", function( assert ) {
 	assert.hasClasses( widget, "foobar", "dialogClass changed, new one was added" );
 	element.remove();
 
-	element = $( "<div>" ).dialog({ dialogClass: "foo bar" });
+	element = $( "<div>" ).dialog( { dialogClass: "foo bar" } );
 	widget = element.dialog( "widget" );
 	assert.hasClasses( widget, "foo bar", "dialogClass in init, two classes." );
 	element.remove();
-});
+} );
 
 } );
diff --git a/tests/unit/dialog/events.js b/tests/unit/dialog/events.js
index 8a56699ab23..dd1f4055ab5 100644
--- a/tests/unit/dialog/events.js
+++ b/tests/unit/dialog/events.js
@@ -4,75 +4,75 @@ define( [
 	"ui/widgets/dialog"
 ], function( $, testHelper ) {
 
-module("dialog: events");
-
-test("open", function() {
-	expect(13);
-
-	var element = $("<div></div>");
-	element.dialog({
-		open: function(ev, ui) {
-			ok(element.dialog( "instance" )._isOpen, "interal _isOpen flag is set");
-			ok(true, "autoOpen: true fires open callback");
-			equal(this, element[0], "context of callback");
-			equal(ev.type, "dialogopen", "event type in callback");
-			deepEqual(ui, {}, "ui hash in callback");
+module( "dialog: events" );
+
+test( "open", function() {
+	expect( 13 );
+
+	var element = $( "<div></div>" );
+	element.dialog( {
+		open: function( ev, ui ) {
+			ok( element.dialog( "instance" )._isOpen, "interal _isOpen flag is set" );
+			ok( true, "autoOpen: true fires open callback" );
+			equal( this, element[ 0 ], "context of callback" );
+			equal( ev.type, "dialogopen", "event type in callback" );
+			deepEqual( ui, {}, "ui hash in callback" );
 		}
-	});
+	} );
 	element.remove();
 
-	element = $("<div></div>");
-	element.dialog({
+	element = $( "<div></div>" );
+	element.dialog( {
 		autoOpen: false,
-		open: function(ev, ui) {
-			ok(true, ".dialog('open') fires open callback");
-			equal(this, element[0], "context of callback");
-			equal(ev.type, "dialogopen", "event type in callback");
-			deepEqual(ui, {}, "ui hash in callback");
+		open: function( ev, ui ) {
+			ok( true, ".dialog('open') fires open callback" );
+			equal( this, element[ 0 ], "context of callback" );
+			equal( ev.type, "dialogopen", "event type in callback" );
+			deepEqual( ui, {}, "ui hash in callback" );
 		}
-	}).on("dialogopen", function(ev, ui) {
-		ok(element.dialog( "instance" )._isOpen, "interal _isOpen flag is set");
-		ok(true, "dialog('open') fires open event");
-		equal(this, element[0], "context of event");
-		deepEqual(ui, {}, "ui hash in event");
-	});
-	element.dialog("open");
+	} ).on( "dialogopen", function( ev, ui ) {
+		ok( element.dialog( "instance" )._isOpen, "interal _isOpen flag is set" );
+		ok( true, "dialog('open') fires open event" );
+		equal( this, element[ 0 ], "context of event" );
+		deepEqual( ui, {}, "ui hash in event" );
+	} );
+	element.dialog( "open" );
 	element.remove();
-});
+} );
 
 test( "focus", function() {
 	expect( 5 );
 	var element, other;
-	element = $("#dialog1").dialog({
+	element = $( "#dialog1" ).dialog( {
 		autoOpen: false
-	});
-	other = $("#dialog2").dialog({
+	} );
+	other = $( "#dialog2" ).dialog( {
 		autoOpen: false
-	});
+	} );
 
 	element.one( "dialogopen", function() {
 		ok( true, "open, just once" );
-	});
+	} );
 	element.one( "dialogfocus", function() {
 		ok( true, "focus on open" );
-	});
+	} );
 	other.dialog( "open" );
 
 	element.one( "dialogfocus", function() {
 		ok( true, "when opening and already open and wasn't on top" );
-	});
+	} );
 	other.dialog( "open" );
 	element.dialog( "open" );
 
 	element.one( "dialogfocus", function() {
 		ok( true, "when calling moveToTop and wasn't on top" );
-	});
+	} );
 	other.dialog( "moveToTop" );
 	element.dialog( "moveToTop" );
 
 	element.on( "dialogfocus", function() {
 		ok( true, "when mousedown anywhere on the dialog and it wasn't on top" );
-	});
+	} );
 	other.dialog( "moveToTop" );
 	element.trigger( "mousedown" );
 
@@ -82,289 +82,289 @@ test( "focus", function() {
 	element.trigger( "mousedown" );
 
 	element.add( other ).remove();
-});
+} );
 
-test("dragStart", function() {
-	expect(9);
+test( "dragStart", function() {
+	expect( 9 );
 
 	var handle,
-		element = $("<div></div>").dialog({
-			dragStart: function(ev, ui) {
-				ok(true, "dragging fires dragStart callback");
-				equal(this, element[0], "context of callback");
-				equal(ev.type, "dialogdragstart", "event type in callback");
-				ok(ui.position !== undefined, "ui.position in callback");
-				ok(ui.offset !== undefined, "ui.offset in callback");
+		element = $( "<div></div>" ).dialog( {
+			dragStart: function( ev, ui ) {
+				ok( true, "dragging fires dragStart callback" );
+				equal( this, element[ 0 ], "context of callback" );
+				equal( ev.type, "dialogdragstart", "event type in callback" );
+				ok( ui.position !== undefined, "ui.position in callback" );
+				ok( ui.offset !== undefined, "ui.offset in callback" );
 			}
-		}).on("dialogdragstart", function(ev, ui) {
-			ok(true, "dragging fires dialogdragstart event");
-			equal(this, element[0], "context of event");
-			ok(ui.position !== undefined, "ui.position in callback");
-			ok(ui.offset !== undefined, "ui.offset in callback");
-		});
-
-	handle = $(".ui-dialog-titlebar", element.dialog("widget"));
-	testHelper.drag(element, handle, 50, 50);
+		} ).on( "dialogdragstart", function( ev, ui ) {
+			ok( true, "dragging fires dialogdragstart event" );
+			equal( this, element[ 0 ], "context of event" );
+			ok( ui.position !== undefined, "ui.position in callback" );
+			ok( ui.offset !== undefined, "ui.offset in callback" );
+		} );
+
+	handle = $( ".ui-dialog-titlebar", element.dialog( "widget" ) );
+	testHelper.drag( element, handle, 50, 50 );
 	element.remove();
-});
+} );
 
-test("drag", function() {
-	expect(9);
+test( "drag", function() {
+	expect( 9 );
 	var handle,
 		hasDragged = false,
-		element = $("<div></div>").dialog({
-			drag: function(ev, ui) {
-				if (!hasDragged) {
-					ok(true, "dragging fires drag callback");
-					equal(this, element[0], "context of callback");
-					equal(ev.type, "dialogdrag", "event type in callback");
-					ok(ui.position !== undefined, "ui.position in callback");
-					ok(ui.offset !== undefined, "ui.offset in callback");
+		element = $( "<div></div>" ).dialog( {
+			drag: function( ev, ui ) {
+				if ( !hasDragged ) {
+					ok( true, "dragging fires drag callback" );
+					equal( this, element[ 0 ], "context of callback" );
+					equal( ev.type, "dialogdrag", "event type in callback" );
+					ok( ui.position !== undefined, "ui.position in callback" );
+					ok( ui.offset !== undefined, "ui.offset in callback" );
 
 					hasDragged = true;
 				}
 			}
-		}).one("dialogdrag", function(ev, ui) {
-			ok(true, "dragging fires dialogdrag event");
-			equal(this, element[0], "context of event");
-			ok(ui.position !== undefined, "ui.position in callback");
-			ok(ui.offset !== undefined, "ui.offset in callback");
-		});
-
-	handle = $(".ui-dialog-titlebar", element.dialog("widget"));
-	testHelper.drag(element, handle, 50, 50);
+		} ).one( "dialogdrag", function( ev, ui ) {
+			ok( true, "dragging fires dialogdrag event" );
+			equal( this, element[ 0 ], "context of event" );
+			ok( ui.position !== undefined, "ui.position in callback" );
+			ok( ui.offset !== undefined, "ui.offset in callback" );
+		} );
+
+	handle = $( ".ui-dialog-titlebar", element.dialog( "widget" ) );
+	testHelper.drag( element, handle, 50, 50 );
 	element.remove();
-});
+} );
 
-test("dragStop", function() {
-	expect(9);
+test( "dragStop", function() {
+	expect( 9 );
 
 	var handle,
-		element = $("<div></div>").dialog({
-			dragStop: function(ev, ui) {
-				ok(true, "dragging fires dragStop callback");
-				equal(this, element[0], "context of callback");
-				equal(ev.type, "dialogdragstop", "event type in callback");
-				ok(ui.position !== undefined, "ui.position in callback");
-				ok(ui.offset !== undefined, "ui.offset in callback");
+		element = $( "<div></div>" ).dialog( {
+			dragStop: function( ev, ui ) {
+				ok( true, "dragging fires dragStop callback" );
+				equal( this, element[ 0 ], "context of callback" );
+				equal( ev.type, "dialogdragstop", "event type in callback" );
+				ok( ui.position !== undefined, "ui.position in callback" );
+				ok( ui.offset !== undefined, "ui.offset in callback" );
 			}
-		}).on("dialogdragstop", function(ev, ui) {
-			ok(true, "dragging fires dialogdragstop event");
-			equal(this, element[0], "context of event");
-			ok(ui.position !== undefined, "ui.position in callback");
-			ok(ui.offset !== undefined, "ui.offset in callback");
-		});
-
-	handle = $(".ui-dialog-titlebar", element.dialog("widget"));
-	testHelper.drag(element, handle, 50, 50);
+		} ).on( "dialogdragstop", function( ev, ui ) {
+			ok( true, "dragging fires dialogdragstop event" );
+			equal( this, element[ 0 ], "context of event" );
+			ok( ui.position !== undefined, "ui.position in callback" );
+			ok( ui.offset !== undefined, "ui.offset in callback" );
+		} );
+
+	handle = $( ".ui-dialog-titlebar", element.dialog( "widget" ) );
+	testHelper.drag( element, handle, 50, 50 );
 	element.remove();
-});
+} );
 
-test("resizeStart", function() {
-	expect(13);
+test( "resizeStart", function() {
+	expect( 13 );
 
 	var handle,
-		element = $("<div></div>").dialog({
-			resizeStart: function(ev, ui) {
-				ok(true, "resizing fires resizeStart callback");
-				equal(this, element[0], "context of callback");
-				equal(ev.type, "dialogresizestart", "event type in callback");
-				ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
-				ok(ui.originalSize !== undefined, "ui.originalSize in callback");
-				ok(ui.position !== undefined, "ui.position in callback");
-				ok(ui.size !== undefined, "ui.size in callback");
+		element = $( "<div></div>" ).dialog( {
+			resizeStart: function( ev, ui ) {
+				ok( true, "resizing fires resizeStart callback" );
+				equal( this, element[ 0 ], "context of callback" );
+				equal( ev.type, "dialogresizestart", "event type in callback" );
+				ok( ui.originalPosition !== undefined, "ui.originalPosition in callback" );
+				ok( ui.originalSize !== undefined, "ui.originalSize in callback" );
+				ok( ui.position !== undefined, "ui.position in callback" );
+				ok( ui.size !== undefined, "ui.size in callback" );
 			}
-		}).on("dialogresizestart", function(ev, ui) {
-			ok(true, "resizing fires dialogresizestart event");
-			equal(this, element[0], "context of event");
-			ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
-			ok(ui.originalSize !== undefined, "ui.originalSize in callback");
-			ok(ui.position !== undefined, "ui.position in callback");
-			ok(ui.size !== undefined, "ui.size in callback");
-		});
-
-	handle = $(".ui-resizable-se", element.dialog("widget"));
-	testHelper.drag(element, handle, 50, 50);
+		} ).on( "dialogresizestart", function( ev, ui ) {
+			ok( true, "resizing fires dialogresizestart event" );
+			equal( this, element[ 0 ], "context of event" );
+			ok( ui.originalPosition !== undefined, "ui.originalPosition in callback" );
+			ok( ui.originalSize !== undefined, "ui.originalSize in callback" );
+			ok( ui.position !== undefined, "ui.position in callback" );
+			ok( ui.size !== undefined, "ui.size in callback" );
+		} );
+
+	handle = $( ".ui-resizable-se", element.dialog( "widget" ) );
+	testHelper.drag( element, handle, 50, 50 );
 	element.remove();
-});
+} );
 
-test("resize", function() {
-	expect(13);
+test( "resize", function() {
+	expect( 13 );
 	var handle,
 		hasResized = false,
-		element = $("<div></div>").dialog({
-			resize: function(ev, ui) {
-				if (!hasResized) {
-					ok(true, "resizing fires resize callback");
-					equal(this, element[0], "context of callback");
-					equal(ev.type, "dialogresize", "event type in callback");
-					ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
-					ok(ui.originalSize !== undefined, "ui.originalSize in callback");
-					ok(ui.position !== undefined, "ui.position in callback");
-					ok(ui.size !== undefined, "ui.size in callback");
+		element = $( "<div></div>" ).dialog( {
+			resize: function( ev, ui ) {
+				if ( !hasResized ) {
+					ok( true, "resizing fires resize callback" );
+					equal( this, element[ 0 ], "context of callback" );
+					equal( ev.type, "dialogresize", "event type in callback" );
+					ok( ui.originalPosition !== undefined, "ui.originalPosition in callback" );
+					ok( ui.originalSize !== undefined, "ui.originalSize in callback" );
+					ok( ui.position !== undefined, "ui.position in callback" );
+					ok( ui.size !== undefined, "ui.size in callback" );
 
 					hasResized = true;
 				}
 			}
-		}).one("dialogresize", function(ev, ui) {
-			ok(true, "resizing fires dialogresize event");
-			equal(this, element[0], "context of event");
-			ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
-			ok(ui.originalSize !== undefined, "ui.originalSize in callback");
-			ok(ui.position !== undefined, "ui.position in callback");
-			ok(ui.size !== undefined, "ui.size in callback");
-		});
-
-	handle = $(".ui-resizable-se", element.dialog("widget"));
-	testHelper.drag(element, handle, 50, 50);
+		} ).one( "dialogresize", function( ev, ui ) {
+			ok( true, "resizing fires dialogresize event" );
+			equal( this, element[ 0 ], "context of event" );
+			ok( ui.originalPosition !== undefined, "ui.originalPosition in callback" );
+			ok( ui.originalSize !== undefined, "ui.originalSize in callback" );
+			ok( ui.position !== undefined, "ui.position in callback" );
+			ok( ui.size !== undefined, "ui.size in callback" );
+		} );
+
+	handle = $( ".ui-resizable-se", element.dialog( "widget" ) );
+	testHelper.drag( element, handle, 50, 50 );
 	element.remove();
-});
+} );
 
-test("resizeStop", function() {
-	expect(13);
+test( "resizeStop", function() {
+	expect( 13 );
 
 	var handle,
-		element = $("<div></div>").dialog({
-			resizeStop: function(ev, ui) {
-				ok(true, "resizing fires resizeStop callback");
-				equal(this, element[0], "context of callback");
-				equal(ev.type, "dialogresizestop", "event type in callback");
-				ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
-				ok(ui.originalSize !== undefined, "ui.originalSize in callback");
-				ok(ui.position !== undefined, "ui.position in callback");
-				ok(ui.size !== undefined, "ui.size in callback");
+		element = $( "<div></div>" ).dialog( {
+			resizeStop: function( ev, ui ) {
+				ok( true, "resizing fires resizeStop callback" );
+				equal( this, element[ 0 ], "context of callback" );
+				equal( ev.type, "dialogresizestop", "event type in callback" );
+				ok( ui.originalPosition !== undefined, "ui.originalPosition in callback" );
+				ok( ui.originalSize !== undefined, "ui.originalSize in callback" );
+				ok( ui.position !== undefined, "ui.position in callback" );
+				ok( ui.size !== undefined, "ui.size in callback" );
 			}
-		}).on("dialogresizestop", function(ev, ui) {
-			ok(true, "resizing fires dialogresizestop event");
-			equal(this, element[0], "context of event");
-				ok(ui.originalPosition !== undefined, "ui.originalPosition in callback");
-				ok(ui.originalSize !== undefined, "ui.originalSize in callback");
-				ok(ui.position !== undefined, "ui.position in callback");
-				ok(ui.size !== undefined, "ui.size in callback");
-		});
-
-	handle = $(".ui-resizable-se", element.dialog("widget"));
-	testHelper.drag(element, handle, 50, 50);
+		} ).on( "dialogresizestop", function( ev, ui ) {
+			ok( true, "resizing fires dialogresizestop event" );
+			equal( this, element[ 0 ], "context of event" );
+				ok( ui.originalPosition !== undefined, "ui.originalPosition in callback" );
+				ok( ui.originalSize !== undefined, "ui.originalSize in callback" );
+				ok( ui.position !== undefined, "ui.position in callback" );
+				ok( ui.size !== undefined, "ui.size in callback" );
+		} );
+
+	handle = $( ".ui-resizable-se", element.dialog( "widget" ) );
+	testHelper.drag( element, handle, 50, 50 );
 	element.remove();
-});
+} );
 
-asyncTest("close", function() {
-	expect(14);
+asyncTest( "close", function() {
+	expect( 14 );
 
-	var element = $("<div></div>").dialog({
-		close: function(ev, ui) {
-			ok(true, ".dialog('close') fires close callback");
-			equal(this, element[0], "context of callback");
-			equal(ev.type, "dialogclose", "event type in callback");
-			deepEqual(ui, {}, "ui hash in callback");
+	var element = $( "<div></div>" ).dialog( {
+		close: function( ev, ui ) {
+			ok( true, ".dialog('close') fires close callback" );
+			equal( this, element[ 0 ], "context of callback" );
+			equal( ev.type, "dialogclose", "event type in callback" );
+			deepEqual( ui, {}, "ui hash in callback" );
 		}
-	}).on("dialogclose", function(ev, ui) {
-		ok(true, ".dialog('close') fires dialogclose event");
-		equal(this, element[0], "context of event");
-		deepEqual(ui, {}, "ui hash in event");
-	});
-	element.dialog("close");
+	} ).on( "dialogclose", function( ev, ui ) {
+		ok( true, ".dialog('close') fires dialogclose event" );
+		equal( this, element[ 0 ], "context of event" );
+		deepEqual( ui, {}, "ui hash in event" );
+	} );
+	element.dialog( "close" );
 	element.remove();
 
 	// Close event with an effect
-	element = $("<div></div>").dialog({
+	element = $( "<div></div>" ).dialog( {
 		hide: 10,
-		close: function(ev, ui) {
-			ok(true, ".dialog('close') fires close callback");
-			equal(this, element[0], "context of callback");
-			equal(ev.type, "dialogclose", "event type in callback");
-			deepEqual(ui, {}, "ui hash in callback");
+		close: function( ev, ui ) {
+			ok( true, ".dialog('close') fires close callback" );
+			equal( this, element[ 0 ], "context of callback" );
+			equal( ev.type, "dialogclose", "event type in callback" );
+			deepEqual( ui, {}, "ui hash in callback" );
 			start();
 		}
-	}).on("dialogclose", function(ev, ui) {
-		ok(true, ".dialog('close') fires dialogclose event");
-		equal(this, element[0], "context of event");
-		deepEqual(ui, {}, "ui hash in event");
-	});
-	element.dialog("close");
-});
-
-test("beforeClose", function() {
-	expect(14);
-
-	var element = $("<div></div>").dialog({
-		beforeClose: function(ev, ui) {
-			ok(true, ".dialog('close') fires beforeClose callback");
-			equal(this, element[0], "context of callback");
-			equal(ev.type, "dialogbeforeclose", "event type in callback");
-			deepEqual(ui, {}, "ui hash in callback");
+	} ).on( "dialogclose", function( ev, ui ) {
+		ok( true, ".dialog('close') fires dialogclose event" );
+		equal( this, element[ 0 ], "context of event" );
+		deepEqual( ui, {}, "ui hash in event" );
+	} );
+	element.dialog( "close" );
+} );
+
+test( "beforeClose", function() {
+	expect( 14 );
+
+	var element = $( "<div></div>" ).dialog( {
+		beforeClose: function( ev, ui ) {
+			ok( true, ".dialog('close') fires beforeClose callback" );
+			equal( this, element[ 0 ], "context of callback" );
+			equal( ev.type, "dialogbeforeclose", "event type in callback" );
+			deepEqual( ui, {}, "ui hash in callback" );
 			return false;
 		}
-	});
+	} );
 
-	element.dialog("close");
-	ok( element.dialog("widget").is(":visible"), "beforeClose callback should prevent dialog from closing");
+	element.dialog( "close" );
+	ok( element.dialog( "widget" ).is( ":visible" ), "beforeClose callback should prevent dialog from closing" );
 	element.remove();
 
-	element = $("<div></div>").dialog();
-	element.dialog("option", "beforeClose", function(ev, ui) {
-		ok(true, ".dialog('close') fires beforeClose callback");
-		equal(this, element[0], "context of callback");
-		equal(ev.type, "dialogbeforeclose", "event type in callback");
-		deepEqual(ui, {}, "ui hash in callback");
+	element = $( "<div></div>" ).dialog();
+	element.dialog( "option", "beforeClose", function( ev, ui ) {
+		ok( true, ".dialog('close') fires beforeClose callback" );
+		equal( this, element[ 0 ], "context of callback" );
+		equal( ev.type, "dialogbeforeclose", "event type in callback" );
+		deepEqual( ui, {}, "ui hash in callback" );
 		return false;
-	});
-	element.dialog("close");
+	} );
+	element.dialog( "close" );
 
-	ok( element.dialog("widget").is(":visible"), "beforeClose callback should prevent dialog from closing");
+	ok( element.dialog( "widget" ).is( ":visible" ), "beforeClose callback should prevent dialog from closing" );
 	element.remove();
 
-	element = $("<div></div>").dialog().on("dialogbeforeclose", function(ev, ui) {
-		ok(true, ".dialog('close') triggers dialogbeforeclose event");
-		equal(this, element[0], "context of event");
-		deepEqual(ui, {}, "ui hash in event");
+	element = $( "<div></div>" ).dialog().on( "dialogbeforeclose", function( ev, ui ) {
+		ok( true, ".dialog('close') triggers dialogbeforeclose event" );
+		equal( this, element[ 0 ], "context of event" );
+		deepEqual( ui, {}, "ui hash in event" );
 		return false;
-	});
-	element.dialog("close");
-	ok( element.dialog("widget").is(":visible"), "dialogbeforeclose event should prevent dialog from closing");
+	} );
+	element.dialog( "close" );
+	ok( element.dialog( "widget" ).is( ":visible" ), "dialogbeforeclose event should prevent dialog from closing" );
 	element.remove();
-});
+} );
 
 // #8789 and #8838
-asyncTest("ensure dialog's container doesn't scroll on resize and focus", function() {
-	expect(2);
-
-	var element = $("#dialog1").dialog(),
-		initialScroll = $(window).scrollTop();
-	element.dialog("option", "height", 600);
-	equal($(window).scrollTop(), initialScroll, "scroll hasn't moved after height change");
-	setTimeout( function(){
-		$(".ui-dialog-titlebar-close").simulate("mousedown");
-		equal($(window).scrollTop(), initialScroll, "scroll hasn't moved after focus moved to dialog");
-		element.dialog("destroy");
+asyncTest( "ensure dialog's container doesn't scroll on resize and focus", function() {
+	expect( 2 );
+
+	var element = $( "#dialog1" ).dialog(),
+		initialScroll = $( window ).scrollTop();
+	element.dialog( "option", "height", 600 );
+	equal( $( window ).scrollTop(), initialScroll, "scroll hasn't moved after height change" );
+	setTimeout( function() {
+		$( ".ui-dialog-titlebar-close" ).simulate( "mousedown" );
+		equal( $( window ).scrollTop(), initialScroll, "scroll hasn't moved after focus moved to dialog" );
+		element.dialog( "destroy" );
 		start();
-	});
-});
+	} );
+} );
 
-test("#5184: isOpen in dialogclose event is true", function() {
+test( "#5184: isOpen in dialogclose event is true", function() {
 	expect( 3 );
 
-	var element = $( "<div></div>" ).dialog({
+	var element = $( "<div></div>" ).dialog( {
 			close: function() {
-				ok( !element.dialog("isOpen"), "dialog is not open during close" );
+				ok( !element.dialog( "isOpen" ), "dialog is not open during close" );
 			}
-		});
-	ok( element.dialog("isOpen"), "dialog is open after init" );
+		} );
+	ok( element.dialog( "isOpen" ), "dialog is open after init" );
 	element.dialog( "close" );
-	ok( !element.dialog("isOpen"), "dialog is not open after close" );
+	ok( !element.dialog( "isOpen" ), "dialog is not open after close" );
 	element.remove();
-});
+} );
 
-test("ensure dialog keeps focus when clicking modal overlay", function() {
+test( "ensure dialog keeps focus when clicking modal overlay", function() {
 	expect( 2 );
 
-	var element = $( "<div></div>" ).dialog({
+	var element = $( "<div></div>" ).dialog( {
 			modal: true
-		});
+		} );
 	equal( $( document.activeElement ).closest( ".ui-dialog" ).length, 1, "focus is in dialog" );
-	$(".ui-widget-overlay").simulate("mousedown");
+	$( ".ui-widget-overlay" ).simulate( "mousedown" );
 	equal( $( document.activeElement ).closest( ".ui-dialog" ).length, 1, "focus is still in dialog" );
 	element.remove();
-});
+} );
 
 } );
diff --git a/tests/unit/dialog/helper.js b/tests/unit/dialog/helper.js
index 87ca9c172d3..9db5b56134c 100644
--- a/tests/unit/dialog/helper.js
+++ b/tests/unit/dialog/helper.js
@@ -5,22 +5,23 @@ define( [
 ], function( $, helper ) {
 
 return $.extend( helper, {
-	drag: function(element, handle, dx, dy) {
-		var d = element.dialog("widget");
+	drag: function( element, handle, dx, dy ) {
+		var d = element.dialog( "widget" );
+
 		//this mouseover is to work around a limitation in resizable
 		//TODO: fix resizable so handle doesn't require mouseover in order to be used
-		$( handle, d ).simulate("mouseover").simulate( "drag", {
+		$( handle, d ).simulate( "mouseover" ).simulate( "drag", {
 			dx: dx,
 			dy: dy
-		});
+		} );
 	},
-	testDrag: function(element, dx, dy, expectedDX, expectedDY, msg) {
+	testDrag: function( element, dx, dy, expectedDX, expectedDY, msg ) {
 		var actualDX, actualDY, offsetAfter,
-			d = element.dialog("widget"),
-			handle = $(".ui-dialog-titlebar", d),
+			d = element.dialog( "widget" ),
+			handle = $( ".ui-dialog-titlebar", d ),
 			offsetBefore = d.offset();
 
-		this.drag(element, handle, dx, dy);
+		this.drag( element, handle, dx, dy );
 
 		offsetAfter = d.offset();
 
@@ -28,19 +29,20 @@ return $.extend( helper, {
 
 		actualDX = offsetAfter.left - offsetBefore.left;
 		actualDY = offsetAfter.top - offsetBefore.top;
-		ok( expectedDX - actualDX <= 1 && expectedDY - actualDY <= 1, "dragged[" + expectedDX + ", " + expectedDY + "] " + msg);
+		ok( expectedDX - actualDX <= 1 && expectedDY - actualDY <= 1, "dragged[" + expectedDX + ", " + expectedDY + "] " + msg );
 	},
+
 	// TODO switch back to checking the size of the .ui-dialog element (var d)
 	// once we switch to using box-sizing: border-box (#9845) that should work fine
 	// using the element's dimensions to avoid subpixel errors
-	shouldResize: function(element, dw, dh, msg) {
+	shouldResize: function( element, dw, dh, msg ) {
 		var heightAfter, widthAfter, actual, expected,
-			d = element.dialog("widget"),
-			handle = $(".ui-resizable-se", d),
+			d = element.dialog( "widget" ),
+			handle = $( ".ui-resizable-se", d ),
 			heightBefore = element.height(),
 			widthBefore = element.width();
 
-		this.drag(element, handle, 50, 50);
+		this.drag( element, handle, 50, 50 );
 
 		heightAfter = element.height();
 		widthAfter = element.width();
@@ -48,7 +50,7 @@ return $.extend( helper, {
 		msg = msg ? msg + "." : "";
 		actual = { width: widthAfter, height: heightAfter },
 		expected = { width: widthBefore + dw, height: heightBefore + dh };
-		deepEqual(actual, expected, "resized[" + 50 + ", " + 50 + "] " + msg);
+		deepEqual( actual, expected, "resized[" + 50 + ", " + 50 + "] " + msg );
 	}
 } );
 
diff --git a/tests/unit/dialog/methods.js b/tests/unit/dialog/methods.js
index a730350b150..acb0f885a1f 100644
--- a/tests/unit/dialog/methods.js
+++ b/tests/unit/dialog/methods.js
@@ -3,37 +3,37 @@ define( [
 	"ui/widgets/dialog"
 ], function( $ ) {
 
-module("dialog: methods", {
+module( "dialog: methods", {
 	teardown: function() {
-		$("body>.ui-dialog").remove();
+		$( "body>.ui-dialog" ).remove();
 	}
-});
+} );
 
-test("init", function() {
-	expect(6);
+test( "init", function() {
+	expect( 6 );
 
-	$("<div></div>").appendTo("body").dialog().remove();
-	ok(true, ".dialog() called on element");
+	$( "<div></div>" ).appendTo( "body" ).dialog().remove();
+	ok( true, ".dialog() called on element" );
 
-	$([]).dialog().remove();
-	ok(true, ".dialog() called on empty collection");
+	$( [] ).dialog().remove();
+	ok( true, ".dialog() called on empty collection" );
 
-	$("<div></div>").dialog().remove();
-	ok(true, ".dialog() called on disconnected DOMElement - never connected");
+	$( "<div></div>" ).dialog().remove();
+	ok( true, ".dialog() called on disconnected DOMElement - never connected" );
 
-	$("<div></div>").appendTo("body").remove().dialog().remove();
-	ok(true, ".dialog() called on disconnected DOMElement - removed");
+	$( "<div></div>" ).appendTo( "body" ).remove().dialog().remove();
+	ok( true, ".dialog() called on disconnected DOMElement - removed" );
 
-	var element = $("<div></div>").dialog();
-	element.dialog("option", "foo");
+	var element = $( "<div></div>" ).dialog();
+	element.dialog( "option", "foo" );
 	element.remove();
-	ok(true, "arbitrary option getter after init");
+	ok( true, "arbitrary option getter after init" );
 
-	$("<div></div>").dialog().dialog("option", "foo", "bar").remove();
-	ok(true, "arbitrary option setter after init");
-});
+	$( "<div></div>" ).dialog().dialog( "option", "foo", "bar" ).remove();
+	ok( true, "arbitrary option setter after init" );
+} );
 
-test("destroy", function( assert ) {
+test( "destroy", function( assert ) {
 	expect( 17 );
 
 	var element, element2;
@@ -43,30 +43,30 @@ test("destroy", function( assert ) {
 		var dialog = $( "#dialog1" ).dialog().dialog( "destroy" );
 		equal( dialog.parent()[ 0 ], $( "#qunit-fixture" )[ 0 ] );
 		equal( dialog.index(), 0 );
-	});
+	} );
 	assert.domEqual( "#form-dialog", function() {
 		var dialog = $( "#form-dialog" ).dialog().dialog( "destroy" );
 		equal( dialog.parent()[ 0 ], $( "#qunit-fixture" )[ 0 ] );
 		equal( dialog.index(), 2 );
-	});
+	} );
 
 	// Ensure dimensions are restored (#8119)
-	$( "#dialog1" ).show().css({
+	$( "#dialog1" ).show().css( {
 		width: "400px",
 		minHeight: "100px",
 		height: "200px"
-	});
+	} );
 	assert.domEqual( "#dialog1", function() {
 		$( "#dialog1" ).dialog().dialog( "destroy" );
-	});
+	} );
 
 	// Don't throw errors when destroying a never opened modal dialog (#9004)
-	$( "#dialog1" ).dialog({ autoOpen: false, modal: true }).dialog( "destroy" );
+	$( "#dialog1" ).dialog( { autoOpen: false, modal: true } ).dialog( "destroy" );
 	equal( $( ".ui-widget-overlay" ).length, 0, "overlay does not exist" );
-	equal( $( document ).data( "ui-dialog-overlays" ), undefined, "ui-dialog-overlays equals the number of open overlays");
+	equal( $( document ).data( "ui-dialog-overlays" ), undefined, "ui-dialog-overlays equals the number of open overlays" );
 
-	element = $( "#dialog1" ).dialog({ modal: true }),
-	element2 = $( "#dialog2" ).dialog({ modal: true });
+	element = $( "#dialog1" ).dialog( { modal: true } ),
+	element2 = $( "#dialog2" ).dialog( { modal: true } );
 	equal( $( ".ui-widget-overlay" ).length, 2, "overlays created when dialogs are open" );
 	equal( $( document ).data( "ui-dialog-overlays" ), 2, "ui-dialog-overlays equals the number of open overlays" );
 	element.dialog( "close" );
@@ -78,147 +78,147 @@ test("destroy", function( assert ) {
 	element2.dialog( "destroy" );
 	equal( $( ".ui-widget-overlay" ).length, 0, "overlays removed when all dialogs are destoryed" );
 	equal( $( document ).data( "ui-dialog-overlays" ), undefined, "ui-dialog-overlays equals the number of open overlays" );
-});
+} );
 
-asyncTest("#9000: Dialog leaves broken event handler after close/destroy in certain cases", function() {
+asyncTest( "#9000: Dialog leaves broken event handler after close/destroy in certain cases", function() {
 	expect( 1 );
-	$( "#dialog1" ).dialog({ modal:true }).dialog( "close" ).dialog( "destroy" );
-	setTimeout(function() {
+	$( "#dialog1" ).dialog( { modal:true } ).dialog( "close" ).dialog( "destroy" );
+	setTimeout( function() {
 		$( "#favorite-animal" ).trigger( "focus" );
 		ok( true, "close and destroy modal dialog before its really opened" );
 		start();
-	});
-});
+	} );
+} );
 
-test("#4980: Destroy should place element back in original DOM position", function(){
+test( "#4980: Destroy should place element back in original DOM position", function() {
 	expect( 2 );
-	var container = $("<div id='container'><div id='modal'>Content</div></div>"),
-		modal = container.find("#modal");
+	var container = $( "<div id='container'><div id='modal'>Content</div></div>" ),
+		modal = container.find( "#modal" );
 	modal.dialog();
-	ok(!$.contains(container[0], modal[0]), "dialog should move modal element to outside container element");
-	modal.dialog("destroy");
-	ok($.contains(container[0], modal[0]), "dialog(destroy) should place element back in original DOM position");
-});
+	ok( !$.contains( container[ 0 ], modal[ 0 ] ), "dialog should move modal element to outside container element" );
+	modal.dialog( "destroy" );
+	ok( $.contains( container[ 0 ], modal[ 0 ] ), "dialog(destroy) should place element back in original DOM position" );
+} );
 
 test( "enable/disable disabled", function( assert ) {
 	expect( 3 );
 	var element = $( "<div></div>" ).dialog();
 	element.dialog( "disable" );
-	equal(element.dialog( "option", "disabled" ), false, "disable method doesn't do anything" );
+	equal( element.dialog( "option", "disabled" ), false, "disable method doesn't do anything" );
 	assert.lacksClasses( element, "ui-dialog-disabled ui-state-disabled", "disable method doesn't add classes" );
 	ok( !element.dialog( "widget" ).attr( "aria-disabled" ), "disable method doesn't add aria-disabled" );
-});
+} );
 
-test("close", function() {
+test( "close", function() {
 	expect( 3 );
 
 	var element,
-		expected = $("<div></div>").dialog(),
-		actual = expected.dialog("close");
-	equal(actual, expected, "close is chainable");
-
-	element = $("<div></div>").dialog();
-	ok(element.dialog("widget").is(":visible") && !element.dialog("widget").is(":hidden"), "dialog visible before close method called");
-	element.dialog("close");
-	ok(element.dialog("widget").is(":hidden") && !element.dialog("widget").is(":visible"), "dialog hidden after close method called");
-});
-
-test("isOpen", function() {
-	expect(4);
-
-	var element = $("<div></div>").dialog();
-	equal(element.dialog("isOpen"), true, "dialog is open after init");
-	element.dialog("close");
-	equal(element.dialog("isOpen"), false, "dialog is closed");
+		expected = $( "<div></div>" ).dialog(),
+		actual = expected.dialog( "close" );
+	equal( actual, expected, "close is chainable" );
+
+	element = $( "<div></div>" ).dialog();
+	ok( element.dialog( "widget" ).is( ":visible" ) && !element.dialog( "widget" ).is( ":hidden" ), "dialog visible before close method called" );
+	element.dialog( "close" );
+	ok( element.dialog( "widget" ).is( ":hidden" ) && !element.dialog( "widget" ).is( ":visible" ), "dialog hidden after close method called" );
+} );
+
+test( "isOpen", function() {
+	expect( 4 );
+
+	var element = $( "<div></div>" ).dialog();
+	equal( element.dialog( "isOpen" ), true, "dialog is open after init" );
+	element.dialog( "close" );
+	equal( element.dialog( "isOpen" ), false, "dialog is closed" );
 	element.remove();
 
-	element = $("<div></div>").dialog({autoOpen: false});
-	equal(element.dialog("isOpen"), false, "dialog is closed after init");
-	element.dialog("open");
-	equal(element.dialog("isOpen"), true, "dialog is open");
+	element = $( "<div></div>" ).dialog( { autoOpen: false } );
+	equal( element.dialog( "isOpen" ), false, "dialog is closed after init" );
+	element.dialog( "open" );
+	equal( element.dialog( "isOpen" ), true, "dialog is open" );
 	element.remove();
-});
+} );
 
-test("moveToTop", function() {
+test( "moveToTop", function() {
 	expect( 5 );
 	function order() {
-		var actual = $( ".ui-dialog" ).map(function() {
+		var actual = $( ".ui-dialog" ).map( function() {
 			return +$( this ).css( "z-index" );
-		}).get();
+		} ).get();
 		deepEqual( actual, $.makeArray( arguments ) );
 	}
 	var dialog1, dialog2,
 		focusOn = "dialog1";
-	dialog1 = $( "#dialog1" ).dialog({
+	dialog1 = $( "#dialog1" ).dialog( {
 		focus: function() {
 			equal( focusOn, "dialog1" );
 		}
-	});
+	} );
 	focusOn = "dialog2";
-	dialog2 = $( "#dialog2" ).dialog({
+	dialog2 = $( "#dialog2" ).dialog( {
 		focus: function() {
 			equal( focusOn, "dialog2" );
 		}
-	});
+	} );
 	order( 100, 101 );
 	focusOn = "dialog1";
 	dialog1.dialog( "moveToTop" );
 	order( 102, 101 );
-});
+} );
 
 test( "moveToTop: content scroll stays intact", function() {
 	expect( 2 );
 	var otherDialog = $( "#dialog1" ).dialog(),
-		scrollDialog = $( "#form-dialog" ).dialog({
+		scrollDialog = $( "#form-dialog" ).dialog( {
 			height: 200
-		});
+		} );
 	scrollDialog.scrollTop( 50 );
 	equal( scrollDialog.scrollTop(), 50 );
 
 	otherDialog.dialog( "moveToTop" );
 	equal( scrollDialog.scrollTop(), 50 );
-});
+} );
 
-test("open", function() {
+test( "open", function() {
 	expect( 3 );
 	var element,
-		expected = $("<div></div>").dialog(),
-		actual = expected.dialog("open");
-	equal(actual, expected, "open is chainable");
-
-	element = $("<div></div>").dialog({ autoOpen: false });
-	ok(element.dialog("widget").is(":hidden") && !element.dialog("widget").is(":visible"), "dialog hidden before open method called");
-	element.dialog("open");
-	ok(element.dialog("widget").is(":visible") && !element.dialog("widget").is(":hidden"), "dialog visible after open method called");
-});
+		expected = $( "<div></div>" ).dialog(),
+		actual = expected.dialog( "open" );
+	equal( actual, expected, "open is chainable" );
+
+	element = $( "<div></div>" ).dialog( { autoOpen: false } );
+	ok( element.dialog( "widget" ).is( ":hidden" ) && !element.dialog( "widget" ).is( ":visible" ), "dialog hidden before open method called" );
+	element.dialog( "open" );
+	ok( element.dialog( "widget" ).is( ":visible" ) && !element.dialog( "widget" ).is( ":hidden" ), "dialog visible after open method called" );
+} );
 
 // http://bugs.jqueryui.com/ticket/6137
-test("Ensure form elements don't reset when opening a dialog", function() {
-	expect(2);
+test( "Ensure form elements don't reset when opening a dialog", function() {
+	expect( 2 );
 
-	var d1 = $("<form><input type='radio' name='radio' id='a' value='a' checked='checked'></input>" +
-				"<input type='radio' name='radio' id='b' value='b'>b</input></form>").appendTo( "body" ).dialog({autoOpen: false});
+	var d1 = $( "<form><input type='radio' name='radio' id='a' value='a' checked='checked'></input>" +
+				"<input type='radio' name='radio' id='b' value='b'>b</input></form>" ).appendTo( "body" ).dialog( { autoOpen: false } );
 
-	d1.find("#b").prop( "checked", true );
-	equal(d1.find("input:checked").val(), "b", "checkbox b is checked");
+	d1.find( "#b" ).prop( "checked", true );
+	equal( d1.find( "input:checked" ).val(), "b", "checkbox b is checked" );
 
-	d1.dialog("open");
-	equal(d1.find("input:checked").val(), "b", "checkbox b is checked");
+	d1.dialog( "open" );
+	equal( d1.find( "input:checked" ).val(), "b", "checkbox b is checked" );
 
 	d1.remove();
-});
+} );
 
 asyncTest( "#8958: dialog can be opened while opening", function() {
 	expect( 1 );
 
-	var element = $( "<div>" ).dialog({
+	var element = $( "<div>" ).dialog( {
 		autoOpen: false,
 		modal: true,
 		open: function() {
 			equal( $( ".ui-widget-overlay" ).length, 1 );
 			start();
 		}
-	});
+	} );
 
 	// Support: IE8
 	// For some reason the #favorite-color input doesn't get focus if we don't
@@ -226,42 +226,44 @@ asyncTest( "#8958: dialog can be opened while opening", function() {
 	$( "body" ).trigger( "focus" );
 
 	$( "#favorite-animal" )
+
 		// We focus the input to start the test. Once it receives focus, the
 		// dialog will open. Opening the dialog, will cause an element inside
 		// the dialog to gain focus, thus blurring the input.
 		.on( "focus", function() {
 			element.dialog( "open" );
-		})
+		} )
+
 		// When the input blurs, the dialog is in the process of opening. We
 		// try to open the dialog again, to make sure that dialogs properly
 		// handle a call to the open() method during the process of the dialog
 		// being opened.
 		.on( "blur", function() {
 			element.dialog( "open" );
-		})
+		} )
 		.trigger( "focus" );
-});
+} );
 
-test("#5531: dialog width should be at least minWidth on creation", function () {
+test( "#5531: dialog width should be at least minWidth on creation", function() {
 	expect( 4 );
-	var element = $("<div></div>").dialog({
+	var element = $( "<div></div>" ).dialog( {
 			width: 200,
 			minWidth: 300
-		});
+		} );
 
-	equal(element.dialog("option", "width"), 300, "width is minWidth");
-	element.dialog("option", "width", 200);
-	equal(element.dialog("option", "width"), 300, "width unchanged when set to < minWidth");
-	element.dialog("option", "width", 320);
-	equal(element.dialog("option", "width"), 320, "width changed if set to > minWidth");
+	equal( element.dialog( "option", "width" ), 300, "width is minWidth" );
+	element.dialog( "option", "width", 200 );
+	equal( element.dialog( "option", "width" ), 300, "width unchanged when set to < minWidth" );
+	element.dialog( "option", "width", 320 );
+	equal( element.dialog( "option", "width" ), 320, "width changed if set to > minWidth" );
 	element.remove();
 
-	element = $("<div></div>").dialog({
+	element = $( "<div></div>" ).dialog( {
 			minWidth: 300
-		});
-	ok(element.dialog("option", "width") >=  300, "width is at least 300");
+		} );
+	ok( element.dialog( "option", "width" ) >=  300, "width is at least 300" );
 	element.remove();
 
-});
+} );
 
 } );
diff --git a/tests/unit/dialog/options.js b/tests/unit/dialog/options.js
index aa659f04178..7565799c4ac 100644
--- a/tests/unit/dialog/options.js
+++ b/tests/unit/dialog/options.js
@@ -6,155 +6,155 @@ define( [
 	"ui/effects/effect-explode"
 ], function( $, testHelper ) {
 
-module("dialog: options");
+module( "dialog: options" );
 
 test( "appendTo", function() {
 	expect( 16 );
 	var detached = $( "<div>" ),
-		element = $( "#dialog1" ).dialog({
+		element = $( "#dialog1" ).dialog( {
 			modal: true
-		});
-	equal( element.dialog( "widget" ).parent()[0], document.body, "defaults to body" );
-	equal( $( ".ui-widget-overlay" ).parent()[0], document.body, "overlay defaults to body" );
+		} );
+	equal( element.dialog( "widget" ).parent()[ 0 ], document.body, "defaults to body" );
+	equal( $( ".ui-widget-overlay" ).parent()[ 0 ], document.body, "overlay defaults to body" );
 	element.dialog( "destroy" );
 
-	element.dialog({
+	element.dialog( {
 		appendTo: ".wrap",
 		modal: true
-	});
-	equal( element.dialog( "widget" ).parent()[0], $( "#wrap1" )[0], "first found element" );
-	equal( $( ".ui-widget-overlay" ).parent()[0], $( "#wrap1" )[0], "overlay first found element" );
+	} );
+	equal( element.dialog( "widget" ).parent()[ 0 ], $( "#wrap1" )[ 0 ], "first found element" );
+	equal( $( ".ui-widget-overlay" ).parent()[ 0 ], $( "#wrap1" )[ 0 ], "overlay first found element" );
 	equal( $( "#wrap2 .ui-dialog" ).length, 0, "only appends to one element" );
 	equal( $( "#wrap2 .ui-widget-overlay" ).length, 0, "overlay only appends to one element" );
 	element.dialog( "destroy" );
 
-	element.dialog({
+	element.dialog( {
 		appendTo: null,
 		modal: true
-	});
-	equal( element.dialog( "widget" ).parent()[0], document.body, "null" );
-	equal( $( ".ui-widget-overlay" ).parent()[0], document.body, "overlay null" );
+	} );
+	equal( element.dialog( "widget" ).parent()[ 0 ], document.body, "null" );
+	equal( $( ".ui-widget-overlay" ).parent()[ 0 ], document.body, "overlay null" );
 	element.dialog( "destroy" );
 
-	element.dialog({
+	element.dialog( {
 		autoOpen: false,
 		modal: true
-	}).dialog( "option", "appendTo", "#wrap1" ).dialog( "open" );
-	equal( element.dialog( "widget" ).parent()[0], $( "#wrap1" )[0], "modified after init" );
-	equal( $( ".ui-widget-overlay" ).parent()[0], $( "#wrap1" )[0], "overlay modified after init" );
+	} ).dialog( "option", "appendTo", "#wrap1" ).dialog( "open" );
+	equal( element.dialog( "widget" ).parent()[ 0 ], $( "#wrap1" )[ 0 ], "modified after init" );
+	equal( $( ".ui-widget-overlay" ).parent()[ 0 ], $( "#wrap1" )[ 0 ], "overlay modified after init" );
 	element.dialog( "destroy" );
 
-	element.dialog({
+	element.dialog( {
 		appendTo: detached,
 		modal: true
-	});
-	equal( element.dialog( "widget" ).parent()[0], detached[0], "detached jQuery object" );
-	equal( detached.find( ".ui-widget-overlay" ).parent()[0], detached[0], "overlay detached jQuery object" );
+	} );
+	equal( element.dialog( "widget" ).parent()[ 0 ], detached[ 0 ], "detached jQuery object" );
+	equal( detached.find( ".ui-widget-overlay" ).parent()[ 0 ], detached[ 0 ], "overlay detached jQuery object" );
 	element.dialog( "destroy" );
 
-	element.dialog({
-		appendTo: detached[0],
+	element.dialog( {
+		appendTo: detached[ 0 ],
 		modal: true
-	});
-	equal( element.dialog( "widget" ).parent()[0], detached[0], "detached DOM element" );
-	equal( detached.find( ".ui-widget-overlay" ).parent()[0], detached[0], "overlay detached DOM element" );
+	} );
+	equal( element.dialog( "widget" ).parent()[ 0 ], detached[ 0 ], "detached DOM element" );
+	equal( detached.find( ".ui-widget-overlay" ).parent()[ 0 ], detached[ 0 ], "overlay detached DOM element" );
 	element.dialog( "destroy" );
 
-	element.dialog({
+	element.dialog( {
 		autoOpen: false,
 		modal: true
-	}).dialog( "option", "appendTo", detached );
-	equal( element.dialog( "widget" ).parent()[0], detached[0], "detached DOM element via option()" );
+	} ).dialog( "option", "appendTo", detached );
+	equal( element.dialog( "widget" ).parent()[ 0 ], detached[ 0 ], "detached DOM element via option()" );
 	equal( detached.find( ".ui-widget-overlay" ).length, 0, "overlay detached DOM element via option()" );
 	element.dialog( "destroy" );
-});
+} );
 
-test("autoOpen", function() {
-	expect(2);
+test( "autoOpen", function() {
+	expect( 2 );
 
-	var element = $("<div></div>").dialog({ autoOpen: false });
-	ok( !element.dialog("widget").is(":visible"), ".dialog({ autoOpen: false })");
+	var element = $( "<div></div>" ).dialog( { autoOpen: false } );
+	ok( !element.dialog( "widget" ).is( ":visible" ), ".dialog({ autoOpen: false })" );
 	element.remove();
 
-	element = $("<div></div>").dialog({ autoOpen: true });
-	ok( element.dialog("widget").is(":visible"), ".dialog({ autoOpen: true })");
+	element = $( "<div></div>" ).dialog( { autoOpen: true } );
+	ok( element.dialog( "widget" ).is( ":visible" ), ".dialog({ autoOpen: true })" );
 	element.remove();
-});
+} );
 
-test("buttons", function( assert ) {
-	expect(21);
+test( "buttons", function( assert ) {
+	expect( 21 );
 
 	var btn, i, newButtons,
 		buttons = {
 			"Ok": function( ev ) {
-				ok(true, "button click fires callback");
-				equal(this, element[0], "context of callback");
-				equal(ev.target, btn[0], "event target");
+				ok( true, "button click fires callback" );
+				equal( this, element[ 0 ], "context of callback" );
+				equal( ev.target, btn[ 0 ], "event target" );
 			},
 			"Cancel": function( ev ) {
-				ok(true, "button click fires callback");
-				equal(this, element[0], "context of callback");
-				equal(ev.target, btn[1], "event target");
+				ok( true, "button click fires callback" );
+				equal( this, element[ 0 ], "context of callback" );
+				equal( ev.target, btn[ 1 ], "event target" );
 			}
 		},
-		element = $("<div></div>").dialog({ buttons: buttons });
+		element = $( "<div></div>" ).dialog( { buttons: buttons } );
 
 	btn = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
-	equal(btn.length, 2, "number of buttons");
+	equal( btn.length, 2, "number of buttons" );
 
 	i = 0;
-	$.each(buttons, function( key ) {
-		equal(btn.eq(i).text(), key, "text of button " + (i+1));
+	$.each( buttons, function( key ) {
+		equal( btn.eq( i ).text(), key, "text of button " + ( i + 1 ) );
 		i++;
-	});
+	} );
 
 	assert.hasClasses( btn.parent(), "ui-dialog-buttonset" );
 	assert.hasClasses( element.parent(), "ui-dialog-buttons" );
 
-	btn.trigger("click");
+	btn.trigger( "click" );
 
 	newButtons = {
 		"Close": function( ev ) {
-			ok(true, "button click fires callback");
-			equal(this, element[0], "context of callback");
-			equal(ev.target, btn[0], "event target");
+			ok( true, "button click fires callback" );
+			equal( this, element[ 0 ], "context of callback" );
+			equal( ev.target, btn[ 0 ], "event target" );
 		}
 	};
 
-	deepEqual(element.dialog("option", "buttons"), buttons, ".dialog('option', 'buttons') getter");
-	element.dialog("option", "buttons", newButtons);
-	deepEqual(element.dialog("option", "buttons"), newButtons, ".dialog('option', 'buttons', ...) setter");
+	deepEqual( element.dialog( "option", "buttons" ), buttons, ".dialog('option', 'buttons') getter" );
+	element.dialog( "option", "buttons", newButtons );
+	deepEqual( element.dialog( "option", "buttons" ), newButtons, ".dialog('option', 'buttons', ...) setter" );
 
 	btn = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
-	equal(btn.length, 1, "number of buttons after setter");
-	btn.trigger("click");
+	equal( btn.length, 1, "number of buttons after setter" );
+	btn.trigger( "click" );
 
 	i = 0;
-	$.each(newButtons, function( key ) {
-		equal(btn.eq(i).text(), key, "text of button " + (i+1));
+	$.each( newButtons, function( key ) {
+		equal( btn.eq( i ).text(), key, "text of button " + ( i + 1 ) );
 		i += 1;
-	});
+	} );
 
-	element.dialog("option", "buttons", null);
+	element.dialog( "option", "buttons", null );
 	btn = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
-	equal(btn.length, 0, "all buttons have been removed");
-	equal(element.find(".ui-dialog-buttonset").length, 0, "buttonset has been removed");
+	equal( btn.length, 0, "all buttons have been removed" );
+	equal( element.find( ".ui-dialog-buttonset" ).length, 0, "buttonset has been removed" );
 	assert.lacksClasses( element.parent(), "ui-dialog-buttons" );
 	element.remove();
-});
+} );
 
-test("buttons - advanced", function( assert ) {
+test( "buttons - advanced", function( assert ) {
 	expect( 7 );
 
 	var buttons,
-		element = $("<div></div>").dialog({
+		element = $( "<div></div>" ).dialog( {
 			buttons: [
 				{
 					text: "a button",
 					"class": "additional-class",
 					id: "my-button-id",
 					click: function() {
-						equal(this, element[0], "correct context");
+						equal( this, element[ 0 ], "correct context" );
 					},
 					icons: {
 						primary: "ui-icon-cancel"
@@ -162,21 +162,21 @@ test("buttons - advanced", function( assert ) {
 					showText: false
 				}
 			]
-		});
+		} );
 
 	buttons = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
-	equal(buttons.length, 1, "correct number of buttons");
-	equal(buttons.attr("id"), "my-button-id", "correct id");
-	equal(buttons.text(), "a button", "correct label");
+	equal( buttons.length, 1, "correct number of buttons" );
+	equal( buttons.attr( "id" ), "my-button-id", "correct id" );
+	equal( buttons.text(), "a button", "correct label" );
 	assert.hasClasses( buttons, "additional-class" );
-	deepEqual( buttons.button("option", "icons"), { primary: "ui-icon-cancel", secondary: null } );
+	deepEqual( buttons.button( "option", "icons" ), { primary: "ui-icon-cancel", secondary: null } );
 	equal( buttons.button( "option", "text" ), false );
 	buttons.trigger( "click" );
 
 	element.remove();
-});
+} );
 
-test("#9043: buttons with Array.prototype modification", function() {
+test( "#9043: buttons with Array.prototype modification", function() {
 	expect( 1 );
 	Array.prototype.test = $.noop;
 	var element = $( "<div></div>" ).dialog();
@@ -184,162 +184,162 @@ test("#9043: buttons with Array.prototype modification", function() {
 		"no button pane" );
 	element.remove();
 	delete Array.prototype.test;
-});
+} );
 
-test("closeOnEscape", function() {
+test( "closeOnEscape", function() {
 	expect( 6 );
-	var element = $("<div></div>").dialog({ closeOnEscape: false });
-	ok(true, "closeOnEscape: false");
-	ok(element.dialog("widget").is(":visible") && !element.dialog("widget").is(":hidden"), "dialog is open before ESC");
-	element.simulate("keydown", { keyCode: $.ui.keyCode.ESCAPE })
-		.simulate("keypress", { keyCode: $.ui.keyCode.ESCAPE })
-		.simulate("keyup", { keyCode: $.ui.keyCode.ESCAPE });
-	ok(element.dialog("widget").is(":visible") && !element.dialog("widget").is(":hidden"), "dialog is open after ESC");
-
-	element.remove();
-
-	element = $("<div></div>").dialog({ closeOnEscape: true });
-	ok(true, "closeOnEscape: true");
-	ok(element.dialog("widget").is(":visible") && !element.dialog("widget").is(":hidden"), "dialog is open before ESC");
-	element.simulate("keydown", { keyCode: $.ui.keyCode.ESCAPE })
-		.simulate("keypress", { keyCode: $.ui.keyCode.ESCAPE })
-		.simulate("keyup", { keyCode: $.ui.keyCode.ESCAPE });
-	ok(element.dialog("widget").is(":hidden") && !element.dialog("widget").is(":visible"), "dialog is closed after ESC");
-});
+	var element = $( "<div></div>" ).dialog( { closeOnEscape: false } );
+	ok( true, "closeOnEscape: false" );
+	ok( element.dialog( "widget" ).is( ":visible" ) && !element.dialog( "widget" ).is( ":hidden" ), "dialog is open before ESC" );
+	element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } )
+		.simulate( "keypress", { keyCode: $.ui.keyCode.ESCAPE } )
+		.simulate( "keyup", { keyCode: $.ui.keyCode.ESCAPE } );
+	ok( element.dialog( "widget" ).is( ":visible" ) && !element.dialog( "widget" ).is( ":hidden" ), "dialog is open after ESC" );
+
+	element.remove();
+
+	element = $( "<div></div>" ).dialog( { closeOnEscape: true } );
+	ok( true, "closeOnEscape: true" );
+	ok( element.dialog( "widget" ).is( ":visible" ) && !element.dialog( "widget" ).is( ":hidden" ), "dialog is open before ESC" );
+	element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } )
+		.simulate( "keypress", { keyCode: $.ui.keyCode.ESCAPE } )
+		.simulate( "keyup", { keyCode: $.ui.keyCode.ESCAPE } );
+	ok( element.dialog( "widget" ).is( ":hidden" ) && !element.dialog( "widget" ).is( ":visible" ), "dialog is closed after ESC" );
+} );
 
-test("closeText", function() {
-	expect(3);
+test( "closeText", function() {
+	expect( 3 );
 
-	var element = $("<div></div>").dialog();
-		equal(element.dialog("widget").find(".ui-dialog-titlebar-close span").text(), "Close",
-			"default close text");
+	var element = $( "<div></div>" ).dialog();
+		equal( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close span" ).text(), "Close",
+			"default close text" );
 	element.remove();
 
-	element = $("<div></div>").dialog({ closeText: "foo" });
-		equal(element.dialog("widget").find(".ui-dialog-titlebar-close span").text(), "foo",
-			"closeText on init");
+	element = $( "<div></div>" ).dialog( { closeText: "foo" } );
+		equal( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close span" ).text(), "foo",
+			"closeText on init" );
 	element.remove();
 
-	element = $("<div></div>").dialog().dialog("option", "closeText", "bar");
-		equal(element.dialog("widget").find(".ui-dialog-titlebar-close span").text(), "bar",
-			"closeText via option method");
+	element = $( "<div></div>" ).dialog().dialog( "option", "closeText", "bar" );
+		equal( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close span" ).text(), "bar",
+			"closeText via option method" );
 	element.remove();
-});
+} );
 
-test("draggable", function() {
-	expect(4);
+test( "draggable", function() {
+	expect( 4 );
 
-	var element = $("<div></div>").dialog({ draggable: false });
+	var element = $( "<div></div>" ).dialog( { draggable: false } );
 
-		testHelper.testDrag(element, 50, -50, 0, 0);
-		element.dialog("option", "draggable", true);
-		testHelper.testDrag(element, 50, -50, 50, -50);
+		testHelper.testDrag( element, 50, -50, 0, 0 );
+		element.dialog( "option", "draggable", true );
+		testHelper.testDrag( element, 50, -50, 50, -50 );
 	element.remove();
 
-	element = $("<div></div>").dialog({ draggable: true });
-		testHelper.testDrag(element, 50, -50, 50, -50);
-		element.dialog("option", "draggable", false);
-		testHelper.testDrag(element, 50, -50, 0, 0);
+	element = $( "<div></div>" ).dialog( { draggable: true } );
+		testHelper.testDrag( element, 50, -50, 50, -50 );
+		element.dialog( "option", "draggable", false );
+		testHelper.testDrag( element, 50, -50, 0, 0 );
 	element.remove();
-});
+} );
 
-test("height", function() {
-	expect(4);
+test( "height", function() {
+	expect( 4 );
 
-	var element = $("<div></div>").dialog();
-		equal(element.dialog("widget").outerHeight(), 150, "default height");
+	var element = $( "<div></div>" ).dialog();
+		equal( element.dialog( "widget" ).outerHeight(), 150, "default height" );
 	element.remove();
 
-	element = $("<div></div>").dialog({ height: 237 });
-		equal(element.dialog("widget").outerHeight(), 237, "explicit height");
+	element = $( "<div></div>" ).dialog( { height: 237 } );
+		equal( element.dialog( "widget" ).outerHeight(), 237, "explicit height" );
 	element.remove();
 
-	element = $("<div></div>").dialog();
-		element.dialog("option", "height", 238);
-		equal(element.dialog("widget").outerHeight(), 238, "explicit height set after init");
+	element = $( "<div></div>" ).dialog();
+		element.dialog( "option", "height", 238 );
+		equal( element.dialog( "widget" ).outerHeight(), 238, "explicit height set after init" );
 	element.remove();
 
-	element = $("<div></div>").css("padding", "20px")
-		.dialog({ height: 240 });
-		equal(element.dialog("widget").outerHeight(), 240, "explicit height with padding");
+	element = $( "<div></div>" ).css( "padding", "20px" )
+		.dialog( { height: 240 } );
+		equal( element.dialog( "widget" ).outerHeight(), 240, "explicit height with padding" );
 	element.remove();
-});
+} );
 
-test("maxHeight", function( assert ) {
-	expect(3);
+test( "maxHeight", function( assert ) {
+	expect( 3 );
 
-	var element = $("<div></div>").dialog({ maxHeight: 200 });
-		testHelper.drag(element, ".ui-resizable-s", 1000, 1000);
-		assert.close(element.dialog("widget").height(), 200, 1, "maxHeight");
+	var element = $( "<div></div>" ).dialog( { maxHeight: 200 } );
+		testHelper.drag( element, ".ui-resizable-s", 1000, 1000 );
+		assert.close( element.dialog( "widget" ).height(), 200, 1, "maxHeight" );
 	element.remove();
 
-	element = $("<div></div>").dialog({ maxHeight: 200 });
-		testHelper.drag(element, ".ui-resizable-n", -1000, -1000);
-		assert.close(element.dialog("widget").height(), 200, 1, "maxHeight");
+	element = $( "<div></div>" ).dialog( { maxHeight: 200 } );
+		testHelper.drag( element, ".ui-resizable-n", -1000, -1000 );
+		assert.close( element.dialog( "widget" ).height(), 200, 1, "maxHeight" );
 	element.remove();
 
-	element = $("<div></div>").dialog({ maxHeight: 200 }).dialog("option", "maxHeight", 300);
-		testHelper.drag(element, ".ui-resizable-s", 1000, 1000);
-		assert.close(element.dialog("widget").height(), 300, 1, "maxHeight");
+	element = $( "<div></div>" ).dialog( { maxHeight: 200 } ).dialog( "option", "maxHeight", 300 );
+		testHelper.drag( element, ".ui-resizable-s", 1000, 1000 );
+		assert.close( element.dialog( "widget" ).height(), 300, 1, "maxHeight" );
 	element.remove();
-});
+} );
 
-test("maxWidth", function( assert ) {
-	expect(3);
+test( "maxWidth", function( assert ) {
+	expect( 3 );
 
-	var element = $("<div></div>").dialog({ maxWidth: 200 });
-		testHelper.drag(element, ".ui-resizable-e", 1000, 1000);
-		assert.close(element.dialog("widget").width(), 200, 1, "maxWidth");
+	var element = $( "<div></div>" ).dialog( { maxWidth: 200 } );
+		testHelper.drag( element, ".ui-resizable-e", 1000, 1000 );
+		assert.close( element.dialog( "widget" ).width(), 200, 1, "maxWidth" );
 	element.remove();
 
-	element = $("<div></div>").dialog({ maxWidth: 200 });
-		testHelper.drag(element, ".ui-resizable-w", -1000, -1000);
-		assert.close(element.dialog("widget").width(), 200, 1, "maxWidth");
+	element = $( "<div></div>" ).dialog( { maxWidth: 200 } );
+		testHelper.drag( element, ".ui-resizable-w", -1000, -1000 );
+		assert.close( element.dialog( "widget" ).width(), 200, 1, "maxWidth" );
 	element.remove();
 
-	element = $("<div></div>").dialog({ maxWidth: 200 }).dialog("option", "maxWidth", 300);
-		testHelper.drag(element, ".ui-resizable-w", -1000, -1000);
-		assert.close(element.dialog("widget").width(), 300, 1, "maxWidth");
+	element = $( "<div></div>" ).dialog( { maxWidth: 200 } ).dialog( "option", "maxWidth", 300 );
+		testHelper.drag( element, ".ui-resizable-w", -1000, -1000 );
+		assert.close( element.dialog( "widget" ).width(), 300, 1, "maxWidth" );
 	element.remove();
-});
+} );
 
-test("minHeight", function( assert ) {
-	expect(3);
+test( "minHeight", function( assert ) {
+	expect( 3 );
 
-	var element = $("<div></div>").dialog({ minHeight: 10 });
-		testHelper.drag(element, ".ui-resizable-s", -1000, -1000);
-		assert.close(element.dialog("widget").height(), 10, 1, "minHeight");
+	var element = $( "<div></div>" ).dialog( { minHeight: 10 } );
+		testHelper.drag( element, ".ui-resizable-s", -1000, -1000 );
+		assert.close( element.dialog( "widget" ).height(), 10, 1, "minHeight" );
 	element.remove();
 
-	element = $("<div></div>").dialog({ minHeight: 10 });
-		testHelper.drag(element, ".ui-resizable-n", 1000, 1000);
-		assert.close(element.dialog("widget").height(), 10, 1, "minHeight");
+	element = $( "<div></div>" ).dialog( { minHeight: 10 } );
+		testHelper.drag( element, ".ui-resizable-n", 1000, 1000 );
+		assert.close( element.dialog( "widget" ).height(), 10, 1, "minHeight" );
 	element.remove();
 
-	element = $("<div></div>").dialog({ minHeight: 10 }).dialog("option", "minHeight", 30);
-		testHelper.drag(element, ".ui-resizable-n", 1000, 1000);
-		assert.close(element.dialog("widget").height(), 30, 1, "minHeight");
+	element = $( "<div></div>" ).dialog( { minHeight: 10 } ).dialog( "option", "minHeight", 30 );
+		testHelper.drag( element, ".ui-resizable-n", 1000, 1000 );
+		assert.close( element.dialog( "widget" ).height(), 30, 1, "minHeight" );
 	element.remove();
-});
+} );
 
-test("minWidth", function( assert ) {
-	expect(3);
+test( "minWidth", function( assert ) {
+	expect( 3 );
 
-	var element = $("<div></div>").dialog({ minWidth: 10 });
-		testHelper.drag(element, ".ui-resizable-e", -1000, -1000);
-		assert.close(element.dialog("widget").width(), 10, 1, "minWidth");
+	var element = $( "<div></div>" ).dialog( { minWidth: 10 } );
+		testHelper.drag( element, ".ui-resizable-e", -1000, -1000 );
+		assert.close( element.dialog( "widget" ).width(), 10, 1, "minWidth" );
 	element.remove();
 
-	element = $("<div></div>").dialog({ minWidth: 10 });
-		testHelper.drag(element, ".ui-resizable-w", 1000, 1000);
-		assert.close(element.dialog("widget").width(), 10, 1, "minWidth");
+	element = $( "<div></div>" ).dialog( { minWidth: 10 } );
+		testHelper.drag( element, ".ui-resizable-w", 1000, 1000 );
+		assert.close( element.dialog( "widget" ).width(), 10, 1, "minWidth" );
 	element.remove();
 
-	element = $("<div></div>").dialog({ minWidth: 30 }).dialog("option", "minWidth", 30);
-		testHelper.drag(element, ".ui-resizable-w", 1000, 1000);
-		assert.close(element.dialog("widget").width(), 30, 1, "minWidth");
+	element = $( "<div></div>" ).dialog( { minWidth: 30 } ).dialog( "option", "minWidth", 30 );
+		testHelper.drag( element, ".ui-resizable-w", 1000, 1000 );
+		assert.close( element.dialog( "widget" ).width(), 30, 1, "minWidth" );
 	element.remove();
-});
+} );
 
 test( "position, default center on window", function( assert ) {
 	expect( 2 );
@@ -349,13 +349,13 @@ test( "position, default center on window", function( assert ) {
 	// Support: Firefox
 	var winWidth = $( window ).width(),
 		winHeight = $( window ).height(),
-		element = $("<div></div>").dialog(),
-		dialog = element.dialog("widget"),
+		element = $( "<div></div>" ).dialog(),
+		dialog = element.dialog( "widget" ),
 		offset = dialog.offset();
 	assert.close( offset.left, Math.round( winWidth / 2 - dialog.outerWidth() / 2 ) + $( window ).scrollLeft(), 1, "dialog left position of center on window on initilization" );
 	assert.close( offset.top, Math.round( winHeight / 2 - dialog.outerHeight() / 2 ) + $( window ).scrollTop(), 1, "dialog top position of center on window on initilization" );
 	element.remove();
-});
+} );
 
 test( "position, right bottom at right bottom via ui.position args", function( assert ) {
 	expect( 2 );
@@ -365,51 +365,51 @@ test( "position, right bottom at right bottom via ui.position args", function( a
 	// Support: Firefox
 	var winWidth = $( window ).width(),
 		winHeight = $( window ).height(),
-		element = $("<div></div>").dialog({
+		element = $( "<div></div>" ).dialog( {
 			position: {
 				my: "right bottom",
 				at: "right bottom"
 			}
-		}),
-		dialog = element.dialog("widget"),
+		} ),
+		dialog = element.dialog( "widget" ),
 		offset = dialog.offset();
 
 	assert.close( offset.left, winWidth - dialog.outerWidth() + $( window ).scrollLeft(), 1, "dialog left position of right bottom at right bottom on initilization" );
 	assert.close( offset.top, winHeight - dialog.outerHeight() + $( window ).scrollTop(), 1, "dialog top position of right bottom at right bottom on initilization" );
 	element.remove();
-});
+} );
 
 test( "position, at another element", function( assert ) {
 	expect( 4 );
-	var parent = $("<div></div>").css({
+	var parent = $( "<div></div>" ).css( {
 			position: "absolute",
 			top: 400,
 			left: 600,
 			height: 10,
 			width: 10
-		}).appendTo("body"),
+		} ).appendTo( "body" ),
 
-		element = $("<div></div>").dialog({
+		element = $( "<div></div>" ).dialog( {
 			position: {
 				my: "left top",
 				at: "left top",
 				of: parent,
 				collision: "none"
 			}
-		}),
+		} ),
 
-		dialog = element.dialog("widget"),
+		dialog = element.dialog( "widget" ),
 		offset = dialog.offset();
 
 	assert.close( offset.left, 600, 1, "dialog left position at another element on initilization" );
 	assert.close( offset.top, 400, 1, "dialog top position at another element on initilization" );
 
-	element.dialog("option", "position", {
+	element.dialog( "option", "position", {
 			my: "left top",
 			at: "right bottom",
 			of: parent,
 			collision: "none"
-	});
+	} );
 
 	offset = dialog.offset();
 
@@ -418,32 +418,33 @@ test( "position, at another element", function( assert ) {
 
 	element.remove();
 	parent.remove();
-});
+} );
 
-test("resizable", function() {
-	expect(4);
+test( "resizable", function() {
+	expect( 4 );
 
-	var element = $("<div></div>").dialog();
-		testHelper.shouldResize(element, 50, 50, "[default]");
-		element.dialog("option", "resizable", false);
-		testHelper.shouldResize(element, 0, 0, "disabled after init");
+	var element = $( "<div></div>" ).dialog();
+		testHelper.shouldResize( element, 50, 50, "[default]" );
+		element.dialog( "option", "resizable", false );
+		testHelper.shouldResize( element, 0, 0, "disabled after init" );
 	element.remove();
 
-	element = $("<div></div>").dialog({ resizable: false });
-		testHelper.shouldResize(element, 0, 0, "disabled in init options");
-		element.dialog("option", "resizable", true);
-		testHelper.shouldResize(element, 50, 50, "enabled after init");
+	element = $( "<div></div>" ).dialog( { resizable: false } );
+		testHelper.shouldResize( element, 0, 0, "disabled in init options" );
+		element.dialog( "option", "resizable", true );
+		testHelper.shouldResize( element, 50, 50, "enabled after init" );
 	element.remove();
-});
+} );
 
 test( "title", function() {
 	expect( 11 );
 
 	function titleText() {
-		return element.dialog("widget").find( ".ui-dialog-title" ).html();
+		return element.dialog( "widget" ).find( ".ui-dialog-title" ).html();
 	}
 
 	var element = $( "<div></div>" ).dialog();
+
 		// some browsers return a non-breaking space and some return "&nbsp;"
 		// so we generate a non-breaking space for comparison
 		equal( titleText(), $( "<span>&#160;</span>" ).html(), "[default]" );
@@ -452,17 +453,17 @@ test( "title", function() {
 
 	element = $( "<div title='foo'>" ).dialog();
 		equal( titleText(), "foo", "title in element attribute" );
-		equal( element.dialog( "option", "title"), "foo", "option updated from attribute" );
+		equal( element.dialog( "option", "title" ), "foo", "option updated from attribute" );
 	element.remove();
 
-	element = $( "<div></div>" ).dialog({ title: "foo" });
+	element = $( "<div></div>" ).dialog( { title: "foo" } );
 		equal( titleText(), "foo", "title in init options" );
-		equal( element.dialog("option", "title"), "foo", "opiton set from options hash" );
+		equal( element.dialog( "option", "title" ), "foo", "opiton set from options hash" );
 	element.remove();
 
-	element = $( "<div title='foo'>" ).dialog({ title: "bar" });
+	element = $( "<div title='foo'>" ).dialog( { title: "bar" } );
 		equal( titleText(), "bar", "title in init options should override title in element attribute" );
-		equal( element.dialog("option", "title"), "bar", "opiton set from options hash" );
+		equal( element.dialog( "option", "title" ), "bar", "opiton set from options hash" );
 	element.remove();
 
 	element = $( "<div></div>" ).dialog().dialog( "option", "title", "foo" );
@@ -471,87 +472,88 @@ test( "title", function() {
 
 	// Make sure attroperties are properly ignored - #5742 - .attr() might return a DOMElement
 	element = $( "<form><input name='title'></form>" ).dialog();
+
 		// some browsers return a non-breaking space and some return "&nbsp;"
 		// so we get the text to normalize to the actual non-breaking space
 		equal( titleText(), $( "<span>&#160;</span>" ).html(), "[default]" );
 		equal( element.dialog( "option", "title" ), null, "option not changed" );
 	element.remove();
-});
+} );
 
-test("width", function( assert ) {
-	expect(3);
+test( "width", function( assert ) {
+	expect( 3 );
 
-	var element = $("<div></div>").dialog();
-		assert.close(element.dialog("widget").width(), 300, 1, "default width");
+	var element = $( "<div></div>" ).dialog();
+		assert.close( element.dialog( "widget" ).width(), 300, 1, "default width" );
 	element.remove();
 
-	element = $("<div></div>").dialog({width: 437 });
-		assert.close(element.dialog("widget").width(), 437, 1, "explicit width");
-		element.dialog("option", "width", 438);
-		assert.close(element.dialog("widget").width(), 438, 1, "explicit width after init");
+	element = $( "<div></div>" ).dialog( { width: 437 } );
+		assert.close( element.dialog( "widget" ).width(), 437, 1, "explicit width" );
+		element.dialog( "option", "width", 438 );
+		assert.close( element.dialog( "widget" ).width(), 438, 1, "explicit width after init" );
 	element.remove();
-});
+} );
 
-test("#4826: setting resizable false toggles resizable on dialog", function() {
-	expect(6);
+test( "#4826: setting resizable false toggles resizable on dialog", function() {
+	expect( 6 );
 	var i,
-		element = $("<div></div>").dialog({ resizable: false });
+		element = $( "<div></div>" ).dialog( { resizable: false } );
 
-	testHelper.shouldResize(element, 0, 0, "[default]");
-	for (i=0; i<2; i++) {
-		element.dialog("close").dialog("open");
-		testHelper.shouldResize(element, 0, 0, "initialized with resizable false toggle ("+ (i+1) +")");
+	testHelper.shouldResize( element, 0, 0, "[default]" );
+	for ( i = 0; i < 2; i++ ) {
+		element.dialog( "close" ).dialog( "open" );
+		testHelper.shouldResize( element, 0, 0, "initialized with resizable false toggle (" + ( i + 1 ) + ")" );
 	}
 	element.remove();
 
-	element = $("<div></div>").dialog({ resizable: true });
-	testHelper.shouldResize(element, 50, 50, "[default]");
-	for (i=0; i<2; i++) {
-		element.dialog("close").dialog("option", "resizable", false).dialog("open");
-		testHelper.shouldResize(element, 0, 0, "set option resizable false toggle ("+ (i+1) +")");
+	element = $( "<div></div>" ).dialog( { resizable: true } );
+	testHelper.shouldResize( element, 50, 50, "[default]" );
+	for ( i = 0; i < 2; i++ ) {
+		element.dialog( "close" ).dialog( "option", "resizable", false ).dialog( "open" );
+		testHelper.shouldResize( element, 0, 0, "set option resizable false toggle (" + ( i + 1 ) + ")" );
 	}
 	element.remove();
 
-});
+} );
 
 asyncTest( "#8051 - 'Explode' dialog animation causes crash in IE 6, 7 and 8", function() {
 	expect( 1 );
-	var element = $( "<div></div>" ).dialog({
+	var element = $( "<div></div>" ).dialog( {
 		show: "explode",
 		focus: function() {
 			ok( true, "dialog opened with animation" );
 			element.remove();
 			start();
 		}
-	});
-});
+	} );
+} );
 
 asyncTest( "#4421 - Focus lost from dialog which uses show-effect", function() {
 	expect( 1 );
-	var element = $( "<div></div>" ).dialog({
+	var element = $( "<div></div>" ).dialog( {
 		show: "blind",
 		focus: function() {
 			equal( element.dialog( "widget" ).find( document.activeElement ).length, 1, "dialog maintains focus" );
 			element.remove();
 			start();
 		}
-	});
-});
+	} );
+} );
 
 asyncTest( "Open followed by close during show effect", function() {
 	expect( 1 );
-	var element = $( "<div></div>" ).dialog({
+	var element = $( "<div></div>" ).dialog( {
 		show: "blind",
 		close: function() {
 			ok( true, "dialog closed properly during animation" );
 			element.remove();
 			start();
 		}
-	});
+	} );
 
 	setTimeout( function() {
-		element.dialog("close");
+		element.dialog( "close" );
 	}, 100 );
-});
+} );
 
 } );
diff --git a/ui/widgets/dialog.js b/ui/widgets/dialog.js
index abff0e535c6..4380c6f8fa2 100644
--- a/ui/widgets/dialog.js
+++ b/ui/widgets/dialog.js
@@ -68,6 +68,7 @@ $.widget( "ui.dialog", {
 			at: "center",
 			of: window,
 			collision: "fit",
+
 			// Ensure the titlebar is always visible
 			using: function( pos ) {
 				var topOffset = $( this ).css( pos ).offset().top;
@@ -176,6 +177,7 @@ $.widget( "ui.dialog", {
 		this.element
 			.removeUniqueId()
 			.css( this.originalCss )
+
 			// Without detaching first, the following becomes really slow
 			.detach();
 
@@ -186,6 +188,7 @@ $.widget( "ui.dialog", {
 		}
 
 		next = originalPosition.parent.children().eq( originalPosition.index );
+
 		// Don't try to place the dialog next to itself (#8613)
 		if ( next.length && next[ 0 ] !== this.element[ 0 ] ) {
 			next.before( this.element );
@@ -290,6 +293,7 @@ $.widget( "ui.dialog", {
 	},
 
 	_focusTabbable: function() {
+
 		// Set focus to the first match:
 		// 1. An element that was focused previously
 		// 2. First element inside the dialog matching [autofocus]
@@ -327,6 +331,7 @@ $.widget( "ui.dialog", {
 		}
 		event.preventDefault();
 		checkFocus.call( this );
+
 		// support: IE
 		// IE <= 8 doesn't prevent moving focus even with event.preventDefault()
 		// so we check again later
@@ -337,6 +342,7 @@ $.widget( "ui.dialog", {
 		this.uiDialog = $( "<div>" )
 			.hide()
 			.attr( {
+
 				// Setting tabIndex makes the div focusable
 				tabIndex: -1,
 				role: "dialog"
@@ -398,10 +404,12 @@ $.widget( "ui.dialog", {
 			"ui-dialog-titlebar", "ui-widget-header ui-helper-clearfix" );
 		this._on( this.uiDialogTitlebar, {
 			mousedown: function( event ) {
+
 				// Don't prevent click on close button (#8838)
 				// Focusing a dialog that is partially scrolled out of view
 				// causes the browser to scroll it into view, preventing the click event
 				if ( !$( event.target ).closest( ".ui-dialog-titlebar-close" ) ) {
+
 					// Dialog isn't getting focus when dragging (#8063)
 					this.uiDialog.trigger( "focus" );
 				}
@@ -478,8 +486,10 @@ $.widget( "ui.dialog", {
 			props = $.isFunction( props ) ?
 				{ click: props, text: name } :
 				props;
+
 			// Default to a non-submitting button
 			props = $.extend( { type: "button" }, props );
+
 			// Change the context for the click callback to be the main element
 			click = props.click;
 			buttonOptions = {
@@ -545,6 +555,7 @@ $.widget( "ui.dialog", {
 		var that = this,
 			options = this.options,
 			handles = options.resizable,
+
 			// .ui-resizable has position: relative defined in the stylesheet
 			// but dialogs have to use absolute or fixed positioning
 			position = this.uiDialog.css( "position" ),
@@ -639,6 +650,7 @@ $.widget( "ui.dialog", {
 	},
 
 	_position: function() {
+
 		// Need to show the dialog to get the actual offset in the position plugin
 		var isVisible = this.uiDialog.is( ":visible" );
 		if ( !isVisible ) {
@@ -695,6 +707,7 @@ $.widget( "ui.dialog", {
 
 		if ( key === "closeText" ) {
 			this.uiDialogTitlebarClose.button( {
+
 				// Ensure that we always pass a string
 				label: "" + value
 			} );
@@ -716,6 +729,7 @@ $.widget( "ui.dialog", {
 		}
 
 		if ( key === "resizable" ) {
+
 			// currently resizable, becoming non-resizable
 			isResizable = uiDialog.is( ":data(ui-resizable)" );
 			if ( isResizable && !value ) {
@@ -739,6 +753,7 @@ $.widget( "ui.dialog", {
 	},
 
 	_size: function() {
+
 		// If the user has resized the dialog, the .ui-dialog and .ui-dialog-content
 		// divs will both have width and height set, so we need to reset them
 		var nonContentHeight, minContentHeight, maxContentHeight,

From 118936ef5d32832e3e06cb4d2ebcfecad18292ac Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 09:00:11 -0400
Subject: [PATCH 15/27] Datepicker: Style updates

Ref #14246
---
 tests/unit/datepicker/core.js    |  492 ++++-----
 tests/unit/datepicker/helper.js  |   20 +-
 tests/unit/datepicker/methods.js |  217 ++--
 tests/unit/datepicker/options.js | 1642 ++++++++++++++--------------
 ui/i18n/datepicker-af.js         |   18 +-
 ui/i18n/datepicker-ar-DZ.js      |   18 +-
 ui/i18n/datepicker-ar.js         |   40 +-
 ui/i18n/datepicker-az.js         |   42 +-
 ui/i18n/datepicker-be.js         |   42 +-
 ui/i18n/datepicker-bg.js         |   44 +-
 ui/i18n/datepicker-bs.js         |   42 +-
 ui/i18n/datepicker-ca.js         |   42 +-
 ui/i18n/datepicker-cs.js         |   42 +-
 ui/i18n/datepicker-cy-GB.js      |   42 +-
 ui/i18n/datepicker-da.js         |   42 +-
 ui/i18n/datepicker-de.js         |   42 +-
 ui/i18n/datepicker-el.js         |   42 +-
 ui/i18n/datepicker-en-AU.js      |   42 +-
 ui/i18n/datepicker-en-GB.js      |   42 +-
 ui/i18n/datepicker-en-NZ.js      |   42 +-
 ui/i18n/datepicker-eo.js         |   42 +-
 ui/i18n/datepicker-es.js         |   42 +-
 ui/i18n/datepicker-et.js         |   42 +-
 ui/i18n/datepicker-eu.js         |   42 +-
 ui/i18n/datepicker-fa.js         |   96 +-
 ui/i18n/datepicker-fi.js         |   42 +-
 ui/i18n/datepicker-fo.js         |   42 +-
 ui/i18n/datepicker-fr-CA.js      |   42 +-
 ui/i18n/datepicker-fr-CH.js      |   42 +-
 ui/i18n/datepicker-fr.js         |   42 +-
 ui/i18n/datepicker-gl.js         |   42 +-
 ui/i18n/datepicker-he.js         |   42 +-
 ui/i18n/datepicker-hi.js         |   42 +-
 ui/i18n/datepicker-hr.js         |   42 +-
 ui/i18n/datepicker-hu.js         |   42 +-
 ui/i18n/datepicker-hy.js         |   42 +-
 ui/i18n/datepicker-id.js         |   42 +-
 ui/i18n/datepicker-is.js         |   42 +-
 ui/i18n/datepicker-it-CH.js      |   42 +-
 ui/i18n/datepicker-it.js         |   42 +-
 ui/i18n/datepicker-ja.js         |   42 +-
 ui/i18n/datepicker-ka.js         |   38 +-
 ui/i18n/datepicker-kk.js         |   42 +-
 ui/i18n/datepicker-km.js         |   42 +-
 ui/i18n/datepicker-ko.js         |   42 +-
 ui/i18n/datepicker-ky.js         |   42 +-
 ui/i18n/datepicker-lb.js         |   42 +-
 ui/i18n/datepicker-lt.js         |   42 +-
 ui/i18n/datepicker-lv.js         |   42 +-
 ui/i18n/datepicker-mk.js         |   42 +-
 ui/i18n/datepicker-ml.js         |   42 +-
 ui/i18n/datepicker-ms.js         |   42 +-
 ui/i18n/datepicker-nb.js         |   38 +-
 ui/i18n/datepicker-nl-BE.js      |   42 +-
 ui/i18n/datepicker-nl.js         |   38 +-
 ui/i18n/datepicker-nn.js         |   38 +-
 ui/i18n/datepicker-no.js         |   38 +-
 ui/i18n/datepicker-pl.js         |   42 +-
 ui/i18n/datepicker-pt-BR.js      |   42 +-
 ui/i18n/datepicker-pt.js         |   42 +-
 ui/i18n/datepicker-rm.js         |   38 +-
 ui/i18n/datepicker-ro.js         |   42 +-
 ui/i18n/datepicker-ru.js         |   42 +-
 ui/i18n/datepicker-sk.js         |   42 +-
 ui/i18n/datepicker-sl.js         |   42 +-
 ui/i18n/datepicker-sq.js         |   42 +-
 ui/i18n/datepicker-sr-SR.js      |   42 +-
 ui/i18n/datepicker-sr.js         |   42 +-
 ui/i18n/datepicker-sv.js         |   42 +-
 ui/i18n/datepicker-ta.js         |   42 +-
 ui/i18n/datepicker-th.js         |   42 +-
 ui/i18n/datepicker-tj.js         |   42 +-
 ui/i18n/datepicker-tr.js         |   42 +-
 ui/i18n/datepicker-uk.js         |   42 +-
 ui/i18n/datepicker-vi.js         |   42 +-
 ui/i18n/datepicker-zh-CN.js      |   42 +-
 ui/i18n/datepicker-zh-HK.js      |   42 +-
 ui/i18n/datepicker-zh-TW.js      |   42 +-
 ui/widgets/datepicker.js         | 1735 +++++++++++++++---------------
 79 files changed, 3632 insertions(+), 3564 deletions(-)

diff --git a/tests/unit/datepicker/core.js b/tests/unit/datepicker/core.js
index 43d5e2243ec..f9cdd4bb071 100644
--- a/tests/unit/datepicker/core.js
+++ b/tests/unit/datepicker/core.js
@@ -10,31 +10,31 @@ module( "datepicker: core", {
 	setup: function() {
 		$( "body" ).trigger( "focus" );
 	}
-});
+} );
 
 common.testJshint( "datepicker" );
 
-test("initialization - Reinitialization after body had been emptied.", function() {
+test( "initialization - Reinitialization after body had been emptied.", function() {
 	expect( 1 );
-	var bodyContent = $("body").children(), inp = $("#inp");
-	$("#inp").datepicker();
-	$("body").empty().append(inp);
-	$("#inp").datepicker();
-	ok( $("#"+$.datepicker._mainDivId).length===1, "Datepicker container added" );
-	$("body").empty().append(bodyContent); // Returning to initial state for later tests
-});
+	var bodyContent = $( "body" ).children(), inp = $( "#inp" );
+	$( "#inp" ).datepicker();
+	$( "body" ).empty().append( inp );
+	$( "#inp" ).datepicker();
+	ok( $( "#" + $.datepicker._mainDivId ).length === 1, "Datepicker container added" );
+	$( "body" ).empty().append( bodyContent ); // Returning to initial state for later tests
+} );
 
 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() {
+test( "widget method", function() {
 	expect( 1 );
-	var actual = $("#inp").datepicker().datepicker("widget")[0];
-	deepEqual($("body > #ui-datepicker-div:last-child")[0], actual);
-});
+	var actual = $( "#inp" ).datepicker().datepicker( "widget" )[ 0 ];
+	deepEqual( $( "body > #ui-datepicker-div:last-child" )[ 0 ], actual );
+} );
 
 asyncTest( "baseStructure", function() {
 	expect( 58 );
@@ -56,7 +56,7 @@ asyncTest( "baseStructure", function() {
 			ok( header.children( ":eq(1)" ).is( "a.ui-datepicker-next" ) && header.children( ":eq(1)" ).html() !== "", "Structure - next link" );
 
 			title = header.children( ":last" );
-			ok( title.is( "div.ui-datepicker-title" ) && title.html() !== "","Structure - title division" );
+			ok( title.is( "div.ui-datepicker-title" ) && title.html() !== "", "Structure - title division" );
 			equal( title.children().length, 2, "Structure - title child count" );
 			ok( title.children( ":first" ).is( "span.ui-datepicker-month" ) && title.children( ":first" ).text() !== "", "Structure - month text" );
 			ok( title.children( ":last" ).is( "span.ui-datepicker-year" ) && title.children( ":last" ).text() !== "", "Structure - year text" );
@@ -79,16 +79,17 @@ asyncTest( "baseStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step2();
-		});
+		} );
 	}
 
 	function step2() {
+
 		// Editable month/year and button panel
-		inp = testHelper.initNewInput({
+		inp = testHelper.initNewInput( {
 			changeMonth: true,
 			changeYear: true,
 			showButtonPanel: true
-		});
+		} );
 		testHelper.onFocus( inp, function() {
 			title = dp.find( "div.ui-datepicker-title" );
 			ok( title.children( ":first" ).is( "select.ui-datepicker-month" ), "Structure - month selector" );
@@ -102,12 +103,13 @@ asyncTest( "baseStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step3();
-		});
+		} );
 	}
 
 	function step3() {
+
 		// Multi-month 2
-		inp = testHelper.initNewInput({ numberOfMonths: 2 });
+		inp = testHelper.initNewInput( { numberOfMonths: 2 } );
 		testHelper.onFocus( inp, function() {
 			ok( dp.is( ".ui-datepicker-multi" ), "Structure multi [2] - multi-month" );
 			equal( dp.children().length, 3, "Structure multi [2] - child count" );
@@ -124,24 +126,26 @@ asyncTest( "baseStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step4();
-		});
+		} );
 	}
 
 	function step4() {
+
 		// Multi-month 3
-		inp = testHelper.initNewInput({ numberOfMonths: 3 });
+		inp = testHelper.initNewInput( { numberOfMonths: 3 } );
 		testHelper.onFocus( inp, function() {
 			ok( dp.is( ".ui-datepicker-multi-3" ), "Structure multi [3] - multi-3" );
 			ok( !dp.is( ".ui-datepicker-multi-2" ), "Structure multi [3] - Trac #6704" );
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step5();
-		});
+		} );
 	}
 
 	function step5() {
+
 		// Multi-month [2, 2]
-		inp = testHelper.initNewInput({ numberOfMonths: [ 2, 2 ] });
+		inp = testHelper.initNewInput( { numberOfMonths: [ 2, 2 ] } );
 		testHelper.onFocus( inp, function() {
 			ok( dp.is( ".ui-datepicker-multi" ), "Structure multi - multi-month" );
 			equal( dp.children().length, 6, "Structure multi [2,2] - child count" );
@@ -204,11 +208,11 @@ asyncTest( "baseStructure", function() {
 
 			inl.datepicker( "destroy" );
 			start();
-		});
+		} );
 	}
 
 	step1();
-});
+} );
 
 asyncTest( "customStructure", function() {
 	expect( 20 );
@@ -236,16 +240,16 @@ asyncTest( "customStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step2();
-		});
+		} );
 	}
 
 	// Hide prev/next
 	function step2() {
-		inp = testHelper.initNewInput({
+		inp = testHelper.initNewInput( {
 			hideIfNoPrevNext: true,
 			minDate: new Date( 2008, 2 - 1, 4 ),
 			maxDate: new Date( 2008, 2 - 1, 14 )
-		});
+		} );
 		inp.val( "02/10/2008" );
 
 		testHelper.onFocus( inp, function() {
@@ -256,12 +260,12 @@ asyncTest( "customStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step3();
-		});
+		} );
 	}
 
 	// Changeable Month with read-only year
 	function step3() {
-		inp = testHelper.initNewInput({ changeMonth: true });
+		inp = testHelper.initNewInput( { changeMonth: true } );
 
 		testHelper.onFocus( inp, function() {
 			title = dp.children( ":first" ).children( ":last" );
@@ -271,12 +275,12 @@ asyncTest( "customStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step4();
-		});
+		} );
 	}
 
 	// Changeable year with read-only month
 	function step4() {
-		inp = testHelper.initNewInput({ changeYear: true });
+		inp = testHelper.initNewInput( { changeYear: true } );
 
 		testHelper.onFocus( inp, function() {
 			title = dp.children( ":first" ).children( ":last" );
@@ -286,12 +290,12 @@ asyncTest( "customStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			step5();
-		});
+		} );
 	}
 
 	// Read-only first day of week
 	function step5() {
-		inp = testHelper.initNewInput({ changeFirstDay: false });
+		inp = testHelper.initNewInput( { changeFirstDay: false } );
 
 		testHelper.onFocus( inp, function() {
 			thead = dp.find( ".ui-datepicker-calendar thead tr" );
@@ -300,231 +304,239 @@ asyncTest( "customStructure", function() {
 
 			inp.datepicker( "hide" ).datepicker( "destroy" );
 			start();
-		});
+		} );
 	}
 
 	// TODO: figure out why this setTimeout is needed in IE,
 	// it only is necessary when the previous baseStructure tests runs first
 	// Support: IE
 	setTimeout( step1 );
-});
+} );
 
-test("keystrokes", function() {
+test( "keystrokes", function() {
 	expect( 26 );
-	var inp = testHelper.init("#inp"),
+	var inp = testHelper.init( "#inp" ),
 		date = new Date();
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke enter");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Keystroke enter - preset");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.HOME}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+home");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.END});
-	ok(inp.datepicker("getDate") == null, "Keystroke ctrl+end");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-	ok(inp.datepicker("getDate") == null, "Keystroke esc");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Keystroke esc - preset");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Keystroke esc - abandoned");
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke enter" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+		"Keystroke enter - preset" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.HOME } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke ctrl+home" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.END } );
+	ok( inp.datepicker( "getDate" ) == null, "Keystroke ctrl+end" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+	ok( inp.datepicker( "getDate" ) == null, "Keystroke esc" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+		"Keystroke esc - preset" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+		"Keystroke esc - abandoned" );
+
 	// Moving by day or week
-	inp.val("").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.LEFT}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+left");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.LEFT}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke left");
-	inp.val("").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.RIGHT}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+right");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.RIGHT}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke right");
-	inp.val("").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 7);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+up");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 7);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke up");
-	inp.val("").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 7);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+down");
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 7);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Keystroke down");
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.LEFT } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() - 1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke ctrl+left" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() + 1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke left" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.RIGHT } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() + 1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke ctrl+right" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() - 1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke right" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() - 7 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke ctrl+up" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() + 7 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke up" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() + 7 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke ctrl+down" );
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() - 7 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke down" );
+
 	// Moving by month or year
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 1 - 1, 4),
-		"Keystroke pgup");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 3 - 1, 4),
-		"Keystroke pgdn");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2007, 2 - 1, 4),
-		"Keystroke ctrl+pgup");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2009, 2 - 1, 4),
-		"Keystroke ctrl+pgdn");
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 1 - 1, 4 ),
+		"Keystroke pgup" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 3 - 1, 4 ),
+		"Keystroke pgdn" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2007, 2 - 1, 4 ),
+		"Keystroke ctrl+pgup" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2009, 2 - 1, 4 ),
+		"Keystroke ctrl+pgdn" );
+
 	// Check for moving to short months
-	inp.val("03/31/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 29),
-		"Keystroke pgup - Feb");
-	inp.val("01/30/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 29),
-		"Keystroke pgdn - Feb");
-	inp.val("02/29/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2007, 2 - 1, 28),
-		"Keystroke ctrl+pgup - Feb");
-	inp.val("02/29/2008").datepicker("show").
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2009, 2 - 1, 28),
-		"Keystroke ctrl+pgdn - Feb");
+	inp.val( "03/31/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 29 ),
+		"Keystroke pgup - Feb" );
+	inp.val( "01/30/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 29 ),
+		"Keystroke pgdn - Feb" );
+	inp.val( "02/29/2008" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2007, 2 - 1, 28 ),
+		"Keystroke ctrl+pgup - Feb" );
+	inp.val( "02/29/2008" ).datepicker( "show" ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2009, 2 - 1, 28 ),
+		"Keystroke ctrl+pgdn - Feb" );
+
 	// Goto current
-	inp.datepicker("option", {gotoCurrent: true}).
-		datepicker("hide").val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.HOME}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Keystroke ctrl+home");
+	inp.datepicker( "option", { gotoCurrent: true } ).
+		datepicker( "hide" ).val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.HOME } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+		"Keystroke ctrl+home" );
+
 	// Change steps
-	inp.datepicker("option", {stepMonths: 2, gotoCurrent: false}).
-		datepicker("hide").val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2007, 12 - 1, 4),
-		"Keystroke pgup step 2");
-	inp.val("02/04/2008").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 4 - 1, 4),
-		"Keystroke pgdn step 2");
-});
-
-test("mouse", function() {
+	inp.datepicker( "option", { stepMonths: 2, gotoCurrent: false } ).
+		datepicker( "hide" ).val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2007, 12 - 1, 4 ),
+		"Keystroke pgup step 2" );
+	inp.val( "02/04/2008" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 4 - 1, 4 ),
+		"Keystroke pgdn step 2" );
+} );
+
+test( "mouse", function() {
 	expect( 15 );
 	var inl,
-		inp = testHelper.init("#inp"),
-		dp = $("#ui-datepicker-div"),
+		inp = testHelper.init( "#inp" ),
+		dp = $( "#ui-datepicker-div" ),
 		date = new Date();
-	inp.val("").datepicker("show");
-	$(".ui-datepicker-calendar tbody a:contains(10)", dp).simulate("click", {});
-	date.setDate(10);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Mouse click");
-	inp.val("02/04/2008").datepicker("show");
-	$(".ui-datepicker-calendar tbody a:contains(12)", dp).simulate("click", {});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 12),
-		"Mouse click - preset");
-	inp.val("02/04/2008").datepicker("show");
-	inp.val("").datepicker("show");
-	$("button.ui-datepicker-close", dp).simulate("click", {});
-	ok(inp.datepicker("getDate") == null, "Mouse click - close");
-	inp.val("02/04/2008").datepicker("show");
-	$("button.ui-datepicker-close", dp).simulate("click", {});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Mouse click - close + preset");
-	inp.val("02/04/2008").datepicker("show");
-	$("a.ui-datepicker-prev", dp).simulate("click", {});
-	$("button.ui-datepicker-close", dp).simulate("click", {});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-		"Mouse click - abandoned");
+	inp.val( "" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar tbody a:contains(10)", dp ).simulate( "click", {} );
+	date.setDate( 10 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Mouse click" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar tbody a:contains(12)", dp ).simulate( "click", {} );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 12 ),
+		"Mouse click - preset" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	inp.val( "" ).datepicker( "show" );
+	$( "button.ui-datepicker-close", dp ).simulate( "click", {} );
+	ok( inp.datepicker( "getDate" ) == null, "Mouse click - close" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	$( "button.ui-datepicker-close", dp ).simulate( "click", {} );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+		"Mouse click - close + preset" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	$( "a.ui-datepicker-prev", dp ).simulate( "click", {} );
+	$( "button.ui-datepicker-close", dp ).simulate( "click", {} );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+		"Mouse click - abandoned" );
+
 	// Current/previous/next
-	inp.val("02/04/2008").datepicker("option", {showButtonPanel: true}).datepicker("show");
-	$(".ui-datepicker-current", dp).simulate("click", {});
-	$(".ui-datepicker-calendar tbody a:contains(14)", dp).simulate("click", {});
-	date.setDate(14);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Mouse click - current");
-	inp.val("02/04/2008").datepicker("show");
-	$(".ui-datepicker-prev", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(16)", dp).simulate("click");
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 1 - 1, 16),
-		"Mouse click - previous");
-	inp.val("02/04/2008").datepicker("show");
-	$(".ui-datepicker-next", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(18)", dp).simulate("click");
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 3 - 1, 18),
-		"Mouse click - next");
+	inp.val( "02/04/2008" ).datepicker( "option", { showButtonPanel: true } ).datepicker( "show" );
+	$( ".ui-datepicker-current", dp ).simulate( "click", {} );
+	$( ".ui-datepicker-calendar tbody a:contains(14)", dp ).simulate( "click", {} );
+	date.setDate( 14 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Mouse click - current" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-prev", dp ).simulate( "click" );
+	$( ".ui-datepicker-calendar tbody a:contains(16)", dp ).simulate( "click" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 1 - 1, 16 ),
+		"Mouse click - previous" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-next", dp ).simulate( "click" );
+	$( ".ui-datepicker-calendar tbody a:contains(18)", dp ).simulate( "click" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 3 - 1, 18 ),
+		"Mouse click - next" );
+
 	// Previous/next with minimum/maximum
-	inp.datepicker("option", {minDate: new Date(2008, 2 - 1, 2),
-		maxDate: new Date(2008, 2 - 1, 26)}).val("02/04/2008").datepicker("show");
-	$(".ui-datepicker-prev", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(16)", dp).simulate("click");
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 16),
-		"Mouse click - previous + min/max");
-	inp.val("02/04/2008").datepicker("show");
-	$(".ui-datepicker-next", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(18)", dp).simulate("click");
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 18),
-		"Mouse click - next + min/max");
+	inp.datepicker( "option", { minDate: new Date( 2008, 2 - 1, 2 ),
+		maxDate: new Date( 2008, 2 - 1, 26 ) } ).val( "02/04/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-prev", dp ).simulate( "click" );
+	$( ".ui-datepicker-calendar tbody a:contains(16)", dp ).simulate( "click" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 16 ),
+		"Mouse click - previous + min/max" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-next", dp ).simulate( "click" );
+	$( ".ui-datepicker-calendar tbody a:contains(18)", dp ).simulate( "click" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 18 ),
+		"Mouse click - next + min/max" );
+
 	// Inline
-	inl = testHelper.init("#inl");
-	dp = $(".ui-datepicker-inline", inl);
+	inl = testHelper.init( "#inl" );
+	dp = $( ".ui-datepicker-inline", inl );
 	date = new Date();
-	inl.datepicker("setDate", date);
-	$(".ui-datepicker-calendar tbody a:contains(10)", dp).simulate("click", {});
-	date.setDate(10);
-	testHelper.equalsDate(inl.datepicker("getDate"), date, "Mouse click inline");
-	inl.datepicker("option", {showButtonPanel: true}).datepicker("setDate", new Date(2008, 2 - 1, 4));
-	$(".ui-datepicker-calendar tbody a:contains(12)", dp).simulate("click", {});
-	testHelper.equalsDate(inl.datepicker("getDate"), new Date(2008, 2 - 1, 12), "Mouse click inline - preset");
-	inl.datepicker("option", {showButtonPanel: true});
-	$(".ui-datepicker-current", dp).simulate("click", {});
-	$(".ui-datepicker-calendar tbody a:contains(14)", dp).simulate("click", {});
-	date.setDate(14);
-	testHelper.equalsDate(inl.datepicker("getDate"), date, "Mouse click inline - current");
-	inl.datepicker("setDate", new Date(2008, 2 - 1, 4));
-	$(".ui-datepicker-prev", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(16)", dp).simulate("click");
-	testHelper.equalsDate(inl.datepicker("getDate"), new Date(2008, 1 - 1, 16),
-		"Mouse click inline - previous");
-	inl.datepicker("setDate", new Date(2008, 2 - 1, 4));
-	$(".ui-datepicker-next", dp).simulate("click");
-	$(".ui-datepicker-calendar tbody a:contains(18)", dp).simulate("click");
-	testHelper.equalsDate(inl.datepicker("getDate"), new Date(2008, 3 - 1, 18),
-		"Mouse click inline - next");
-});
+	inl.datepicker( "setDate", date );
+	$( ".ui-datepicker-calendar tbody a:contains(10)", dp ).simulate( "click", {} );
+	date.setDate( 10 );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), date, "Mouse click inline" );
+	inl.datepicker( "option", { showButtonPanel: true } ).datepicker( "setDate", new Date( 2008, 2 - 1, 4 ) );
+	$( ".ui-datepicker-calendar tbody a:contains(12)", dp ).simulate( "click", {} );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), new Date( 2008, 2 - 1, 12 ), "Mouse click inline - preset" );
+	inl.datepicker( "option", { showButtonPanel: true } );
+	$( ".ui-datepicker-current", dp ).simulate( "click", {} );
+	$( ".ui-datepicker-calendar tbody a:contains(14)", dp ).simulate( "click", {} );
+	date.setDate( 14 );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), date, "Mouse click inline - current" );
+	inl.datepicker( "setDate", new Date( 2008, 2 - 1, 4 ) );
+	$( ".ui-datepicker-prev", dp ).simulate( "click" );
+	$( ".ui-datepicker-calendar tbody a:contains(16)", dp ).simulate( "click" );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), new Date( 2008, 1 - 1, 16 ),
+		"Mouse click inline - previous" );
+	inl.datepicker( "setDate", new Date( 2008, 2 - 1, 4 ) );
+	$( ".ui-datepicker-next", dp ).simulate( "click" );
+	$( ".ui-datepicker-calendar tbody a:contains(18)", dp ).simulate( "click" );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), new Date( 2008, 3 - 1, 18 ),
+		"Mouse click inline - next" );
+} );
 
 } );
diff --git a/tests/unit/datepicker/helper.js b/tests/unit/datepicker/helper.js
index a9753a89ae4..4712a08dad1 100644
--- a/tests/unit/datepicker/helper.js
+++ b/tests/unit/datepicker/helper.js
@@ -5,21 +5,21 @@ define( [
 ], function( $, helper ) {
 
 return $.extend( helper, {
-	addMonths: function(date, offset) {
-		var maxDay = 32 - new Date(date.getFullYear(), date.getMonth() + offset, 32).getDate();
-		date.setDate(Math.min(date.getDate(), maxDay));
-		date.setMonth(date.getMonth() + offset);
+	addMonths: function( date, offset ) {
+		var maxDay = 32 - new Date( date.getFullYear(), date.getMonth() + offset, 32 ).getDate();
+		date.setDate( Math.min( date.getDate(), maxDay ) );
+		date.setMonth( date.getMonth() + offset );
 		return date;
 	},
 
-	equalsDate: function(d1, d2, message) {
-		if (!d1 || !d2) {
-			ok(false, message + " - missing date");
+	equalsDate: function( d1, d2, message ) {
+		if ( !d1 || !d2 ) {
+			ok( false, message + " - missing date" );
 			return;
 		}
-		d1 = new Date(d1.getFullYear(), d1.getMonth(), d1.getDate());
-		d2 = new Date(d2.getFullYear(), d2.getMonth(), d2.getDate());
-		equal(d1.toString(), d2.toString(), message);
+		d1 = new Date( d1.getFullYear(), d1.getMonth(), d1.getDate() );
+		d2 = new Date( d2.getFullYear(), d2.getMonth(), d2.getDate() );
+		equal( d1.toString(), d2.toString(), message );
 	},
 
 	init: function( id, options ) {
diff --git a/tests/unit/datepicker/methods.js b/tests/unit/datepicker/methods.js
index 571b4cb98d4..fcf8c210462 100644
--- a/tests/unit/datepicker/methods.js
+++ b/tests/unit/datepicker/methods.js
@@ -4,123 +4,130 @@ define( [
 	"ui/widgets/datepicker"
 ], function( $, testHelper ) {
 
-module("datepicker: methods");
+module( "datepicker: methods" );
 
-test("destroy", function() {
+test( "destroy", function() {
 	expect( 33 );
 	var inl,
-		inp = testHelper.init("#inp");
-	ok(inp.is(".hasDatepicker"), "Default - marker class set");
-	ok($.data(inp[0], testHelper.PROP_NAME), "Default - instance present");
-	ok(inp.next().is("#alt"), "Default - button absent");
-	inp.datepicker("destroy");
-	inp = $("#inp");
-	ok(!inp.is(".hasDatepicker"), "Default - marker class cleared");
-	ok(!$.data(inp[0], testHelper.PROP_NAME), "Default - instance absent");
-	ok(inp.next().is("#alt"), "Default - button absent");
+		inp = testHelper.init( "#inp" );
+	ok( inp.is( ".hasDatepicker" ), "Default - marker class set" );
+	ok( $.data( inp[ 0 ], testHelper.PROP_NAME ), "Default - instance present" );
+	ok( inp.next().is( "#alt" ), "Default - button absent" );
+	inp.datepicker( "destroy" );
+	inp = $( "#inp" );
+	ok( !inp.is( ".hasDatepicker" ), "Default - marker class cleared" );
+	ok( !$.data( inp[ 0 ], testHelper.PROP_NAME ), "Default - instance absent" );
+	ok( inp.next().is( "#alt" ), "Default - button absent" );
+
 	// With button
-	inp= testHelper.init("#inp", {showOn: "both"});
-	ok(inp.is(".hasDatepicker"), "Button - marker class set");
-	ok($.data(inp[0], testHelper.PROP_NAME), "Button - instance present");
-	ok(inp.next().text() === "...", "Button - button added");
-	inp.datepicker("destroy");
-	inp = $("#inp");
-	ok(!inp.is(".hasDatepicker"), "Button - marker class cleared");
-	ok(!$.data(inp[0], testHelper.PROP_NAME), "Button - instance absent");
-	ok(inp.next().is("#alt"), "Button - button removed");
+	inp = testHelper.init( "#inp", { showOn: "both" } );
+	ok( inp.is( ".hasDatepicker" ), "Button - marker class set" );
+	ok( $.data( inp[ 0 ], testHelper.PROP_NAME ), "Button - instance present" );
+	ok( inp.next().text() === "...", "Button - button added" );
+	inp.datepicker( "destroy" );
+	inp = $( "#inp" );
+	ok( !inp.is( ".hasDatepicker" ), "Button - marker class cleared" );
+	ok( !$.data( inp[ 0 ], testHelper.PROP_NAME ), "Button - instance absent" );
+	ok( inp.next().is( "#alt" ), "Button - button removed" );
+
 	// With append text
-	inp = testHelper.init("#inp", {appendText: "Testing"});
-	ok(inp.is(".hasDatepicker"), "Append - marker class set");
-	ok($.data(inp[0], testHelper.PROP_NAME), "Append - instance present");
-	ok(inp.next().text() === "Testing", "Append - append text added");
-	inp.datepicker("destroy");
-	inp = $("#inp");
-	ok(!inp.is(".hasDatepicker"), "Append - marker class cleared");
-	ok(!$.data(inp[0], testHelper.PROP_NAME), "Append - instance absent");
-	ok(inp.next().is("#alt"), "Append - append text removed");
+	inp = testHelper.init( "#inp", { appendText: "Testing" } );
+	ok( inp.is( ".hasDatepicker" ), "Append - marker class set" );
+	ok( $.data( inp[ 0 ], testHelper.PROP_NAME ), "Append - instance present" );
+	ok( inp.next().text() === "Testing", "Append - append text added" );
+	inp.datepicker( "destroy" );
+	inp = $( "#inp" );
+	ok( !inp.is( ".hasDatepicker" ), "Append - marker class cleared" );
+	ok( !$.data( inp[ 0 ], testHelper.PROP_NAME ), "Append - instance absent" );
+	ok( inp.next().is( "#alt" ), "Append - append text removed" );
+
 	// With both
-	inp= testHelper.init("#inp", {showOn: "both", buttonImageOnly: true,
-		buttonImage: "images/calendar.gif", appendText: "Testing"});
-	ok(inp.is(".hasDatepicker"), "Both - marker class set");
-	ok($.data(inp[0], testHelper.PROP_NAME), "Both - instance present");
-	ok(inp.next()[0].nodeName.toLowerCase() === "img", "Both - button added");
-	ok(inp.next().next().text() === "Testing", "Both - append text added");
-	inp.datepicker("destroy");
-	inp = $("#inp");
-	ok(!inp.is(".hasDatepicker"), "Both - marker class cleared");
-	ok(!$.data(inp[0], testHelper.PROP_NAME), "Both - instance absent");
-	ok(inp.next().is("#alt"), "Both - button and append text absent");
+	inp = testHelper.init( "#inp", { showOn: "both", buttonImageOnly: true,
+		buttonImage: "images/calendar.gif", appendText: "Testing" } );
+	ok( inp.is( ".hasDatepicker" ), "Both - marker class set" );
+	ok( $.data( inp[ 0 ], testHelper.PROP_NAME ), "Both - instance present" );
+	ok( inp.next()[ 0 ].nodeName.toLowerCase() === "img", "Both - button added" );
+	ok( inp.next().next().text() === "Testing", "Both - append text added" );
+	inp.datepicker( "destroy" );
+	inp = $( "#inp" );
+	ok( !inp.is( ".hasDatepicker" ), "Both - marker class cleared" );
+	ok( !$.data( inp[ 0 ], testHelper.PROP_NAME ), "Both - instance absent" );
+	ok( inp.next().is( "#alt" ), "Both - button and append text absent" );
+
 	// Inline
-	inl = testHelper.init("#inl");
-	ok(inl.is(".hasDatepicker"), "Inline - marker class set");
-	ok(inl.html() !== "", "Inline - datepicker present");
-	ok($.data(inl[0], testHelper.PROP_NAME), "Inline - instance present");
-	ok(inl.next().length === 0 || inl.next().is("p"), "Inline - button absent");
-	inl.datepicker("destroy");
-	inl = $("#inl");
-	ok(!inl.is(".hasDatepicker"), "Inline - marker class cleared");
-	ok(inl.html() === "", "Inline - datepicker absent");
-	ok(!$.data(inl[0], testHelper.PROP_NAME), "Inline - instance absent");
-	ok(inl.next().length === 0 || inl.next().is("p"), "Inline - button absent");
-});
+	inl = testHelper.init( "#inl" );
+	ok( inl.is( ".hasDatepicker" ), "Inline - marker class set" );
+	ok( inl.html() !== "", "Inline - datepicker present" );
+	ok( $.data( inl[ 0 ], testHelper.PROP_NAME ), "Inline - instance present" );
+	ok( inl.next().length === 0 || inl.next().is( "p" ), "Inline - button absent" );
+	inl.datepicker( "destroy" );
+	inl = $( "#inl" );
+	ok( !inl.is( ".hasDatepicker" ), "Inline - marker class cleared" );
+	ok( inl.html() === "", "Inline - datepicker absent" );
+	ok( !$.data( inl[ 0 ], testHelper.PROP_NAME ), "Inline - instance absent" );
+	ok( inl.next().length === 0 || inl.next().is( "p" ), "Inline - button absent" );
+} );
 
-test("enableDisable", function() {
+test( "enableDisable", function() {
 	expect( 33 );
 	var inl, dp,
-		inp = testHelper.init("#inp");
-	ok(!inp.datepicker("isDisabled"), "Enable/disable - initially marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable - field initially enabled");
-	inp.datepicker("disable");
-	ok(inp.datepicker("isDisabled"), "Enable/disable - now marked as disabled");
-	ok(inp[0].disabled, "Enable/disable - field now disabled");
-	inp.datepicker("enable");
-	ok(!inp.datepicker("isDisabled"), "Enable/disable - now marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable - field now enabled");
-	inp.datepicker("destroy");
+		inp = testHelper.init( "#inp" );
+	ok( !inp.datepicker( "isDisabled" ), "Enable/disable - initially marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Enable/disable - field initially enabled" );
+	inp.datepicker( "disable" );
+	ok( inp.datepicker( "isDisabled" ), "Enable/disable - now marked as disabled" );
+	ok( inp[ 0 ].disabled, "Enable/disable - field now disabled" );
+	inp.datepicker( "enable" );
+	ok( !inp.datepicker( "isDisabled" ), "Enable/disable - now marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Enable/disable - field now enabled" );
+	inp.datepicker( "destroy" );
+
 	// With a button
-	inp = testHelper.init("#inp", {showOn: "button"});
-	ok(!inp.datepicker("isDisabled"), "Enable/disable button - initially marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable button - field initially enabled");
-	ok(!inp.next("button")[0].disabled, "Enable/disable button - button initially enabled");
-	inp.datepicker("disable");
-	ok(inp.datepicker("isDisabled"), "Enable/disable button - now marked as disabled");
-	ok(inp[0].disabled, "Enable/disable button - field now disabled");
-	ok(inp.next("button")[0].disabled, "Enable/disable button - button now disabled");
-	inp.datepicker("enable");
-	ok(!inp.datepicker("isDisabled"), "Enable/disable button - now marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable button - field now enabled");
-	ok(!inp.next("button")[0].disabled, "Enable/disable button - button now enabled");
-	inp.datepicker("destroy");
+	inp = testHelper.init( "#inp", { showOn: "button" } );
+	ok( !inp.datepicker( "isDisabled" ), "Enable/disable button - initially marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Enable/disable button - field initially enabled" );
+	ok( !inp.next( "button" )[ 0 ].disabled, "Enable/disable button - button initially enabled" );
+	inp.datepicker( "disable" );
+	ok( inp.datepicker( "isDisabled" ), "Enable/disable button - now marked as disabled" );
+	ok( inp[ 0 ].disabled, "Enable/disable button - field now disabled" );
+	ok( inp.next( "button" )[ 0 ].disabled, "Enable/disable button - button now disabled" );
+	inp.datepicker( "enable" );
+	ok( !inp.datepicker( "isDisabled" ), "Enable/disable button - now marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Enable/disable button - field now enabled" );
+	ok( !inp.next( "button" )[ 0 ].disabled, "Enable/disable button - button now enabled" );
+	inp.datepicker( "destroy" );
+
 	// With an image button
-	inp = testHelper.init("#inp", {showOn: "button", buttonImageOnly: true,
-		buttonImage: "images/calendar.gif"});
-	ok(!inp.datepicker("isDisabled"), "Enable/disable image - initially marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable image - field initially enabled");
-	ok(parseFloat(inp.next("img").css("opacity")) === 1, "Enable/disable image - image initially enabled");
-	inp.datepicker("disable");
-	ok(inp.datepicker("isDisabled"), "Enable/disable image - now marked as disabled");
-	ok(inp[0].disabled, "Enable/disable image - field now disabled");
-	ok(parseFloat(inp.next("img").css("opacity")) !== 1, "Enable/disable image - image now disabled");
-	inp.datepicker("enable");
-	ok(!inp.datepicker("isDisabled"), "Enable/disable image - now marked as enabled");
-	ok(!inp[0].disabled, "Enable/disable image - field now enabled");
-	ok(parseFloat(inp.next("img").css("opacity")) === 1, "Enable/disable image - image now enabled");
-	inp.datepicker("destroy");
+	inp = testHelper.init( "#inp", { showOn: "button", buttonImageOnly: true,
+		buttonImage: "images/calendar.gif" } );
+	ok( !inp.datepicker( "isDisabled" ), "Enable/disable image - initially marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Enable/disable image - field initially enabled" );
+	ok( parseFloat( inp.next( "img" ).css( "opacity" ) ) === 1, "Enable/disable image - image initially enabled" );
+	inp.datepicker( "disable" );
+	ok( inp.datepicker( "isDisabled" ), "Enable/disable image - now marked as disabled" );
+	ok( inp[ 0 ].disabled, "Enable/disable image - field now disabled" );
+	ok( parseFloat( inp.next( "img" ).css( "opacity" ) ) !== 1, "Enable/disable image - image now disabled" );
+	inp.datepicker( "enable" );
+	ok( !inp.datepicker( "isDisabled" ), "Enable/disable image - now marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Enable/disable image - field now enabled" );
+	ok( parseFloat( inp.next( "img" ).css( "opacity" ) ) === 1, "Enable/disable image - image now enabled" );
+	inp.datepicker( "destroy" );
+
 	// Inline
-	inl = testHelper.init("#inl", {changeYear: true});
-	dp = $(".ui-datepicker-inline", inl);
-	ok(!inl.datepicker("isDisabled"), "Enable/disable inline - initially marked as enabled");
-	ok(!dp.children().is(".ui-state-disabled"), "Enable/disable inline - not visually disabled initially");
-	ok(!dp.find("select").prop("disabled"), "Enable/disable inline - form element enabled initially");
-	inl.datepicker("disable");
-	ok(inl.datepicker("isDisabled"), "Enable/disable inline - now marked as disabled");
-	ok(dp.children().is(".ui-state-disabled"), "Enable/disable inline - visually disabled");
-	ok(dp.find("select").prop("disabled"), "Enable/disable inline - form element disabled");
-	inl.datepicker("enable");
-	ok(!inl.datepicker("isDisabled"), "Enable/disable inline - now marked as enabled");
-	ok(!dp.children().is(".ui-state-disabled"), "Enable/disable inline - not visiually disabled");
-	ok(!dp.find("select").prop("disabled"), "Enable/disable inline - form element enabled");
-	inl.datepicker("destroy");
-});
+	inl = testHelper.init( "#inl", { changeYear: true } );
+	dp = $( ".ui-datepicker-inline", inl );
+	ok( !inl.datepicker( "isDisabled" ), "Enable/disable inline - initially marked as enabled" );
+	ok( !dp.children().is( ".ui-state-disabled" ), "Enable/disable inline - not visually disabled initially" );
+	ok( !dp.find( "select" ).prop( "disabled" ), "Enable/disable inline - form element enabled initially" );
+	inl.datepicker( "disable" );
+	ok( inl.datepicker( "isDisabled" ), "Enable/disable inline - now marked as disabled" );
+	ok( dp.children().is( ".ui-state-disabled" ), "Enable/disable inline - visually disabled" );
+	ok( dp.find( "select" ).prop( "disabled" ), "Enable/disable inline - form element disabled" );
+	inl.datepicker( "enable" );
+	ok( !inl.datepicker( "isDisabled" ), "Enable/disable inline - now marked as enabled" );
+	ok( !dp.children().is( ".ui-state-disabled" ), "Enable/disable inline - not visiually disabled" );
+	ok( !dp.find( "select" ).prop( "disabled" ), "Enable/disable inline - form element enabled" );
+	inl.datepicker( "destroy" );
+} );
 
 } );
diff --git a/tests/unit/datepicker/options.js b/tests/unit/datepicker/options.js
index 3a6c15c6daf..eebb858890e 100644
--- a/tests/unit/datepicker/options.js
+++ b/tests/unit/datepicker/options.js
@@ -7,90 +7,92 @@ define( [
 	"ui/i18n/datepicker-zh-CN"
 ], function( $, testHelper ) {
 
-module("datepicker: options");
+module( "datepicker: options" );
 
-test("setDefaults", function() {
+test( "setDefaults", function() {
 	expect( 3 );
-	testHelper.init("#inp");
-	equal($.datepicker._defaults.showOn, "focus", "Initial showOn");
-	$.datepicker.setDefaults({showOn: "button"});
-	equal($.datepicker._defaults.showOn, "button", "Change default showOn");
-	$.datepicker.setDefaults({showOn: "focus"});
-	equal($.datepicker._defaults.showOn, "focus", "Restore showOn");
-});
-
-test("option", function() {
+	testHelper.init( "#inp" );
+	equal( $.datepicker._defaults.showOn, "focus", "Initial showOn" );
+	$.datepicker.setDefaults( { showOn: "button" } );
+	equal( $.datepicker._defaults.showOn, "button", "Change default showOn" );
+	$.datepicker.setDefaults( { showOn: "focus" } );
+	equal( $.datepicker._defaults.showOn, "focus", "Restore showOn" );
+} );
+
+test( "option", function() {
 	expect( 17 );
-	var inp = testHelper.init("#inp"),
-	inst = $.data(inp[0], testHelper.PROP_NAME);
+	var inp = testHelper.init( "#inp" ),
+	inst = $.data( inp[ 0 ], testHelper.PROP_NAME );
+
 	// Set option
-	equal(inst.settings.showOn, null, "Initial setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "focus", "Initial instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Initial default showOn");
-	inp.datepicker("option", "showOn", "button");
-	equal(inst.settings.showOn, "button", "Change setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "button", "Change instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-	inp.datepicker("option", {showOn: "both"});
-	equal(inst.settings.showOn, "both", "Change setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "both", "Change instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-	inp.datepicker("option", "showOn", undefined);
-	equal(inst.settings.showOn, null, "Clear setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "focus", "Restore instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
+	equal( inst.settings.showOn, null, "Initial setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "focus", "Initial instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Initial default showOn" );
+	inp.datepicker( "option", "showOn", "button" );
+	equal( inst.settings.showOn, "button", "Change setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "button", "Change instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Retain default showOn" );
+	inp.datepicker( "option", { showOn: "both" } );
+	equal( inst.settings.showOn, "both", "Change setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "both", "Change instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Retain default showOn" );
+	inp.datepicker( "option", "showOn", undefined );
+	equal( inst.settings.showOn, null, "Clear setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "focus", "Restore instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Retain default showOn" );
+
 	// Get option
-	inp = testHelper.init("#inp");
-	equal(inp.datepicker("option", "showOn"), "focus", "Initial setting showOn");
-	inp.datepicker("option", "showOn", "button");
-	equal(inp.datepicker("option", "showOn"), "button", "Change instance showOn");
-	inp.datepicker("option", "showOn", undefined);
-	equal(inp.datepicker("option", "showOn"), "focus", "Reset instance showOn");
-	deepEqual(inp.datepicker("option", "all"), {showAnim: ""}, "Get instance settings");
-	deepEqual(inp.datepicker("option", "defaults"), $.datepicker._defaults,
-		"Get default settings");
-});
+	inp = testHelper.init( "#inp" );
+	equal( inp.datepicker( "option", "showOn" ), "focus", "Initial setting showOn" );
+	inp.datepicker( "option", "showOn", "button" );
+	equal( inp.datepicker( "option", "showOn" ), "button", "Change instance showOn" );
+	inp.datepicker( "option", "showOn", undefined );
+	equal( inp.datepicker( "option", "showOn" ), "focus", "Reset instance showOn" );
+	deepEqual( inp.datepicker( "option", "all" ), { showAnim: "" }, "Get instance settings" );
+	deepEqual( inp.datepicker( "option", "defaults" ), $.datepicker._defaults,
+		"Get default settings" );
+} );
 
 test( "disabled", function() {
-	expect(8);
-	var inp = testHelper.init("#inp");
-	ok(!inp.datepicker("isDisabled"), "Initially marked as enabled");
-	ok(!inp[0].disabled, "Field initially enabled");
-	inp.datepicker("option", "disabled", true);
-	ok(inp.datepicker("isDisabled"), "Marked as disabled");
-	ok(inp[0].disabled, "Field now disabled");
-	inp.datepicker("option", "disabled", false);
-	ok(!inp.datepicker("isDisabled"), "Marked as enabled");
-	ok(!inp[0].disabled, "Field now enabled");
-	inp.datepicker("destroy");
-
-	inp = testHelper.init("#inp", { disabled: true });
-	ok(inp.datepicker("isDisabled"), "Initially marked as disabled");
-	ok(inp[0].disabled, "Field initially disabled");
-});
-
-test("change", function() {
+	expect( 8 );
+	var inp = testHelper.init( "#inp" );
+	ok( !inp.datepicker( "isDisabled" ), "Initially marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Field initially enabled" );
+	inp.datepicker( "option", "disabled", true );
+	ok( inp.datepicker( "isDisabled" ), "Marked as disabled" );
+	ok( inp[ 0 ].disabled, "Field now disabled" );
+	inp.datepicker( "option", "disabled", false );
+	ok( !inp.datepicker( "isDisabled" ), "Marked as enabled" );
+	ok( !inp[ 0 ].disabled, "Field now enabled" );
+	inp.datepicker( "destroy" );
+
+	inp = testHelper.init( "#inp", { disabled: true } );
+	ok( inp.datepicker( "isDisabled" ), "Initially marked as disabled" );
+	ok( inp[ 0 ].disabled, "Field initially disabled" );
+} );
+
+test( "change", function() {
 	expect( 12 );
-	var inp = testHelper.init("#inp"),
-	inst = $.data(inp[0], testHelper.PROP_NAME);
-	equal(inst.settings.showOn, null, "Initial setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "focus", "Initial instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Initial default showOn");
-	inp.datepicker("change", "showOn", "button");
-	equal(inst.settings.showOn, "button", "Change setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "button", "Change instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-	inp.datepicker("change", {showOn: "both"});
-	equal(inst.settings.showOn, "both", "Change setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "both", "Change instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-	inp.datepicker("change", "showOn", undefined);
-	equal(inst.settings.showOn, null, "Clear setting showOn");
-	equal($.datepicker._get(inst, "showOn"), "focus", "Restore instance showOn");
-	equal($.datepicker._defaults.showOn, "focus", "Retain default showOn");
-});
-
-(function() {
+	var inp = testHelper.init( "#inp" ),
+	inst = $.data( inp[ 0 ], testHelper.PROP_NAME );
+	equal( inst.settings.showOn, null, "Initial setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "focus", "Initial instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Initial default showOn" );
+	inp.datepicker( "change", "showOn", "button" );
+	equal( inst.settings.showOn, "button", "Change setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "button", "Change instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Retain default showOn" );
+	inp.datepicker( "change", { showOn: "both" } );
+	equal( inst.settings.showOn, "both", "Change setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "both", "Change instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Retain default showOn" );
+	inp.datepicker( "change", "showOn", undefined );
+	equal( inst.settings.showOn, null, "Clear setting showOn" );
+	equal( $.datepicker._get( inst, "showOn" ), "focus", "Restore instance showOn" );
+	equal( $.datepicker._defaults.showOn, "focus", "Retain default showOn" );
+} );
+
+( function() {
 	var url = window.location.search;
 	url = decodeURIComponent( url.slice( url.indexOf( "swarmURL=" ) + 9 ) );
 
@@ -120,7 +122,7 @@ test("change", function() {
 				inp.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
 				ok( !dp.is( ":visible" ), "Focus - hidden on exit" );
 				step1();
-			});
+			} );
 		}
 
 		function step1() {
@@ -135,14 +137,14 @@ test("change", function() {
 				inp.datepicker( "hide" ).datepicker( "destroy" );
 
 				step2();
-			});
+			} );
 		}
 
 		function step2() {
-			var inp = testHelper.initNewInput({
+			var inp = testHelper.initNewInput( {
 					showOn: "button",
 					buttonText: "Popup"
-				}),
+				} ),
 				dp = $( "#ui-datepicker-div" );
 
 			ok( !dp.is( ":visible" ), "Button - initially hidden" );
@@ -161,16 +163,16 @@ test("change", function() {
 				inp.datepicker( "hide" ).datepicker( "destroy" );
 
 				step3();
-			});
+			} );
 		}
 
 		function step3() {
-			var inp = testHelper.initNewInput({
+			var inp = testHelper.initNewInput( {
 					showOn: "button",
 					buttonImageOnly: true,
 					buttonImage: "images/calendar.gif",
 					buttonText: "Cal"
-				}),
+				} ),
 				dp = $( "#ui-datepicker-div" );
 
 			ok( !dp.is( ":visible" ), "Image button - initially hidden" );
@@ -190,14 +192,14 @@ test("change", function() {
 				inp.datepicker( "hide" ).datepicker( "destroy" );
 
 				step4();
-			});
+			} );
 		}
 
 		function step4() {
-			var inp = testHelper.initNewInput({
+			var inp = testHelper.initNewInput( {
 					showOn: "both",
 					buttonImage: "images/calendar.gif"
-				}),
+				} ),
 				dp = $( "#ui-datepicker-div" );
 
 			ok( !dp.is( ":visible" ), "Both - initially hidden" );
@@ -221,548 +223,568 @@ test("change", function() {
 					inp.datepicker( "hide" ).datepicker( "destroy" );
 
 					start();
-				});
+				} );
 			} else {
 				start();
 			}
 		}
 
 		step0();
-	});
-})();
+	} );
+} )();
 
-test("otherMonths", function() {
+test( "otherMonths", function() {
 	expect( 8 );
-	var inp = testHelper.init("#inp"),
-		pop = $("#ui-datepicker-div");
-	inp.val("06/01/2009").datepicker("show");
-	equal(pop.find("tbody").text(),
+	var inp = testHelper.init( "#inp" ),
+		pop = $( "#ui-datepicker-div" );
+	inp.val( "06/01/2009" ).datepicker( "show" );
+	equal( pop.find( "tbody" ).text(),
+
 		// support: IE <9, jQuery <1.8
 		// In IE7/8 with jQuery <1.8, encoded spaces behave in strange ways
 		$( "<span>\u00a0123456789101112131415161718192021222324252627282930\u00a0\u00a0\u00a0\u00a0</span>" ).text(),
-		"Other months - none");
-	ok(pop.find("td:last *").length === 0, "Other months - no content");
-	inp.datepicker("hide").datepicker("option", "showOtherMonths", true).datepicker("show");
-	equal(pop.find("tbody").text(), "311234567891011121314151617181920212223242526272829301234",
-		"Other months - show");
-	ok(pop.find("td:last span").length === 1, "Other months - span content");
-	inp.datepicker("hide").datepicker("option", "selectOtherMonths", true).datepicker("show");
-	equal(pop.find("tbody").text(), "311234567891011121314151617181920212223242526272829301234",
-		"Other months - select");
-	ok(pop.find("td:last a").length === 1, "Other months - link content");
-	inp.datepicker("hide").datepicker("option", "showOtherMonths", false).datepicker("show");
-	equal(pop.find("tbody").text(),
+		"Other months - none" );
+	ok( pop.find( "td:last *" ).length === 0, "Other months - no content" );
+	inp.datepicker( "hide" ).datepicker( "option", "showOtherMonths", true ).datepicker( "show" );
+	equal( pop.find( "tbody" ).text(), "311234567891011121314151617181920212223242526272829301234",
+		"Other months - show" );
+	ok( pop.find( "td:last span" ).length === 1, "Other months - span content" );
+	inp.datepicker( "hide" ).datepicker( "option", "selectOtherMonths", true ).datepicker( "show" );
+	equal( pop.find( "tbody" ).text(), "311234567891011121314151617181920212223242526272829301234",
+		"Other months - select" );
+	ok( pop.find( "td:last a" ).length === 1, "Other months - link content" );
+	inp.datepicker( "hide" ).datepicker( "option", "showOtherMonths", false ).datepicker( "show" );
+	equal( pop.find( "tbody" ).text(),
+
 		// support: IE <9, jQuery <1.8
 		// In IE7/8 with jQuery <1.8, encoded spaces behave in strange ways
 		$( "<span>\u00a0123456789101112131415161718192021222324252627282930\u00a0\u00a0\u00a0\u00a0</span>" ).text(),
-		"Other months - none");
-	ok(pop.find("td:last *").length === 0, "Other months - no content");
-});
+		"Other months - none" );
+	ok( pop.find( "td:last *" ).length === 0, "Other months - no content" );
+} );
 
-test("defaultDate", function() {
+test( "defaultDate", function() {
 	expect( 16 );
-	var inp = testHelper.init("#inp"),
+	var inp = testHelper.init( "#inp" ),
 		date = new Date();
-	inp.val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date null");
+	inp.val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date null" );
 
 	// Numeric values
-	inp.datepicker("option", {defaultDate: -2}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -2");
+	inp.datepicker( "option", { defaultDate: -2 } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() - 2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date -2" );
 
 	date = new Date();
-	inp.datepicker("option", {defaultDate: 3}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 3);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 3");
+	inp.datepicker( "option", { defaultDate: 3 } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() + 3 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date 3" );
 
 	date = new Date();
-	inp.datepicker("option", {defaultDate: 1 / "a"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date NaN");
+	inp.datepicker( "option", { defaultDate: 1 / "a" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date NaN" );
 
 	// String offset values
-	inp.datepicker("option", {defaultDate: "-1d"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() - 1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -1d");
-	inp.datepicker("option", {defaultDate: "+3D"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 4);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +3D");
-	inp.datepicker("option", {defaultDate: " -2 w "}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	inp.datepicker( "option", { defaultDate: "-1d" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() - 1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date -1d" );
+	inp.datepicker( "option", { defaultDate: "+3D" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() + 4 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date +3D" );
+	inp.datepicker( "option", { defaultDate: " -2 w " } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 	date = new Date();
-	date.setDate(date.getDate() - 14);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -2 w");
-	inp.datepicker("option", {defaultDate: "+1 W"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setDate(date.getDate() + 21);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +1 W");
-	inp.datepicker("option", {defaultDate: " -1 m "}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = testHelper.addMonths(new Date(), -1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -1 m");
-	inp.datepicker("option", {defaultDate: "+2M"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = testHelper.addMonths(new Date(), 2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +2M");
-	inp.datepicker("option", {defaultDate: "-2y"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	date.setDate( date.getDate() - 14 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date -2 w" );
+	inp.datepicker( "option", { defaultDate: "+1 W" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setDate( date.getDate() + 21 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date +1 W" );
+	inp.datepicker( "option", { defaultDate: " -1 m " } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date = testHelper.addMonths( new Date(), -1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date -1 m" );
+	inp.datepicker( "option", { defaultDate: "+2M" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date = testHelper.addMonths( new Date(), 2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date +2M" );
+	inp.datepicker( "option", { defaultDate: "-2y" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 	date = new Date();
-	date.setFullYear(date.getFullYear() - 2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date -2y");
-	inp.datepicker("option", {defaultDate: "+1 Y "}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date.setFullYear(date.getFullYear() + 3);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +1 Y");
-	inp.datepicker("option", {defaultDate: "+1M +10d"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = testHelper.addMonths(new Date(), 1);
-	date.setDate(date.getDate() + 10);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date +1M +10d");
+	date.setFullYear( date.getFullYear() - 2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date -2y" );
+	inp.datepicker( "option", { defaultDate: "+1 Y " } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date.setFullYear( date.getFullYear() + 3 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date +1 Y" );
+	inp.datepicker( "option", { defaultDate: "+1M +10d" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date = testHelper.addMonths( new Date(), 1 );
+	date.setDate( date.getDate() + 10 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date +1M +10d" );
+
 	// String date values
-	inp.datepicker("option", {defaultDate: "07/04/2007"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = new Date(2007, 7 - 1, 4);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 07/04/2007");
-	inp.datepicker("option", {dateFormat: "yy-mm-dd", defaultDate: "2007-04-02"}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	date = new Date(2007, 4 - 1, 2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 2007-04-02");
+	inp.datepicker( "option", { defaultDate: "07/04/2007" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date = new Date( 2007, 7 - 1, 4 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date 07/04/2007" );
+	inp.datepicker( "option", { dateFormat: "yy-mm-dd", defaultDate: "2007-04-02" } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	date = new Date( 2007, 4 - 1, 2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date 2007-04-02" );
+
 	// Date value
-	date = new Date(2007, 1 - 1, 26);
-	inp.datepicker("option", {dateFormat: "mm/dd/yy", defaultDate: date}).
-		datepicker("hide").val("").datepicker("show").
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date, "Default date 01/26/2007");
-});
-
-test("miscellaneous", function() {
+	date = new Date( 2007, 1 - 1, 26 );
+	inp.datepicker( "option", { dateFormat: "mm/dd/yy", defaultDate: date } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date, "Default date 01/26/2007" );
+} );
+
+test( "miscellaneous", function() {
 	expect( 19 );
 	var curYear, longNames, shortNames, date,
-		dp = $("#ui-datepicker-div"),
-		inp = testHelper.init("#inp");
+		dp = $( "#ui-datepicker-div" ),
+		inp = testHelper.init( "#inp" );
+
 	// Year range
-	function genRange(start, offset) {
+	function genRange( start, offset ) {
 		var i = start,
 			range = "";
-		for (; i < start + offset; i++) {
+		for ( ; i < start + offset; i++ ) {
 			range += i;
 		}
 		return range;
 	}
 	curYear = new Date().getFullYear();
-	inp.val("02/04/2008").datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), "2008", "Year range - read-only default");
-	inp.datepicker("hide").datepicker("option", {changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(2008 - 10, 21), "Year range - changeable default");
-	inp.datepicker("hide").datepicker("option", {yearRange: "c-6:c+2", changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(2008 - 6, 9), "Year range - c-6:c+2");
-	inp.datepicker("hide").datepicker("option", {yearRange: "2000:2010", changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(2000, 11), "Year range - 2000:2010");
-	inp.datepicker("hide").datepicker("option", {yearRange: "-5:+3", changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(curYear - 5, 9), "Year range - -5:+3");
-	inp.datepicker("hide").datepicker("option", {yearRange: "2000:-5", changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(2000, curYear - 2004), "Year range - 2000:-5");
-	inp.datepicker("hide").datepicker("option", {yearRange: "", changeYear: true}).datepicker("show");
-	equal(dp.find(".ui-datepicker-year").text(), genRange(curYear, 1), "Year range - -6:+2");
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-year" ).text(), "2008", "Year range - read-only default" );
+	inp.datepicker( "hide" ).datepicker( "option", { changeYear: true } ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-year" ).text(), genRange( 2008 - 10, 21 ), "Year range - changeable default" );
+	inp.datepicker( "hide" ).datepicker( "option", { yearRange: "c-6:c+2", changeYear: true } ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-year" ).text(), genRange( 2008 - 6, 9 ), "Year range - c-6:c+2" );
+	inp.datepicker( "hide" ).datepicker( "option", { yearRange: "2000:2010", changeYear: true } ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-year" ).text(), genRange( 2000, 11 ), "Year range - 2000:2010" );
+	inp.datepicker( "hide" ).datepicker( "option", { yearRange: "-5:+3", changeYear: true } ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-year" ).text(), genRange( curYear - 5, 9 ), "Year range - -5:+3" );
+	inp.datepicker( "hide" ).datepicker( "option", { yearRange: "2000:-5", changeYear: true } ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-year" ).text(), genRange( 2000, curYear - 2004 ), "Year range - 2000:-5" );
+	inp.datepicker( "hide" ).datepicker( "option", { yearRange: "", changeYear: true } ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-year" ).text(), genRange( curYear, 1 ), "Year range - -6:+2" );
 
 	// Navigation as date format
-	inp.datepicker("option", {showButtonPanel: true});
-	equal(dp.find(".ui-datepicker-prev").text(), "Prev", "Navigation prev - default");
-	equal(dp.find(".ui-datepicker-current").text(), "Today", "Navigation current - default");
-	equal(dp.find(".ui-datepicker-next").text(), "Next", "Navigation next - default");
-	inp.datepicker("hide").datepicker("option", {navigationAsDateFormat: true, prevText: "< M", currentText: "MM", nextText: "M >"}).
-		val("02/04/2008").datepicker("show");
-	longNames = $.datepicker.regional[""].monthNames;
-	shortNames = $.datepicker.regional[""].monthNamesShort;
+	inp.datepicker( "option", { showButtonPanel: true } );
+	equal( dp.find( ".ui-datepicker-prev" ).text(), "Prev", "Navigation prev - default" );
+	equal( dp.find( ".ui-datepicker-current" ).text(), "Today", "Navigation current - default" );
+	equal( dp.find( ".ui-datepicker-next" ).text(), "Next", "Navigation next - default" );
+	inp.datepicker( "hide" ).datepicker( "option", { navigationAsDateFormat: true, prevText: "< M", currentText: "MM", nextText: "M >" } ).
+		val( "02/04/2008" ).datepicker( "show" );
+	longNames = $.datepicker.regional[ "" ].monthNames;
+	shortNames = $.datepicker.regional[ "" ].monthNamesShort;
 	date = new Date();
-	equal(dp.find(".ui-datepicker-prev").text(), "< " + shortNames[0], "Navigation prev - as date format");
-	equal(dp.find(".ui-datepicker-current").text(),
-		longNames[date.getMonth()], "Navigation current - as date format");
-	equal(dp.find(".ui-datepicker-next").text(),
-		shortNames[2] + " >", "Navigation next - as date format");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN});
-	equal(dp.find(".ui-datepicker-prev").text(),
-		"< " + shortNames[1], "Navigation prev - as date format + pgdn");
-	equal(dp.find(".ui-datepicker-current").text(),
-		longNames[date.getMonth()], "Navigation current - as date format + pgdn");
-	equal(dp.find(".ui-datepicker-next").text(),
-		shortNames[3] + " >", "Navigation next - as date format + pgdn");
-	inp.datepicker("hide").datepicker("option", {gotoCurrent: true}).
-		val("02/04/2008").datepicker("show");
-	equal(dp.find(".ui-datepicker-prev").text(),
-		"< " + shortNames[0], "Navigation prev - as date format + goto current");
-	equal(dp.find(".ui-datepicker-current").text(),
-		longNames[1], "Navigation current - as date format + goto current");
-	equal(dp.find(".ui-datepicker-next").text(),
-		shortNames[2] + " >", "Navigation next - as date format + goto current");
-});
-
-test("minMax", function() {
+	equal( dp.find( ".ui-datepicker-prev" ).text(), "< " + shortNames[ 0 ], "Navigation prev - as date format" );
+	equal( dp.find( ".ui-datepicker-current" ).text(),
+		longNames[ date.getMonth() ], "Navigation current - as date format" );
+	equal( dp.find( ".ui-datepicker-next" ).text(),
+		shortNames[ 2 ] + " >", "Navigation next - as date format" );
+	inp.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+	equal( dp.find( ".ui-datepicker-prev" ).text(),
+		"< " + shortNames[ 1 ], "Navigation prev - as date format + pgdn" );
+	equal( dp.find( ".ui-datepicker-current" ).text(),
+		longNames[ date.getMonth() ], "Navigation current - as date format + pgdn" );
+	equal( dp.find( ".ui-datepicker-next" ).text(),
+		shortNames[ 3 ] + " >", "Navigation next - as date format + pgdn" );
+	inp.datepicker( "hide" ).datepicker( "option", { gotoCurrent: true } ).
+		val( "02/04/2008" ).datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-prev" ).text(),
+		"< " + shortNames[ 0 ], "Navigation prev - as date format + goto current" );
+	equal( dp.find( ".ui-datepicker-current" ).text(),
+		longNames[ 1 ], "Navigation current - as date format + goto current" );
+	equal( dp.find( ".ui-datepicker-next" ).text(),
+		shortNames[ 2 ] + " >", "Navigation next - as date format + goto current" );
+} );
+
+test( "minMax", function() {
 	expect( 23 );
 	var date,
-		inp = testHelper.init("#inp"),
-		dp = $("#ui-datepicker-div"),
-		lastYear = new Date(2007, 6 - 1, 4),
-		nextYear = new Date(2009, 6 - 1, 4),
-		minDate = new Date(2008, 2 - 1, 29),
-		maxDate = new Date(2008, 12 - 1, 7);
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), lastYear,
-		"Min/max - null, null - ctrl+pgup");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), nextYear,
-		"Min/max - null, null - ctrl+pgdn");
-	inp.datepicker("option", {minDate: minDate}).
-		datepicker("hide").val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate,
-		"Min/max - 02/29/2008, null - ctrl+pgup");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), nextYear,
-		"Min/max - 02/29/2008, null - ctrl+pgdn");
-	inp.datepicker("option", {maxDate: maxDate}).
-		datepicker("hide").val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate,
-		"Min/max - 02/29/2008, 12/07/2008 - ctrl+pgup");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate,
-		"Min/max - 02/29/2008, 12/07/2008 - ctrl+pgdn");
-	inp.datepicker("option", {minDate: null}).
-		datepicker("hide").val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), lastYear,
-		"Min/max - null, 12/07/2008 - ctrl+pgup");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate,
-		"Min/max - null, 12/07/2008 - ctrl+pgdn");
+		inp = testHelper.init( "#inp" ),
+		dp = $( "#ui-datepicker-div" ),
+		lastYear = new Date( 2007, 6 - 1, 4 ),
+		nextYear = new Date( 2009, 6 - 1, 4 ),
+		minDate = new Date( 2008, 2 - 1, 29 ),
+		maxDate = new Date( 2008, 12 - 1, 7 );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), lastYear,
+		"Min/max - null, null - ctrl+pgup" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), nextYear,
+		"Min/max - null, null - ctrl+pgdn" );
+	inp.datepicker( "option", { minDate: minDate } ).
+		datepicker( "hide" ).val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), minDate,
+		"Min/max - 02/29/2008, null - ctrl+pgup" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), nextYear,
+		"Min/max - 02/29/2008, null - ctrl+pgdn" );
+	inp.datepicker( "option", { maxDate: maxDate } ).
+		datepicker( "hide" ).val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), minDate,
+		"Min/max - 02/29/2008, 12/07/2008 - ctrl+pgup" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), maxDate,
+		"Min/max - 02/29/2008, 12/07/2008 - ctrl+pgdn" );
+	inp.datepicker( "option", { minDate: null } ).
+		datepicker( "hide" ).val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), lastYear,
+		"Min/max - null, 12/07/2008 - ctrl+pgup" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), maxDate,
+		"Min/max - null, 12/07/2008 - ctrl+pgdn" );
+
 	// Relative dates
 	date = new Date();
-	date.setDate(date.getDate() - 7);
-	inp.datepicker("option", {minDate: "-1w", maxDate: "+1 M +10 D "}).
-		datepicker("hide").val("").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date,
-		"Min/max - -1w, +1 M +10 D - ctrl+pgup");
-	date = testHelper.addMonths(new Date(), 1);
-	date.setDate(date.getDate() + 10);
-	inp.val("").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	testHelper.equalsDate(inp.datepicker("getDate"), date,
-		"Min/max - -1w, +1 M +10 D - ctrl+pgdn");
+	date.setDate( date.getDate() - 7 );
+	inp.datepicker( "option", { minDate: "-1w", maxDate: "+1 M +10 D " } ).
+		datepicker( "hide" ).val( "" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date,
+		"Min/max - -1w, +1 M +10 D - ctrl+pgup" );
+	date = testHelper.addMonths( new Date(), 1 );
+	date.setDate( date.getDate() + 10 );
+	inp.val( "" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date,
+		"Min/max - -1w, +1 M +10 D - ctrl+pgdn" );
+
 	// With existing date
-	inp = testHelper.init("#inp");
-	inp.val("06/04/2008").datepicker("option", {minDate: minDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 6 - 1, 4), "Min/max - setDate > min");
-	inp.datepicker("option", {minDate: null}).val("01/04/2008").datepicker("option", {minDate: minDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Min/max - setDate < min");
-	inp.datepicker("option", {minDate: null}).val("06/04/2008").datepicker("option", {maxDate: maxDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 6 - 1, 4), "Min/max - setDate < max");
-	inp.datepicker("option", {maxDate: null}).val("01/04/2009").datepicker("option", {maxDate: maxDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Min/max - setDate > max");
-	inp.datepicker("option", {maxDate: null}).val("01/04/2008").datepicker("option", {minDate: minDate, maxDate: maxDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Min/max - setDate < min");
-	inp.datepicker("option", {maxDate: null}).val("06/04/2008").datepicker("option", {minDate: minDate, maxDate: maxDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), new Date(2008, 6 - 1, 4), "Min/max - setDate > min, < max");
-	inp.datepicker("option", {maxDate: null}).val("01/04/2009").datepicker("option", {minDate: minDate, maxDate: maxDate});
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Min/max - setDate > max");
-
-	inp.datepicker("option", {yearRange: "-0:+1"}).val("01/01/" + new Date().getFullYear());
-	ok(dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - previous button disabled at 1/1/minYear");
-	inp.datepicker("setDate", "12/30/" + new Date().getFullYear());
-	ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - next button disabled at 12/30/maxYear");
-
-	inp.datepicker("option", {
-		minDate: new Date(1900, 0, 1),
+	inp = testHelper.init( "#inp" );
+	inp.val( "06/04/2008" ).datepicker( "option", { minDate: minDate } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 6 - 1, 4 ), "Min/max - setDate > min" );
+	inp.datepicker( "option", { minDate: null } ).val( "01/04/2008" ).datepicker( "option", { minDate: minDate } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), minDate, "Min/max - setDate < min" );
+	inp.datepicker( "option", { minDate: null } ).val( "06/04/2008" ).datepicker( "option", { maxDate: maxDate } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 6 - 1, 4 ), "Min/max - setDate < max" );
+	inp.datepicker( "option", { maxDate: null } ).val( "01/04/2009" ).datepicker( "option", { maxDate: maxDate } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), maxDate, "Min/max - setDate > max" );
+	inp.datepicker( "option", { maxDate: null } ).val( "01/04/2008" ).datepicker( "option", { minDate: minDate, maxDate: maxDate } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), minDate, "Min/max - setDate < min" );
+	inp.datepicker( "option", { maxDate: null } ).val( "06/04/2008" ).datepicker( "option", { minDate: minDate, maxDate: maxDate } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 6 - 1, 4 ), "Min/max - setDate > min, < max" );
+	inp.datepicker( "option", { maxDate: null } ).val( "01/04/2009" ).datepicker( "option", { minDate: minDate, maxDate: maxDate } );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), maxDate, "Min/max - setDate > max" );
+
+	inp.datepicker( "option", { yearRange: "-0:+1" } ).val( "01/01/" + new Date().getFullYear() );
+	ok( dp.find( ".ui-datepicker-prev" ).hasClass( "ui-state-disabled" ), "Year Range Test - previous button disabled at 1/1/minYear" );
+	inp.datepicker( "setDate", "12/30/" + new Date().getFullYear() );
+	ok( dp.find( ".ui-datepicker-next" ).hasClass( "ui-state-disabled" ), "Year Range Test - next button disabled at 12/30/maxYear" );
+
+	inp.datepicker( "option", {
+		minDate: new Date( 1900, 0, 1 ),
 		maxDate: "-7Y",
 		yearRange: "1900:-7"
-	}).val( "" );
-	ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - relative - next button disabled");
-	ok(!dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - relative - prev button enabled");
+	} ).val( "" );
+	ok( dp.find( ".ui-datepicker-next" ).hasClass( "ui-state-disabled" ), "Year Range Test - relative - next button disabled" );
+	ok( !dp.find( ".ui-datepicker-prev" ).hasClass( "ui-state-disabled" ), "Year Range Test - relative - prev button enabled" );
 
-	inp.datepicker("option", {
-		minDate: new Date(1900, 0, 1),
+	inp.datepicker( "option", {
+		minDate: new Date( 1900, 0, 1 ),
 		maxDate: "1/25/2007",
 		yearRange: "1900:2007"
-	}).val( "" );
-	ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - absolute - next button disabled");
-	ok(!dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - absolute - prev button enabled");
-});
+	} ).val( "" );
+	ok( dp.find( ".ui-datepicker-next" ).hasClass( "ui-state-disabled" ), "Year Range Test - absolute - next button disabled" );
+	ok( !dp.find( ".ui-datepicker-prev" ).hasClass( "ui-state-disabled" ), "Year Range Test - absolute - prev button enabled" );
+} );
 
-test("setDate", function() {
+test( "setDate", function() {
 	expect( 24 );
 	var inl, alt, minDate, maxDate, dateAndTimeToSet, dateAndTimeClone,
-		inp = testHelper.init("#inp"),
-		date1 = new Date(2008, 6 - 1, 4),
+		inp = testHelper.init( "#inp" ),
+		date1 = new Date( 2008, 6 - 1, 4 ),
 		date2 = new Date();
-	ok(inp.datepicker("getDate") == null, "Set date - default");
-	inp.datepicker("setDate", date1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - 2008-06-04");
+	ok( inp.datepicker( "getDate" ) == null, "Set date - default" );
+	inp.datepicker( "setDate", date1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date1, "Set date - 2008-06-04" );
 	date1 = new Date();
-	date1.setDate(date1.getDate() + 7);
-	inp.datepicker("setDate", +7);
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - +7");
-	date2.setFullYear(date2.getFullYear() + 2);
-	inp.datepicker("setDate", "+2y");
-	testHelper.equalsDate(inp.datepicker("getDate"), date2, "Set date - +2y");
-	inp.datepicker("setDate", date1, date2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - two dates");
-	inp.datepicker("setDate");
-	ok(inp.datepicker("getDate") == null, "Set date - null");
+	date1.setDate( date1.getDate() + 7 );
+	inp.datepicker( "setDate", +7 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date1, "Set date - +7" );
+	date2.setFullYear( date2.getFullYear() + 2 );
+	inp.datepicker( "setDate", "+2y" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date2, "Set date - +2y" );
+	inp.datepicker( "setDate", date1, date2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date1, "Set date - two dates" );
+	inp.datepicker( "setDate" );
+	ok( inp.datepicker( "getDate" ) == null, "Set date - null" );
+
 	// Relative to current date
 	date1 = new Date();
-	date1.setDate(date1.getDate() + 7);
-	inp.datepicker("setDate", "c +7");
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - c +7");
-	date1.setDate(date1.getDate() + 7);
-	inp.datepicker("setDate", "c+7");
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - c+7");
-	date1.setDate(date1.getDate() - 21);
-	inp.datepicker("setDate", "c -3 w");
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date - c -3 w");
+	date1.setDate( date1.getDate() + 7 );
+	inp.datepicker( "setDate", "c +7" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date1, "Set date - c +7" );
+	date1.setDate( date1.getDate() + 7 );
+	inp.datepicker( "setDate", "c+7" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date1, "Set date - c+7" );
+	date1.setDate( date1.getDate() - 21 );
+	inp.datepicker( "setDate", "c -3 w" );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date1, "Set date - c -3 w" );
+
 	// Inline
-	inl = testHelper.init("#inl");
-	date1 = new Date(2008, 6 - 1, 4);
+	inl = testHelper.init( "#inl" );
+	date1 = new Date( 2008, 6 - 1, 4 );
 	date2 = new Date();
-	testHelper.equalsDate(inl.datepicker("getDate"), date2, "Set date inline - default");
-	inl.datepicker("setDate", date1);
-	testHelper.equalsDate(inl.datepicker("getDate"), date1, "Set date inline - 2008-06-04");
+	testHelper.equalsDate( inl.datepicker( "getDate" ), date2, "Set date inline - default" );
+	inl.datepicker( "setDate", date1 );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), date1, "Set date inline - 2008-06-04" );
 	date1 = new Date();
-	date1.setDate(date1.getDate() + 7);
-	inl.datepicker("setDate", +7);
-	testHelper.equalsDate(inl.datepicker("getDate"), date1, "Set date inline - +7");
-	date2.setFullYear(date2.getFullYear() + 2);
-	inl.datepicker("setDate", "+2y");
-	testHelper.equalsDate(inl.datepicker("getDate"), date2, "Set date inline - +2y");
-	inl.datepicker("setDate", date1, date2);
-	testHelper.equalsDate(inl.datepicker("getDate"), date1, "Set date inline - two dates");
-	inl.datepicker("setDate");
-	ok(inl.datepicker("getDate") == null, "Set date inline - null");
+	date1.setDate( date1.getDate() + 7 );
+	inl.datepicker( "setDate", +7 );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), date1, "Set date inline - +7" );
+	date2.setFullYear( date2.getFullYear() + 2 );
+	inl.datepicker( "setDate", "+2y" );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), date2, "Set date inline - +2y" );
+	inl.datepicker( "setDate", date1, date2 );
+	testHelper.equalsDate( inl.datepicker( "getDate" ), date1, "Set date inline - two dates" );
+	inl.datepicker( "setDate" );
+	ok( inl.datepicker( "getDate" ) == null, "Set date inline - null" );
+
 	// Alternate field
-	alt = $("#alt");
-	inp.datepicker("option", {altField: "#alt", altFormat: "yy-mm-dd"});
-	date1 = new Date(2008, 6 - 1, 4);
-	inp.datepicker("setDate", date1);
-	equal(inp.val(), "06/04/2008", "Set date alternate - 06/04/2008");
-	equal(alt.val(), "2008-06-04", "Set date alternate - 2008-06-04");
+	alt = $( "#alt" );
+	inp.datepicker( "option", { altField: "#alt", altFormat: "yy-mm-dd" } );
+	date1 = new Date( 2008, 6 - 1, 4 );
+	inp.datepicker( "setDate", date1 );
+	equal( inp.val(), "06/04/2008", "Set date alternate - 06/04/2008" );
+	equal( alt.val(), "2008-06-04", "Set date alternate - 2008-06-04" );
+
 	// With minimum/maximum
-	inp = testHelper.init("#inp");
-	date1 = new Date(2008, 1 - 1, 4);
-	date2 = new Date(2008, 6 - 1, 4);
-	minDate = new Date(2008, 2 - 1, 29);
-	maxDate = new Date(2008, 3 - 1, 28);
-	inp.val("").datepicker("option", {minDate: minDate}).datepicker("setDate", date2);
-	testHelper.equalsDate(inp.datepicker("getDate"), date2, "Set date min/max - setDate > min");
-	inp.datepicker("setDate", date1);
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Set date min/max - setDate < min");
-	inp.val("").datepicker("option", {maxDate: maxDate, minDate: null}).datepicker("setDate", date1);
-	testHelper.equalsDate(inp.datepicker("getDate"), date1, "Set date min/max - setDate < max");
-	inp.datepicker("setDate", date2);
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Set date min/max - setDate > max");
-	inp.val("").datepicker("option", {minDate: minDate}).datepicker("setDate", date1);
-	testHelper.equalsDate(inp.datepicker("getDate"), minDate, "Set date min/max - setDate < min");
-	inp.datepicker("setDate", date2);
-	testHelper.equalsDate(inp.datepicker("getDate"), maxDate, "Set date min/max - setDate > max");
-	dateAndTimeToSet = new Date(2008, 3 - 1, 28, 1, 11, 0);
-	dateAndTimeClone = new Date(2008, 3 - 1, 28, 1, 11, 0);
-	inp.datepicker("setDate", dateAndTimeToSet);
-	equal(dateAndTimeToSet.getTime(), dateAndTimeClone.getTime(), "Date object passed should not be changed by setDate");
-});
-
-test("altField", function() {
+	inp = testHelper.init( "#inp" );
+	date1 = new Date( 2008, 1 - 1, 4 );
+	date2 = new Date( 2008, 6 - 1, 4 );
+	minDate = new Date( 2008, 2 - 1, 29 );
+	maxDate = new Date( 2008, 3 - 1, 28 );
+	inp.val( "" ).datepicker( "option", { minDate: minDate } ).datepicker( "setDate", date2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date2, "Set date min/max - setDate > min" );
+	inp.datepicker( "setDate", date1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), minDate, "Set date min/max - setDate < min" );
+	inp.val( "" ).datepicker( "option", { maxDate: maxDate, minDate: null } ).datepicker( "setDate", date1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), date1, "Set date min/max - setDate < max" );
+	inp.datepicker( "setDate", date2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), maxDate, "Set date min/max - setDate > max" );
+	inp.val( "" ).datepicker( "option", { minDate: minDate } ).datepicker( "setDate", date1 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), minDate, "Set date min/max - setDate < min" );
+	inp.datepicker( "setDate", date2 );
+	testHelper.equalsDate( inp.datepicker( "getDate" ), maxDate, "Set date min/max - setDate > max" );
+	dateAndTimeToSet = new Date( 2008, 3 - 1, 28, 1, 11, 0 );
+	dateAndTimeClone = new Date( 2008, 3 - 1, 28, 1, 11, 0 );
+	inp.datepicker( "setDate", dateAndTimeToSet );
+	equal( dateAndTimeToSet.getTime(), dateAndTimeClone.getTime(), "Date object passed should not be changed by setDate" );
+} );
+
+test( "altField", function() {
 	expect( 10 );
-	var inp = testHelper.init("#inp"),
-		alt = $("#alt");
+	var inp = testHelper.init( "#inp" ),
+		alt = $( "#alt" );
+
 	// No alternate field set
-	alt.val("");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	equal(inp.val(), "06/04/2008", "Alt field - dp - enter");
-	equal(alt.val(), "", "Alt field - alt not set");
+	alt.val( "" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	equal( inp.val(), "06/04/2008", "Alt field - dp - enter" );
+	equal( alt.val(), "", "Alt field - alt not set" );
+
 	// Alternate field set
-	alt.val("");
-	inp.datepicker("option", {altField: "#alt", altFormat: "yy-mm-dd"}).
-		val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	equal(inp.val(), "06/04/2008", "Alt field - dp - enter");
-	equal(alt.val(), "2008-06-04", "Alt field - alt - enter");
+	alt.val( "" );
+	inp.datepicker( "option", { altField: "#alt", altFormat: "yy-mm-dd" } ).
+		val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	equal( inp.val(), "06/04/2008", "Alt field - dp - enter" );
+	equal( alt.val(), "2008-06-04", "Alt field - alt - enter" );
+
 	// Move from initial date
-	alt.val("");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-	equal(inp.val(), "07/04/2008", "Alt field - dp - pgdn");
-	equal(alt.val(), "2008-07-04", "Alt field - alt - pgdn");
+	alt.val( "" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+	equal( inp.val(), "07/04/2008", "Alt field - dp - pgdn" );
+	equal( alt.val(), "2008-07-04", "Alt field - alt - pgdn" );
+
 	// Alternate field set - closed
-	alt.val("");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-		simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-	equal(inp.val(), "06/04/2008", "Alt field - dp - pgdn/esc");
-	equal(alt.val(), "", "Alt field - alt - pgdn/esc");
+	alt.val( "" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ).
+		simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+	equal( inp.val(), "06/04/2008", "Alt field - dp - pgdn/esc" );
+	equal( alt.val(), "", "Alt field - alt - pgdn/esc" );
+
 	// Clear date and alternate
-	alt.val("");
-	inp.val("06/04/2008").datepicker("show");
-	inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.END});
-	equal(inp.val(), "", "Alt field - dp - ctrl+end");
-	equal(alt.val(), "", "Alt field - alt - ctrl+end");
-});
-
-test("autoSize", function() {
+	alt.val( "" );
+	inp.val( "06/04/2008" ).datepicker( "show" );
+	inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.END } );
+	equal( inp.val(), "", "Alt field - dp - ctrl+end" );
+	equal( alt.val(), "", "Alt field - alt - ctrl+end" );
+} );
+
+test( "autoSize", function() {
 	expect( 15 );
-	var inp = testHelper.init("#inp");
-	equal(inp.prop("size"), 20, "Auto size - default");
-	inp.datepicker("option", "autoSize", true);
-	equal(inp.prop("size"), 10, "Auto size - mm/dd/yy");
-	inp.datepicker("option", "dateFormat", "m/d/yy");
-	equal(inp.prop("size"), 10, "Auto size - m/d/yy");
-	inp.datepicker("option", "dateFormat", "D M d yy");
-	equal(inp.prop("size"), 15, "Auto size - D M d yy");
-	inp.datepicker("option", "dateFormat", "DD, MM dd, yy");
-	equal(inp.prop("size"), 29, "Auto size - DD, MM dd, yy");
+	var inp = testHelper.init( "#inp" );
+	equal( inp.prop( "size" ), 20, "Auto size - default" );
+	inp.datepicker( "option", "autoSize", true );
+	equal( inp.prop( "size" ), 10, "Auto size - mm/dd/yy" );
+	inp.datepicker( "option", "dateFormat", "m/d/yy" );
+	equal( inp.prop( "size" ), 10, "Auto size - m/d/yy" );
+	inp.datepicker( "option", "dateFormat", "D M d yy" );
+	equal( inp.prop( "size" ), 15, "Auto size - D M d yy" );
+	inp.datepicker( "option", "dateFormat", "DD, MM dd, yy" );
+	equal( inp.prop( "size" ), 29, "Auto size - DD, MM dd, yy" );
 
 	// French
-	inp.datepicker("option", $.extend({autoSize: false}, $.datepicker.regional.fr));
-	equal(inp.prop("size"), 29, "Auto size - fr - default");
-	inp.datepicker("option", "autoSize", true);
-	equal(inp.prop("size"), 10, "Auto size - fr - dd/mm/yy");
-	inp.datepicker("option", "dateFormat", "m/d/yy");
-	equal(inp.prop("size"), 10, "Auto size - fr - m/d/yy");
-	inp.datepicker("option", "dateFormat", "D M d yy");
-	equal(inp.prop("size"), 18, "Auto size - fr - D M d yy");
-	inp.datepicker("option", "dateFormat", "DD, MM dd, yy");
-	equal(inp.prop("size"), 28, "Auto size - fr - DD, MM dd, yy");
+	inp.datepicker( "option", $.extend( { autoSize: false }, $.datepicker.regional.fr ) );
+	equal( inp.prop( "size" ), 29, "Auto size - fr - default" );
+	inp.datepicker( "option", "autoSize", true );
+	equal( inp.prop( "size" ), 10, "Auto size - fr - dd/mm/yy" );
+	inp.datepicker( "option", "dateFormat", "m/d/yy" );
+	equal( inp.prop( "size" ), 10, "Auto size - fr - m/d/yy" );
+	inp.datepicker( "option", "dateFormat", "D M d yy" );
+	equal( inp.prop( "size" ), 18, "Auto size - fr - D M d yy" );
+	inp.datepicker( "option", "dateFormat", "DD, MM dd, yy" );
+	equal( inp.prop( "size" ), 28, "Auto size - fr - DD, MM dd, yy" );
 
 	// Hebrew
-	inp.datepicker("option", $.extend({autoSize: false}, $.datepicker.regional.he));
-	equal(inp.prop("size"), 28, "Auto size - he - default");
-	inp.datepicker("option", "autoSize", true);
-	equal(inp.prop("size"), 10, "Auto size - he - dd/mm/yy");
-	inp.datepicker("option", "dateFormat", "m/d/yy");
-	equal(inp.prop("size"), 10, "Auto size - he - m/d/yy");
-	inp.datepicker("option", "dateFormat", "D M d yy");
-	equal(inp.prop("size"), 16, "Auto size - he - D M d yy");
-	inp.datepicker("option", "dateFormat", "DD, MM dd, yy");
-	equal(inp.prop("size"), 23, "Auto size - he - DD, MM dd, yy");
-});
-
-test("daylightSaving", function() {
+	inp.datepicker( "option", $.extend( { autoSize: false }, $.datepicker.regional.he ) );
+	equal( inp.prop( "size" ), 28, "Auto size - he - default" );
+	inp.datepicker( "option", "autoSize", true );
+	equal( inp.prop( "size" ), 10, "Auto size - he - dd/mm/yy" );
+	inp.datepicker( "option", "dateFormat", "m/d/yy" );
+	equal( inp.prop( "size" ), 10, "Auto size - he - m/d/yy" );
+	inp.datepicker( "option", "dateFormat", "D M d yy" );
+	equal( inp.prop( "size" ), 16, "Auto size - he - D M d yy" );
+	inp.datepicker( "option", "dateFormat", "DD, MM dd, yy" );
+	equal( inp.prop( "size" ), 23, "Auto size - he - DD, MM dd, yy" );
+} );
+
+test( "daylightSaving", function() {
 	expect( 25 );
-	var inp = testHelper.init("#inp"),
-		dp = $("#ui-datepicker-div");
-	ok(true, "Daylight saving - " + new Date());
+	var inp = testHelper.init( "#inp" ),
+		dp = $( "#ui-datepicker-div" );
+	ok( true, "Daylight saving - " + new Date() );
+
 	// Australia, Sydney - AM change, southern hemisphere
-	inp.val("04/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(6) a", dp).simulate("click");
-	equal(inp.val(), "04/05/2008", "Daylight saving - Australia 04/05/2008");
-	inp.val("04/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(7) a", dp).simulate("click");
-	equal(inp.val(), "04/06/2008", "Daylight saving - Australia 04/06/2008");
-	inp.val("04/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(8) a", dp).simulate("click");
-	equal(inp.val(), "04/07/2008", "Daylight saving - Australia 04/07/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(6) a", dp).simulate("click");
-	equal(inp.val(), "10/04/2008", "Daylight saving - Australia 10/04/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(7) a", dp).simulate("click");
-	equal(inp.val(), "10/05/2008", "Daylight saving - Australia 10/05/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(8) a", dp).simulate("click");
-	equal(inp.val(), "10/06/2008", "Daylight saving - Australia 10/06/2008");
+	inp.val( "04/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(6) a", dp ).simulate( "click" );
+	equal( inp.val(), "04/05/2008", "Daylight saving - Australia 04/05/2008" );
+	inp.val( "04/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(7) a", dp ).simulate( "click" );
+	equal( inp.val(), "04/06/2008", "Daylight saving - Australia 04/06/2008" );
+	inp.val( "04/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(8) a", dp ).simulate( "click" );
+	equal( inp.val(), "04/07/2008", "Daylight saving - Australia 04/07/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(6) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/04/2008", "Daylight saving - Australia 10/04/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(7) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/05/2008", "Daylight saving - Australia 10/05/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(8) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/06/2008", "Daylight saving - Australia 10/06/2008" );
+
 	// Brasil, Brasilia - midnight change, southern hemisphere
-	inp.val("02/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(20) a", dp).simulate("click");
-	equal(inp.val(), "02/16/2008", "Daylight saving - Brasil 02/16/2008");
-	inp.val("02/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(21) a", dp).simulate("click");
-	equal(inp.val(), "02/17/2008", "Daylight saving - Brasil 02/17/2008");
-	inp.val("02/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(22) a", dp).simulate("click");
-	equal(inp.val(), "02/18/2008", "Daylight saving - Brasil 02/18/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(13) a", dp).simulate("click");
-	equal(inp.val(), "10/11/2008", "Daylight saving - Brasil 10/11/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(14) a", dp).simulate("click");
-	equal(inp.val(), "10/12/2008", "Daylight saving - Brasil 10/12/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(15) a", dp).simulate("click");
-	equal(inp.val(), "10/13/2008", "Daylight saving - Brasil 10/13/2008");
+	inp.val( "02/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(20) a", dp ).simulate( "click" );
+	equal( inp.val(), "02/16/2008", "Daylight saving - Brasil 02/16/2008" );
+	inp.val( "02/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(21) a", dp ).simulate( "click" );
+	equal( inp.val(), "02/17/2008", "Daylight saving - Brasil 02/17/2008" );
+	inp.val( "02/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(22) a", dp ).simulate( "click" );
+	equal( inp.val(), "02/18/2008", "Daylight saving - Brasil 02/18/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(13) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/11/2008", "Daylight saving - Brasil 10/11/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(14) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/12/2008", "Daylight saving - Brasil 10/12/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(15) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/13/2008", "Daylight saving - Brasil 10/13/2008" );
+
 	// Lebanon, Beirut - midnight change, northern hemisphere
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(34) a", dp).simulate("click");
-	equal(inp.val(), "03/29/2008", "Daylight saving - Lebanon 03/29/2008");
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(35) a", dp).simulate("click");
-	equal(inp.val(), "03/30/2008", "Daylight saving - Lebanon 03/30/2008");
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(36) a", dp).simulate("click");
-	equal(inp.val(), "03/31/2008", "Daylight saving - Lebanon 03/31/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(27) a", dp).simulate("click");
-	equal(inp.val(), "10/25/2008", "Daylight saving - Lebanon 10/25/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(28) a", dp).simulate("click");
-	equal(inp.val(), "10/26/2008", "Daylight saving - Lebanon 10/26/2008");
-	inp.val("10/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(29) a", dp).simulate("click");
-	equal(inp.val(), "10/27/2008", "Daylight saving - Lebanon 10/27/2008");
+	inp.val( "03/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(34) a", dp ).simulate( "click" );
+	equal( inp.val(), "03/29/2008", "Daylight saving - Lebanon 03/29/2008" );
+	inp.val( "03/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(35) a", dp ).simulate( "click" );
+	equal( inp.val(), "03/30/2008", "Daylight saving - Lebanon 03/30/2008" );
+	inp.val( "03/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(36) a", dp ).simulate( "click" );
+	equal( inp.val(), "03/31/2008", "Daylight saving - Lebanon 03/31/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(27) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/25/2008", "Daylight saving - Lebanon 10/25/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(28) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/26/2008", "Daylight saving - Lebanon 10/26/2008" );
+	inp.val( "10/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(29) a", dp ).simulate( "click" );
+	equal( inp.val(), "10/27/2008", "Daylight saving - Lebanon 10/27/2008" );
+
 	// US, Eastern - AM change, northern hemisphere
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(13) a", dp).simulate("click");
-	equal(inp.val(), "03/08/2008", "Daylight saving - US 03/08/2008");
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(14) a", dp).simulate("click");
-	equal(inp.val(), "03/09/2008", "Daylight saving - US 03/09/2008");
-	inp.val("03/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(15) a", dp).simulate("click");
-	equal(inp.val(), "03/10/2008", "Daylight saving - US 03/10/2008");
-	inp.val("11/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(6) a", dp).simulate("click");
-	equal(inp.val(), "11/01/2008", "Daylight saving - US 11/01/2008");
-	inp.val("11/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(7) a", dp).simulate("click");
-	equal(inp.val(), "11/02/2008", "Daylight saving - US 11/02/2008");
-	inp.val("11/01/2008").datepicker("show");
-	$(".ui-datepicker-calendar td:eq(8) a", dp).simulate("click");
-	equal(inp.val(), "11/03/2008", "Daylight saving - US 11/03/2008");
-});
+	inp.val( "03/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(13) a", dp ).simulate( "click" );
+	equal( inp.val(), "03/08/2008", "Daylight saving - US 03/08/2008" );
+	inp.val( "03/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(14) a", dp ).simulate( "click" );
+	equal( inp.val(), "03/09/2008", "Daylight saving - US 03/09/2008" );
+	inp.val( "03/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(15) a", dp ).simulate( "click" );
+	equal( inp.val(), "03/10/2008", "Daylight saving - US 03/10/2008" );
+	inp.val( "11/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(6) a", dp ).simulate( "click" );
+	equal( inp.val(), "11/01/2008", "Daylight saving - US 11/01/2008" );
+	inp.val( "11/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(7) a", dp ).simulate( "click" );
+	equal( inp.val(), "11/02/2008", "Daylight saving - US 11/02/2008" );
+	inp.val( "11/01/2008" ).datepicker( "show" );
+	$( ".ui-datepicker-calendar td:eq(8) a", dp ).simulate( "click" );
+	equal( inp.val(), "11/03/2008", "Daylight saving - US 11/03/2008" );
+} );
 
 var beforeShowThis = null,
 	beforeShowInput = null,
@@ -770,316 +792,318 @@ var beforeShowThis = null,
 	beforeShowDayThis = null,
 	beforeShowDayOK = true;
 
-function beforeAll(input, inst) {
+function beforeAll( input, inst ) {
 	beforeShowThis = this;
 	beforeShowInput = input;
 	beforeShowInst = inst;
-	return {currentText: "Current"};
+	return { currentText: "Current" };
 }
 
-function beforeDay(date) {
+function beforeDay( date ) {
 	beforeShowDayThis = this;
-	beforeShowDayOK &= (date > new Date(2008, 1 - 1, 26) &&
-		date < new Date(2008, 3 - 1, 6));
-	return [(date.getDate() % 2 === 0), (date.getDate() % 10 === 0 ? "day10" : ""),
-		(date.getDate() % 3 === 0 ? "Divisble by 3" : "")];
+	beforeShowDayOK &= ( date > new Date( 2008, 1 - 1, 26 ) &&
+		date < new Date( 2008, 3 - 1, 6 ) );
+	return [ ( date.getDate() % 2 === 0 ), ( date.getDate() % 10 === 0 ? "day10" : "" ),
+		( date.getDate() % 3 === 0 ? "Divisble by 3" : "" ) ];
 }
 
-test("callbacks", function() {
+test( "callbacks", function() {
 	expect( 13 );
+
 	// Before show
 	var dp, day20, day21,
-		inp = testHelper.init("#inp", {beforeShow: beforeAll}),
-		inst = $.data(inp[0], "datepicker");
-	equal($.datepicker._get(inst, "currentText"), "Today", "Before show - initial");
-	inp.val("02/04/2008").datepicker("show");
-	equal($.datepicker._get(inst, "currentText"), "Current", "Before show - changed");
-	ok(beforeShowThis.id === inp[0].id, "Before show - this OK");
-	ok(beforeShowInput.id === inp[0].id, "Before show - input OK");
-	deepEqual(beforeShowInst, inst, "Before show - inst OK");
-	inp.datepicker("hide").datepicker("destroy");
+		inp = testHelper.init( "#inp", { beforeShow: beforeAll } ),
+		inst = $.data( inp[ 0 ], "datepicker" );
+	equal( $.datepicker._get( inst, "currentText" ), "Today", "Before show - initial" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	equal( $.datepicker._get( inst, "currentText" ), "Current", "Before show - changed" );
+	ok( beforeShowThis.id === inp[ 0 ].id, "Before show - this OK" );
+	ok( beforeShowInput.id === inp[ 0 ].id, "Before show - input OK" );
+	deepEqual( beforeShowInst, inst, "Before show - inst OK" );
+	inp.datepicker( "hide" ).datepicker( "destroy" );
+
 	// Before show day
-	inp = testHelper.init("#inp", {beforeShowDay: beforeDay});
-	dp = $("#ui-datepicker-div");
-	inp.val("02/04/2008").datepicker("show");
-	ok(beforeShowDayThis.id === inp[0].id, "Before show day - this OK");
-	ok(beforeShowDayOK, "Before show day - dates OK");
-	day20 = dp.find(".ui-datepicker-calendar td:contains('20')");
-	day21 = dp.find(".ui-datepicker-calendar td:contains('21')");
-	ok(!day20.is(".ui-datepicker-unselectable"), "Before show day - unselectable 20");
-	ok(day21.is(".ui-datepicker-unselectable"), "Before show day - unselectable 21");
-	ok(day20.is(".day10"), "Before show day - CSS 20");
-	ok(!day21.is(".day10"), "Before show day - CSS 21");
-	ok(!day20.attr("title"), "Before show day - title 20");
-	ok(day21.attr("title") === "Divisble by 3", "Before show day - title 21");
-	inp.datepicker("hide").datepicker("destroy");
-});
-
-test("beforeShowDay - tooltips with quotes", function() {
+	inp = testHelper.init( "#inp", { beforeShowDay: beforeDay } );
+	dp = $( "#ui-datepicker-div" );
+	inp.val( "02/04/2008" ).datepicker( "show" );
+	ok( beforeShowDayThis.id === inp[ 0 ].id, "Before show day - this OK" );
+	ok( beforeShowDayOK, "Before show day - dates OK" );
+	day20 = dp.find( ".ui-datepicker-calendar td:contains('20')" );
+	day21 = dp.find( ".ui-datepicker-calendar td:contains('21')" );
+	ok( !day20.is( ".ui-datepicker-unselectable" ), "Before show day - unselectable 20" );
+	ok( day21.is( ".ui-datepicker-unselectable" ), "Before show day - unselectable 21" );
+	ok( day20.is( ".day10" ), "Before show day - CSS 20" );
+	ok( !day21.is( ".day10" ), "Before show day - CSS 21" );
+	ok( !day20.attr( "title" ), "Before show day - title 20" );
+	ok( day21.attr( "title" ) === "Divisble by 3", "Before show day - title 21" );
+	inp.datepicker( "hide" ).datepicker( "destroy" );
+} );
+
+test( "beforeShowDay - tooltips with quotes", function() {
 	expect( 1 );
 	var inp, dp;
-	inp = testHelper.init("#inp", {
+	inp = testHelper.init( "#inp", {
 		beforeShowDay: function() {
 			return [ true, "", "'" ];
 		}
-	});
-	dp = $("#ui-datepicker-div");
+	} );
+	dp = $( "#ui-datepicker-div" );
 
-	inp.datepicker("show");
-	equal( dp.find( ".ui-datepicker-calendar td:contains('9')").attr( "title" ), "'" );
-	inp.datepicker("hide").datepicker("destroy");
-});
+	inp.datepicker( "show" );
+	equal( dp.find( ".ui-datepicker-calendar td:contains('9')" ).attr( "title" ), "'" );
+	inp.datepicker( "hide" ).datepicker( "destroy" );
+} );
 
-test("localisation", function() {
+test( "localisation", function() {
 	expect( 24 );
 	var dp, month, day, date,
-		inp = testHelper.init("#inp", $.datepicker.regional.fr);
-	inp.datepicker("option", {dateFormat: "DD, d MM yy", showButtonPanel:true, changeMonth:true, changeYear:true}).val("").datepicker("show");
-	dp = $("#ui-datepicker-div");
-	equal($(".ui-datepicker-close", dp).text(), "Fermer", "Localisation - close");
-	$(".ui-datepicker-close", dp).simulate("mouseover");
-	equal($(".ui-datepicker-prev", dp).text(), "Précédent", "Localisation - previous");
-	equal($(".ui-datepicker-current", dp).text(), "Aujourd'hui", "Localisation - current");
-	equal($(".ui-datepicker-next", dp).text(), "Suivant", "Localisation - next");
+		inp = testHelper.init( "#inp", $.datepicker.regional.fr );
+	inp.datepicker( "option", { dateFormat: "DD, d MM yy", showButtonPanel:true, changeMonth:true, changeYear:true } ).val( "" ).datepicker( "show" );
+	dp = $( "#ui-datepicker-div" );
+	equal( $( ".ui-datepicker-close", dp ).text(), "Fermer", "Localisation - close" );
+	$( ".ui-datepicker-close", dp ).simulate( "mouseover" );
+	equal( $( ".ui-datepicker-prev", dp ).text(), "Précédent", "Localisation - previous" );
+	equal( $( ".ui-datepicker-current", dp ).text(), "Aujourd'hui", "Localisation - current" );
+	equal( $( ".ui-datepicker-next", dp ).text(), "Suivant", "Localisation - next" );
 	month = 0;
-	$(".ui-datepicker-month option", dp).each(function() {
-		equal($(this).text(), $.datepicker.regional.fr.monthNamesShort[month],
-			"Localisation - month " + month);
+	$( ".ui-datepicker-month option", dp ).each( function() {
+		equal( $( this ).text(), $.datepicker.regional.fr.monthNamesShort[ month ],
+			"Localisation - month " + month );
 		month++;
-	});
+	} );
 	day = 1;
-	$(".ui-datepicker-calendar th", dp).each(function() {
-		equal($(this).text(), $.datepicker.regional.fr.dayNamesMin[day],
-			"Localisation - day " + day);
-		day = (day + 1) % 7;
-	});
-	inp.simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+	$( ".ui-datepicker-calendar th", dp ).each( function() {
+		equal( $( this ).text(), $.datepicker.regional.fr.dayNamesMin[ day ],
+			"Localisation - day " + day );
+		day = ( day + 1 ) % 7;
+	} );
+	inp.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 	date = new Date();
-	equal(inp.val(), $.datepicker.regional.fr.dayNames[date.getDay()] + ", " +
-		date.getDate() + " " + $.datepicker.regional.fr.monthNames[date.getMonth()] +
-		" " + date.getFullYear(), "Localisation - formatting");
-});
+	equal( inp.val(), $.datepicker.regional.fr.dayNames[ date.getDay() ] + ", " +
+		date.getDate() + " " + $.datepicker.regional.fr.monthNames[ date.getMonth() ] +
+		" " + date.getFullYear(), "Localisation - formatting" );
+} );
 
-test("noWeekends", function() {
+test( "noWeekends", function() {
 	expect( 31 );
 	var i, date;
-	for (i = 1; i <= 31; i++) {
-		date = new Date(2001, 1 - 1, i);
-		deepEqual($.datepicker.noWeekends(date), [(i + 1) % 7 >= 2, ""],
-			"No weekends " + date);
+	for ( i = 1; i <= 31; i++ ) {
+		date = new Date( 2001, 1 - 1, i );
+		deepEqual( $.datepicker.noWeekends( date ), [ ( i + 1 ) % 7 >= 2, "" ],
+			"No weekends " + date );
 	}
-});
+} );
 
-test("iso8601Week", 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);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-	date = new Date(2001, 1 - 1, 7);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-	date = new Date(2001, 1 - 1, 8);
-	equal($.datepicker.iso8601Week(date), 2, "ISO 8601 week " + date);
-	date = new Date(2003, 12 - 1, 28);
-	equal($.datepicker.iso8601Week(date), 52, "ISO 8601 week " + date);
-	date = new Date(2003, 12 - 1, 29);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-	date = new Date(2004, 1 - 1, 4);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-	date = new Date(2004, 1 - 1, 5);
-	equal($.datepicker.iso8601Week(date), 2, "ISO 8601 week " + date);
-	date = new Date(2009, 12 - 1, 28);
-	equal($.datepicker.iso8601Week(date), 53, "ISO 8601 week " + date);
-	date = new Date(2010, 1 - 1, 3);
-	equal($.datepicker.iso8601Week(date), 53, "ISO 8601 week " + date);
-	date = new Date(2010, 1 - 1, 4);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-	date = new Date(2010, 1 - 1, 10);
-	equal($.datepicker.iso8601Week(date), 1, "ISO 8601 week " + date);
-});
-
-test("parseDate", function() {
+	var date = new Date( 2000, 12 - 1, 31 );
+	equal( $.datepicker.iso8601Week( date ), 52, "ISO 8601 week " + date );
+	date = new Date( 2001, 1 - 1, 1 );
+	equal( $.datepicker.iso8601Week( date ), 1, "ISO 8601 week " + date );
+	date = new Date( 2001, 1 - 1, 7 );
+	equal( $.datepicker.iso8601Week( date ), 1, "ISO 8601 week " + date );
+	date = new Date( 2001, 1 - 1, 8 );
+	equal( $.datepicker.iso8601Week( date ), 2, "ISO 8601 week " + date );
+	date = new Date( 2003, 12 - 1, 28 );
+	equal( $.datepicker.iso8601Week( date ), 52, "ISO 8601 week " + date );
+	date = new Date( 2003, 12 - 1, 29 );
+	equal( $.datepicker.iso8601Week( date ), 1, "ISO 8601 week " + date );
+	date = new Date( 2004, 1 - 1, 4 );
+	equal( $.datepicker.iso8601Week( date ), 1, "ISO 8601 week " + date );
+	date = new Date( 2004, 1 - 1, 5 );
+	equal( $.datepicker.iso8601Week( date ), 2, "ISO 8601 week " + date );
+	date = new Date( 2009, 12 - 1, 28 );
+	equal( $.datepicker.iso8601Week( date ), 53, "ISO 8601 week " + date );
+	date = new Date( 2010, 1 - 1, 3 );
+	equal( $.datepicker.iso8601Week( date ), 53, "ISO 8601 week " + date );
+	date = new Date( 2010, 1 - 1, 4 );
+	equal( $.datepicker.iso8601Week( date ), 1, "ISO 8601 week " + date );
+	date = new Date( 2010, 1 - 1, 10 );
+	equal( $.datepicker.iso8601Week( date ), 1, "ISO 8601 week " + date );
+} );
+
+test( "parseDate", function() {
 	expect( 26 );
-	testHelper.init("#inp");
+	testHelper.init( "#inp" );
 	var currentYear, gmtDate, fr, settings, zh;
-	ok($.datepicker.parseDate("d m y", "") == null, "Parse date empty");
-	testHelper.equalsDate($.datepicker.parseDate("d m y", "3 2 01"),
-		new Date(2001, 2 - 1, 3), "Parse date d m y");
-	testHelper.equalsDate($.datepicker.parseDate("dd mm yy", "03 02 2001"),
-		new Date(2001, 2 - 1, 3), "Parse date dd mm yy");
-	testHelper.equalsDate($.datepicker.parseDate("d m y", "13 12 01"),
-		new Date(2001, 12 - 1, 13), "Parse date d m y");
-	testHelper.equalsDate($.datepicker.parseDate("dd mm yy", "13 12 2001"),
-		new Date(2001, 12 - 1, 13), "Parse date dd mm yy");
-	testHelper.equalsDate($.datepicker.parseDate("y-o", "01-34"),
-		new Date(2001, 2 - 1, 3), "Parse date y-o");
-	testHelper.equalsDate($.datepicker.parseDate("yy-oo", "2001-347"),
-		new Date(2001, 12 - 1, 13), "Parse date yy-oo");
-	testHelper.equalsDate($.datepicker.parseDate("oo yy", "348 2004"),
-		new Date(2004, 12 - 1, 13), "Parse date oo yy");
-	testHelper.equalsDate($.datepicker.parseDate("D d M y", "Sat 3 Feb 01"),
-		new Date(2001, 2 - 1, 3), "Parse date D d M y");
-	testHelper.equalsDate($.datepicker.parseDate("d MM DD yy", "3 February Saturday 2001"),
-		new Date(2001, 2 - 1, 3), "Parse date dd MM DD yy");
-	testHelper.equalsDate($.datepicker.parseDate("DD, MM d, yy", "Saturday, February 3, 2001"),
-		new Date(2001, 2 - 1, 3), "Parse date DD, MM d, yy");
-	testHelper.equalsDate($.datepicker.parseDate("'day' d 'of' MM (''DD''), yy",
-		"day 3 of February ('Saturday'), 2001"), new Date(2001, 2 - 1, 3),
-		"Parse date 'day' d 'of' MM (''DD''), yy");
+	ok( $.datepicker.parseDate( "d m y", "" ) == null, "Parse date empty" );
+	testHelper.equalsDate( $.datepicker.parseDate( "d m y", "3 2 01" ),
+		new Date( 2001, 2 - 1, 3 ), "Parse date d m y" );
+	testHelper.equalsDate( $.datepicker.parseDate( "dd mm yy", "03 02 2001" ),
+		new Date( 2001, 2 - 1, 3 ), "Parse date dd mm yy" );
+	testHelper.equalsDate( $.datepicker.parseDate( "d m y", "13 12 01" ),
+		new Date( 2001, 12 - 1, 13 ), "Parse date d m y" );
+	testHelper.equalsDate( $.datepicker.parseDate( "dd mm yy", "13 12 2001" ),
+		new Date( 2001, 12 - 1, 13 ), "Parse date dd mm yy" );
+	testHelper.equalsDate( $.datepicker.parseDate( "y-o", "01-34" ),
+		new Date( 2001, 2 - 1, 3 ), "Parse date y-o" );
+	testHelper.equalsDate( $.datepicker.parseDate( "yy-oo", "2001-347" ),
+		new Date( 2001, 12 - 1, 13 ), "Parse date yy-oo" );
+	testHelper.equalsDate( $.datepicker.parseDate( "oo yy", "348 2004" ),
+		new Date( 2004, 12 - 1, 13 ), "Parse date oo yy" );
+	testHelper.equalsDate( $.datepicker.parseDate( "D d M y", "Sat 3 Feb 01" ),
+		new Date( 2001, 2 - 1, 3 ), "Parse date D d M y" );
+	testHelper.equalsDate( $.datepicker.parseDate( "d MM DD yy", "3 February Saturday 2001" ),
+		new Date( 2001, 2 - 1, 3 ), "Parse date dd MM DD yy" );
+	testHelper.equalsDate( $.datepicker.parseDate( "DD, MM d, yy", "Saturday, February 3, 2001" ),
+		new Date( 2001, 2 - 1, 3 ), "Parse date DD, MM d, yy" );
+	testHelper.equalsDate( $.datepicker.parseDate( "'day' d 'of' MM (''DD''), yy",
+		"day 3 of February ('Saturday'), 2001" ), new Date( 2001, 2 - 1, 3 ),
+		"Parse date 'day' d 'of' MM (''DD''), yy" );
 	currentYear = new Date().getFullYear();
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000) + "-02-03"),
-			new Date(currentYear, 2 - 1, 3), "Parse date y-m-d - default cutuff");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 10) + "-02-03"),
-			new Date(currentYear+10, 2 - 1, 3), "Parse date y-m-d - default cutuff");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 11) + "-02-03"),
-			new Date(currentYear-89, 2 - 1, 3), "Parse date y-m-d - default cutuff");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", "80-02-03", {shortYearCutoff: 80}),
-		new Date(2080, 2 - 1, 3), "Parse date y-m-d - cutoff 80");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", "81-02-03", {shortYearCutoff: 80}),
-		new Date(1981, 2 - 1, 3), "Parse date y-m-d - cutoff 80");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 60) + "-02-03", {shortYearCutoff: "+60"}),
-			new Date(currentYear + 60, 2 - 1, 3), "Parse date y-m-d - cutoff +60");
-	testHelper.equalsDate($.datepicker.parseDate("y-m-d", (currentYear - 2000 + 61) + "-02-03", {shortYearCutoff: "+60"}),
-			new Date(currentYear - 39, 2 - 1, 3), "Parse date y-m-d - cutoff +60");
-	gmtDate = new Date(2001, 2 - 1, 3);
-	gmtDate.setMinutes(gmtDate.getMinutes() - gmtDate.getTimezoneOffset());
-	testHelper.equalsDate($.datepicker.parseDate("@", "981158400000"), gmtDate, "Parse date @");
-	testHelper.equalsDate($.datepicker.parseDate("!", "631167552000000000"), gmtDate, "Parse date !");
+	testHelper.equalsDate( $.datepicker.parseDate( "y-m-d", ( currentYear - 2000 ) + "-02-03" ),
+			new Date( currentYear, 2 - 1, 3 ), "Parse date y-m-d - default cutuff" );
+	testHelper.equalsDate( $.datepicker.parseDate( "y-m-d", ( currentYear - 2000 + 10 ) + "-02-03" ),
+			new Date( currentYear + 10, 2 - 1, 3 ), "Parse date y-m-d - default cutuff" );
+	testHelper.equalsDate( $.datepicker.parseDate( "y-m-d", ( currentYear - 2000 + 11 ) + "-02-03" ),
+			new Date( currentYear - 89, 2 - 1, 3 ), "Parse date y-m-d - default cutuff" );
+	testHelper.equalsDate( $.datepicker.parseDate( "y-m-d", "80-02-03", { shortYearCutoff: 80 } ),
+		new Date( 2080, 2 - 1, 3 ), "Parse date y-m-d - cutoff 80" );
+	testHelper.equalsDate( $.datepicker.parseDate( "y-m-d", "81-02-03", { shortYearCutoff: 80 } ),
+		new Date( 1981, 2 - 1, 3 ), "Parse date y-m-d - cutoff 80" );
+	testHelper.equalsDate( $.datepicker.parseDate( "y-m-d", ( currentYear - 2000 + 60 ) + "-02-03", { shortYearCutoff: "+60" } ),
+			new Date( currentYear + 60, 2 - 1, 3 ), "Parse date y-m-d - cutoff +60" );
+	testHelper.equalsDate( $.datepicker.parseDate( "y-m-d", ( currentYear - 2000 + 61 ) + "-02-03", { shortYearCutoff: "+60" } ),
+			new Date( currentYear - 39, 2 - 1, 3 ), "Parse date y-m-d - cutoff +60" );
+	gmtDate = new Date( 2001, 2 - 1, 3 );
+	gmtDate.setMinutes( gmtDate.getMinutes() - gmtDate.getTimezoneOffset() );
+	testHelper.equalsDate( $.datepicker.parseDate( "@", "981158400000" ), gmtDate, "Parse date @" );
+	testHelper.equalsDate( $.datepicker.parseDate( "!", "631167552000000000" ), gmtDate, "Parse date !" );
 
 	fr = $.datepicker.regional.fr;
-	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
-		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
-	testHelper.equalsDate($.datepicker.parseDate("D d M y", "Lun. 9 avr. 01", settings),
-		new Date(2001, 4 - 1, 9), "Parse date D M y with settings");
-	testHelper.equalsDate($.datepicker.parseDate("d MM DD yy", "9 Avril Lundi 2001", settings),
-		new Date(2001, 4 - 1, 9), "Parse date d MM DD yy with settings");
-	testHelper.equalsDate($.datepicker.parseDate("DD, MM d, yy", "Lundi, Avril 9, 2001", settings),
-		new Date(2001, 4 - 1, 9), "Parse date DD, MM d, yy with settings");
-	testHelper.equalsDate($.datepicker.parseDate("'jour' d 'de' MM (''DD''), yy", "jour 9 de Avril ('Lundi'), 2001", settings),
-		new Date(2001, 4 - 1, 9), "Parse date 'jour' d 'de' MM (''DD''), yy with settings");
-
-	zh = $.datepicker.regional["zh-CN"];
-	testHelper.equalsDate($.datepicker.parseDate("yy M d", "2011 十一月 22", zh),
-		new Date(2011, 11 - 1, 22), "Parse date yy M d with zh-CN");
-});
-
-test("parseDateErrors", function() {
+	settings = { dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
+		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames };
+	testHelper.equalsDate( $.datepicker.parseDate( "D d M y", "Lun. 9 avr. 01", settings ),
+		new Date( 2001, 4 - 1, 9 ), "Parse date D M y with settings" );
+	testHelper.equalsDate( $.datepicker.parseDate( "d MM DD yy", "9 Avril Lundi 2001", settings ),
+		new Date( 2001, 4 - 1, 9 ), "Parse date d MM DD yy with settings" );
+	testHelper.equalsDate( $.datepicker.parseDate( "DD, MM d, yy", "Lundi, Avril 9, 2001", settings ),
+		new Date( 2001, 4 - 1, 9 ), "Parse date DD, MM d, yy with settings" );
+	testHelper.equalsDate( $.datepicker.parseDate( "'jour' d 'de' MM (''DD''), yy", "jour 9 de Avril ('Lundi'), 2001", settings ),
+		new Date( 2001, 4 - 1, 9 ), "Parse date 'jour' d 'de' MM (''DD''), yy with settings" );
+
+	zh = $.datepicker.regional[ "zh-CN" ];
+	testHelper.equalsDate( $.datepicker.parseDate( "yy M d", "2011 十一月 22", zh ),
+		new Date( 2011, 11 - 1, 22 ), "Parse date yy M d with zh-CN" );
+} );
+
+test( "parseDateErrors", function() {
 	expect( 18 );
-	testHelper.init("#inp");
+	testHelper.init( "#inp" );
 	var fr, settings;
-	function expectError(expr, value, error) {
+	function expectError( expr, value, error ) {
 		try {
 			expr();
-			ok(false, "Parsed error " + value);
+			ok( false, "Parsed error " + value );
 		}
-		catch (e) {
-			equal(e, error, "Parsed error " + value);
+		catch ( e ) {
+			equal( e, error, "Parsed error " + value );
 		}
 	}
-	expectError(function() { $.datepicker.parseDate(null, "Sat 2 01"); },
-		"Sat 2 01", "Invalid arguments");
-	expectError(function() { $.datepicker.parseDate("d m y", null); },
-		"null", "Invalid arguments");
-	expectError(function() { $.datepicker.parseDate("d m y", "Sat 2 01"); },
-		"Sat 2 01 - d m y", "Missing number at position 0");
-	expectError(function() { $.datepicker.parseDate("dd mm yy", "Sat 2 01"); },
-		"Sat 2 01 - dd mm yy", "Missing number at position 0");
-	expectError(function() { $.datepicker.parseDate("d m y", "3 Feb 01"); },
-		"3 Feb 01 - d m y", "Missing number at position 2");
-	expectError(function() { $.datepicker.parseDate("dd mm yy", "3 Feb 01"); },
-		"3 Feb 01 - dd mm yy", "Missing number at position 2");
-	expectError(function() { $.datepicker.parseDate("mm dd yy", "2 1 01"); },
-		"2 1 01 - dd mm yy", "Missing number at position 4");
-	expectError(function() { $.datepicker.parseDate("d m y", "3 2 AD01"); },
-		"3 2 AD01 - d m y", "Missing number at position 4");
-	expectError(function() { $.datepicker.parseDate("d m yy", "3 2 AD01"); },
-		"3 2 AD01 - dd mm yy", "Missing number at position 4");
-	expectError(function() { $.datepicker.parseDate("y-o", "01-D01"); },
-		"2001-D01 - y-o", "Missing number at position 3");
-	expectError(function() { $.datepicker.parseDate("yy-oo", "2001-D01"); },
-		"2001-D01 - yy-oo", "Missing number at position 5");
-	expectError(function() { $.datepicker.parseDate("D d M y", "D7 3 Feb 01"); },
-		"D7 3 Feb 01 - D d M y", "Unknown name at position 0");
-	expectError(function() { $.datepicker.parseDate("D d M y", "Sat 3 M2 01"); },
-		"Sat 3 M2 01 - D d M y", "Unknown name at position 6");
-	expectError(function() { $.datepicker.parseDate("DD, MM d, yy", "Saturday- Feb 3, 2001"); },
-		"Saturday- Feb 3, 2001 - DD, MM d, yy", "Unexpected literal at position 8");
-	expectError(function() { $.datepicker.parseDate("'day' d 'of' MM (''DD''), yy",
-		"day 3 of February (\"Saturday\"), 2001"); },
-		"day 3 of Mon2 ('Day7'), 2001", "Unexpected literal at position 19");
-	expectError(function() { $.datepicker.parseDate("d m y", "29 2 01"); },
-		"29 2 01 - d m y", "Invalid date");
+	expectError( function() { $.datepicker.parseDate( null, "Sat 2 01" ); },
+		"Sat 2 01", "Invalid arguments" );
+	expectError( function() { $.datepicker.parseDate( "d m y", null ); },
+		"null", "Invalid arguments" );
+	expectError( function() { $.datepicker.parseDate( "d m y", "Sat 2 01" ); },
+		"Sat 2 01 - d m y", "Missing number at position 0" );
+	expectError( function() { $.datepicker.parseDate( "dd mm yy", "Sat 2 01" ); },
+		"Sat 2 01 - dd mm yy", "Missing number at position 0" );
+	expectError( function() { $.datepicker.parseDate( "d m y", "3 Feb 01" ); },
+		"3 Feb 01 - d m y", "Missing number at position 2" );
+	expectError( function() { $.datepicker.parseDate( "dd mm yy", "3 Feb 01" ); },
+		"3 Feb 01 - dd mm yy", "Missing number at position 2" );
+	expectError( function() { $.datepicker.parseDate( "mm dd yy", "2 1 01" ); },
+		"2 1 01 - dd mm yy", "Missing number at position 4" );
+	expectError( function() { $.datepicker.parseDate( "d m y", "3 2 AD01" ); },
+		"3 2 AD01 - d m y", "Missing number at position 4" );
+	expectError( function() { $.datepicker.parseDate( "d m yy", "3 2 AD01" ); },
+		"3 2 AD01 - dd mm yy", "Missing number at position 4" );
+	expectError( function() { $.datepicker.parseDate( "y-o", "01-D01" ); },
+		"2001-D01 - y-o", "Missing number at position 3" );
+	expectError( function() { $.datepicker.parseDate( "yy-oo", "2001-D01" ); },
+		"2001-D01 - yy-oo", "Missing number at position 5" );
+	expectError( function() { $.datepicker.parseDate( "D d M y", "D7 3 Feb 01" ); },
+		"D7 3 Feb 01 - D d M y", "Unknown name at position 0" );
+	expectError( function() { $.datepicker.parseDate( "D d M y", "Sat 3 M2 01" ); },
+		"Sat 3 M2 01 - D d M y", "Unknown name at position 6" );
+	expectError( function() { $.datepicker.parseDate( "DD, MM d, yy", "Saturday- Feb 3, 2001" ); },
+		"Saturday- Feb 3, 2001 - DD, MM d, yy", "Unexpected literal at position 8" );
+	expectError( function() { $.datepicker.parseDate( "'day' d 'of' MM (''DD''), yy",
+		"day 3 of February (\"Saturday\"), 2001" ); },
+		"day 3 of Mon2 ('Day7'), 2001", "Unexpected literal at position 19" );
+	expectError( function() { $.datepicker.parseDate( "d m y", "29 2 01" ); },
+		"29 2 01 - d m y", "Invalid date" );
 	fr = $.datepicker.regional.fr;
-	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
-		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
-	expectError(function() { $.datepicker.parseDate("D d M y", "Mon 9 Avr 01", settings); },
-		"Mon 9 Avr 01 - D d M y", "Unknown name at position 0");
-	expectError(function() { $.datepicker.parseDate("D d M y", "Lun. 9 Apr 01", settings); },
-		"Lun. 9 Apr 01 - D d M y", "Unknown name at position 7");
-});
-
-test("Ticket #7244: date parser does not fail when too many numbers are passed into the date function", function() {
+	settings = { dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
+		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames };
+	expectError( function() { $.datepicker.parseDate( "D d M y", "Mon 9 Avr 01", settings ); },
+		"Mon 9 Avr 01 - D d M y", "Unknown name at position 0" );
+	expectError( function() { $.datepicker.parseDate( "D d M y", "Lun. 9 Apr 01", settings ); },
+		"Lun. 9 Apr 01 - D d M y", "Unknown name at position 7" );
+} );
+
+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");
-		ok(false, "Did not properly detect an invalid date");
-	}catch(e){
-		ok("invalid date detected");
+	try {
+		date = $.datepicker.parseDate( "dd/mm/yy", "18/04/19881" );
+		ok( false, "Did not properly detect an invalid date" );
+	}catch ( e ) {
+		ok( "invalid date detected" );
 	}
 
 	try {
-		date = $.datepicker.parseDate("dd/mm/yy", "18/04/1988 @ 2:43 pm");
-		equal(date.getDate(), 18);
-		equal(date.getMonth(), 3);
-		equal(date.getFullYear(), 1988);
-	} catch(e) {
-		ok(false, "Did not properly parse date with extra text separated by whitespace");
+		date = $.datepicker.parseDate( "dd/mm/yy", "18/04/1988 @ 2:43 pm" );
+		equal( date.getDate(), 18 );
+		equal( date.getMonth(), 3 );
+		equal( date.getFullYear(), 1988 );
+	} catch ( e ) {
+		ok( false, "Did not properly parse date with extra text separated by whitespace" );
 	}
-});
+} );
 
-test("formatDate", function() {
+test( "formatDate", function() {
 	expect( 16 );
-	testHelper.init("#inp");
+	testHelper.init( "#inp" );
 	var gmtDate, fr, settings;
-	equal($.datepicker.formatDate("d m y", new Date(2001, 2 - 1, 3)),
-		"3 2 01", "Format date d m y");
-	equal($.datepicker.formatDate("dd mm yy", new Date(2001, 2 - 1, 3)),
-		"03 02 2001", "Format date dd mm yy");
-	equal($.datepicker.formatDate("d m y", new Date(2001, 12 - 1, 13)),
-		"13 12 01", "Format date d m y");
-	equal($.datepicker.formatDate("dd mm yy", new Date(2001, 12 - 1, 13)),
-		"13 12 2001", "Format date dd mm yy");
-	equal($.datepicker.formatDate("yy-o", new Date(2001, 2 - 1, 3)),
-		"2001-34", "Format date yy-o");
-	equal($.datepicker.formatDate("yy-oo", new Date(2001, 2 - 1, 3)),
-		"2001-034", "Format date yy-oo");
-	equal($.datepicker.formatDate("D M y", new Date(2001, 2 - 1, 3)),
-		"Sat Feb 01", "Format date D M y");
-	equal($.datepicker.formatDate("DD MM yy", new Date(2001, 2 - 1, 3)),
-		"Saturday February 2001", "Format date DD MM yy");
-	equal($.datepicker.formatDate("DD, MM d, yy", new Date(2001, 2 - 1, 3)),
-		"Saturday, February 3, 2001", "Format date DD, MM d, yy");
-	equal($.datepicker.formatDate("'day' d 'of' MM (''DD''), yy",
-		new Date(2001, 2 - 1, 3)), "day 3 of February ('Saturday'), 2001",
-		"Format date 'day' d 'of' MM ('DD'), yy");
-	gmtDate = new Date(2001, 2 - 1, 3);
-	gmtDate.setMinutes(gmtDate.getMinutes() - gmtDate.getTimezoneOffset());
-	equal($.datepicker.formatDate("@", gmtDate), "981158400000", "Format date @");
-	equal($.datepicker.formatDate("!", gmtDate), "631167552000000000", "Format date !");
+	equal( $.datepicker.formatDate( "d m y", new Date( 2001, 2 - 1, 3 ) ),
+		"3 2 01", "Format date d m y" );
+	equal( $.datepicker.formatDate( "dd mm yy", new Date( 2001, 2 - 1, 3 ) ),
+		"03 02 2001", "Format date dd mm yy" );
+	equal( $.datepicker.formatDate( "d m y", new Date( 2001, 12 - 1, 13 ) ),
+		"13 12 01", "Format date d m y" );
+	equal( $.datepicker.formatDate( "dd mm yy", new Date( 2001, 12 - 1, 13 ) ),
+		"13 12 2001", "Format date dd mm yy" );
+	equal( $.datepicker.formatDate( "yy-o", new Date( 2001, 2 - 1, 3 ) ),
+		"2001-34", "Format date yy-o" );
+	equal( $.datepicker.formatDate( "yy-oo", new Date( 2001, 2 - 1, 3 ) ),
+		"2001-034", "Format date yy-oo" );
+	equal( $.datepicker.formatDate( "D M y", new Date( 2001, 2 - 1, 3 ) ),
+		"Sat Feb 01", "Format date D M y" );
+	equal( $.datepicker.formatDate( "DD MM yy", new Date( 2001, 2 - 1, 3 ) ),
+		"Saturday February 2001", "Format date DD MM yy" );
+	equal( $.datepicker.formatDate( "DD, MM d, yy", new Date( 2001, 2 - 1, 3 ) ),
+		"Saturday, February 3, 2001", "Format date DD, MM d, yy" );
+	equal( $.datepicker.formatDate( "'day' d 'of' MM (''DD''), yy",
+		new Date( 2001, 2 - 1, 3 ) ), "day 3 of February ('Saturday'), 2001",
+		"Format date 'day' d 'of' MM ('DD'), yy" );
+	gmtDate = new Date( 2001, 2 - 1, 3 );
+	gmtDate.setMinutes( gmtDate.getMinutes() - gmtDate.getTimezoneOffset() );
+	equal( $.datepicker.formatDate( "@", gmtDate ), "981158400000", "Format date @" );
+	equal( $.datepicker.formatDate( "!", gmtDate ), "631167552000000000", "Format date !" );
 	fr = $.datepicker.regional.fr;
-	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
-		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
-	equal($.datepicker.formatDate("D M y", new Date(2001, 4 - 1, 9), settings),
-		"lun. avr. 01", "Format date D M y with settings");
-	equal($.datepicker.formatDate("DD MM yy", new Date(2001, 4 - 1, 9), settings),
-		"lundi avril 2001", "Format date DD MM yy with settings");
-	equal($.datepicker.formatDate("DD, MM d, yy", new Date(2001, 4 - 1, 9), settings),
-		"lundi, avril 9, 2001", "Format date DD, MM d, yy with settings");
-	equal($.datepicker.formatDate("'jour' d 'de' MM (''DD''), yy",
-		new Date(2001, 4 - 1, 9), settings), "jour 9 de avril ('lundi'), 2001",
-		"Format date 'jour' d 'de' MM (''DD''), yy with settings");
-});
+	settings = { dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
+		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames };
+	equal( $.datepicker.formatDate( "D M y", new Date( 2001, 4 - 1, 9 ), settings ),
+		"lun. avr. 01", "Format date D M y with settings" );
+	equal( $.datepicker.formatDate( "DD MM yy", new Date( 2001, 4 - 1, 9 ), settings ),
+		"lundi avril 2001", "Format date DD MM yy with settings" );
+	equal( $.datepicker.formatDate( "DD, MM d, yy", new Date( 2001, 4 - 1, 9 ), settings ),
+		"lundi, avril 9, 2001", "Format date DD, MM d, yy with settings" );
+	equal( $.datepicker.formatDate( "'jour' d 'de' MM (''DD''), yy",
+		new Date( 2001, 4 - 1, 9 ), settings ), "jour 9 de avril ('lundi'), 2001",
+		"Format date 'jour' d 'de' MM (''DD''), yy with settings" );
+} );
 
 // TODO: Fix this test so it isn't mysteriously flaky in Browserstack on certain OS/Browser combos
 // test("Ticket 6827: formatDate day of year calculation is wrong during day lights savings time", function(){
@@ -1096,7 +1120,7 @@ test( "Ticket 7602: Stop datepicker from appearing with beforeShow event handler
 	inp = testHelper.init( "#inp", {
 		beforeShow: function() {
 		}
-	});
+	} );
 	dp = $( "#ui-datepicker-div" );
 	inp.datepicker( "show" );
 	equal( dp.css( "display" ), "block", "beforeShow returns nothing" );
@@ -1106,7 +1130,7 @@ test( "Ticket 7602: Stop datepicker from appearing with beforeShow event handler
 		beforeShow: function() {
 			return true;
 		}
-	});
+	} );
 	dp = $( "#ui-datepicker-div" );
 	inp.datepicker( "show" );
 	equal( dp.css( "display" ), "block", "beforeShow returns true" );
@@ -1117,11 +1141,11 @@ test( "Ticket 7602: Stop datepicker from appearing with beforeShow event handler
 		beforeShow: function() {
 			return false;
 		}
-	});
+	} );
 	dp = $( "#ui-datepicker-div" );
 	inp.datepicker( "show" );
-	equal( dp.css( "display" ), "none","beforeShow returns false" );
+	equal( dp.css( "display" ), "none", "beforeShow returns false" );
 	inp.datepicker( "destroy" );
-});
+} );
 
 } );
diff --git a/ui/i18n/datepicker-af.js b/ui/i18n/datepicker-af.js
index f13315e1045..c756888846b 100644
--- a/ui/i18n/datepicker-af.js
+++ b/ui/i18n/datepicker-af.js
@@ -12,7 +12,7 @@
 	}
 }( function( datepicker ) {
 
-datepicker.regional[ "af" ] = {
+datepicker.regional.af = {
 	closeText: "Selekteer",
 	prevText: "Vorige",
 	nextText: "Volgende",
@@ -21,17 +21,17 @@ datepicker.regional[ "af" ] = {
 	"Julie","Augustus","September","Oktober","November","Desember" ],
 	monthNamesShort: [ "Jan", "Feb", "Mrt", "Apr", "Mei", "Jun",
 	"Jul", "Aug", "Sep", "Okt", "Nov", "Des" ],
-	dayNames: [ "Sondag", "Maandag", "Dinsdag", 'Woensdag', 'Donderdag', 'Vrydag', 'Saterdag' ],
-	dayNamesShort: [ 'Son', 'Maa', 'Din', 'Woe', 'Don', 'Vry', 'Sat' ],
-	dayNamesMin: [ 'So','Ma','Di','Wo','Do','Vr','Sa' ],
-	weekHeader: 'Wk',
-	dateFormat: 'dd/mm/yy',
+	dayNames: [ "Sondag", "Maandag", "Dinsdag", "Woensdag", "Donderdag", "Vrydag", "Saterdag" ],
+	dayNamesShort: [ "Son", "Maa", "Din", "Woe", "Don", "Vry", "Sat" ],
+	dayNamesMin: [ "So","Ma","Di","Wo","Do","Vr","Sa" ],
+	weekHeader: "Wk",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: '' };
-datepicker.setDefaults( datepicker.regional[ 'af' ] );
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.af );
 
-return datepicker.regional[ 'af' ];
+return datepicker.regional.af;
 
 } ) );
diff --git a/ui/i18n/datepicker-ar-DZ.js b/ui/i18n/datepicker-ar-DZ.js
index ab8c1f08b2e..6035ce2927b 100644
--- a/ui/i18n/datepicker-ar-DZ.js
+++ b/ui/i18n/datepicker-ar-DZ.js
@@ -20,18 +20,18 @@ datepicker.regional[ "ar-DZ" ] = {
 	currentText: "اليوم",
 	monthNames: [ "جانفي", "فيفري", "مارس", "أفريل", "ماي", "جوان",
 	"جويلية", "أوت", "سبتمبر","أكتوبر", "نوفمبر", "ديسمبر" ],
-	monthNamesShort: [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", '12' ],
-	dayNames: [ 'الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت' ],
-	dayNamesShort: [ 'الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت' ],
-	dayNamesMin: [ 'الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت' ],
-	weekHeader: 'أسبوع',
-	dateFormat: 'dd/mm/yy',
+	monthNamesShort: [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12" ],
+	dayNames: [ "الأحد", "الاثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت" ],
+	dayNamesShort: [ "الأحد", "الاثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت" ],
+	dayNamesMin: [ "الأحد", "الاثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت" ],
+	weekHeader: "أسبوع",
+	dateFormat: "dd/mm/yy",
 	firstDay: 6,
 		isRTL: true,
 	showMonthAfterYear: false,
-	yearSuffix: '' };
-datepicker.setDefaults( datepicker.regional[ 'ar-DZ' ] );
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional[ "ar-DZ" ] );
 
-return datepicker.regional[ 'ar-DZ' ];
+return datepicker.regional[ "ar-DZ" ];
 
 } ) );
diff --git a/ui/i18n/datepicker-ar.js b/ui/i18n/datepicker-ar.js
index 73ed1dfe040..025d9848402 100644
--- a/ui/i18n/datepicker-ar.js
+++ b/ui/i18n/datepicker-ar.js
@@ -2,37 +2,37 @@
 /* Used in most of Arab countries, primarily in Bahrain, Kuwait, Oman, Qatar, Saudi Arabia and the United Arab Emirates, Egypt, Sudan and Yemen. */
 /* Written by Mohammed Alshehri -- m@dralshehri.com */
 
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['ar'] = {
-	closeText: 'إغلاق',
-	prevText: '&#x3C;السابق',
-	nextText: 'التالي&#x3E;',
-	currentText: 'اليوم',
-	monthNames: ['يناير', 'فبراير', 'مارس', 'أبريل', 'مايو', 'يونيو',
-	'يوليو', 'أغسطس', 'سبتمبر', 'أكتوبر', 'نوفمبر', 'ديسمبر'],
-	monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-	dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
-	dayNamesShort: ['أحد', 'اثنين', 'ثلاثاء', 'أربعاء', 'خميس', 'جمعة', 'سبت'],
-	dayNamesMin: ['ح', 'ن', 'ث', 'ر', 'خ', 'ج', 'س'],
-	weekHeader: 'أسبوع',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.ar = {
+	closeText: "إغلاق",
+	prevText: "&#x3C;السابق",
+	nextText: "التالي&#x3E;",
+	currentText: "اليوم",
+	monthNames: [ "يناير", "فبراير", "مارس", "أبريل", "مايو", "يونيو",
+	"يوليو", "أغسطس", "سبتمبر", "أكتوبر", "نوفمبر", "ديسمبر" ],
+	monthNamesShort: [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12" ],
+	dayNames: [ "الأحد", "الاثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت" ],
+	dayNamesShort: [ "أحد", "اثنين", "ثلاثاء", "أربعاء", "خميس", "جمعة", "سبت" ],
+	dayNamesMin: [ "ح", "ن", "ث", "ر", "خ", "ج", "س" ],
+	weekHeader: "أسبوع",
+	dateFormat: "dd/mm/yy",
 	firstDay: 0,
 		isRTL: true,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['ar']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.ar );
 
-return datepicker.regional['ar'];
+return datepicker.regional.ar;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-az.js b/ui/i18n/datepicker-az.js
index 2ab92b1a531..2ebdcfa8b57 100644
--- a/ui/i18n/datepicker-az.js
+++ b/ui/i18n/datepicker-az.js
@@ -1,37 +1,37 @@
 /* Azerbaijani (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by Jamil Najafov (necefov33@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['az'] = {
-	closeText: 'Bağla',
-	prevText: '&#x3C;Geri',
-	nextText: 'İrəli&#x3E;',
-	currentText: 'Bugün',
-	monthNames: ['Yanvar','Fevral','Mart','Aprel','May','İyun',
-	'İyul','Avqust','Sentyabr','Oktyabr','Noyabr','Dekabr'],
-	monthNamesShort: ['Yan','Fev','Mar','Apr','May','İyun',
-	'İyul','Avq','Sen','Okt','Noy','Dek'],
-	dayNames: ['Bazar','Bazar ertəsi','Çərşənbə axşamı','Çərşənbə','Cümə axşamı','Cümə','Şənbə'],
-	dayNamesShort: ['B','Be','Ça','Ç','Ca','C','Ş'],
-	dayNamesMin: ['B','B','Ç','С','Ç','C','Ş'],
-	weekHeader: 'Hf',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.az = {
+	closeText: "Bağla",
+	prevText: "&#x3C;Geri",
+	nextText: "İrəli&#x3E;",
+	currentText: "Bugün",
+	monthNames: [ "Yanvar","Fevral","Mart","Aprel","May","İyun",
+	"İyul","Avqust","Sentyabr","Oktyabr","Noyabr","Dekabr" ],
+	monthNamesShort: [ "Yan","Fev","Mar","Apr","May","İyun",
+	"İyul","Avq","Sen","Okt","Noy","Dek" ],
+	dayNames: [ "Bazar","Bazar ertəsi","Çərşənbə axşamı","Çərşənbə","Cümə axşamı","Cümə","Şənbə" ],
+	dayNamesShort: [ "B","Be","Ça","Ç","Ca","C","Ş" ],
+	dayNamesMin: [ "B","B","Ç","С","Ç","C","Ş" ],
+	weekHeader: "Hf",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['az']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.az );
 
-return datepicker.regional['az'];
+return datepicker.regional.az;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-be.js b/ui/i18n/datepicker-be.js
index 8cb24592ab8..7d96dd1da65 100644
--- a/ui/i18n/datepicker-be.js
+++ b/ui/i18n/datepicker-be.js
@@ -1,37 +1,37 @@
 /* Belarusian initialisation for the jQuery UI date picker plugin. */
 /* Written by Pavel Selitskas <p.selitskas@gmail.com> */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['be'] = {
-	closeText: 'Зачыніць',
-	prevText: '&larr;Папяр.',
-	nextText: 'Наст.&rarr;',
-	currentText: 'Сёньня',
-	monthNames: ['Студзень','Люты','Сакавік','Красавік','Травень','Чэрвень',
-	'Ліпень','Жнівень','Верасень','Кастрычнік','Лістапад','Сьнежань'],
-	monthNamesShort: ['Сту','Лют','Сак','Кра','Тра','Чэр',
-	'Ліп','Жні','Вер','Кас','Ліс','Сьн'],
-	dayNames: ['нядзеля','панядзелак','аўторак','серада','чацьвер','пятніца','субота'],
-	dayNamesShort: ['ндз','пнд','аўт','срд','чцв','птн','сбт'],
-	dayNamesMin: ['Нд','Пн','Аў','Ср','Чц','Пт','Сб'],
-	weekHeader: 'Тд',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.be = {
+	closeText: "Зачыніць",
+	prevText: "&larr;Папяр.",
+	nextText: "Наст.&rarr;",
+	currentText: "Сёньня",
+	monthNames: [ "Студзень","Люты","Сакавік","Красавік","Травень","Чэрвень",
+	"Ліпень","Жнівень","Верасень","Кастрычнік","Лістапад","Сьнежань" ],
+	monthNamesShort: [ "Сту","Лют","Сак","Кра","Тра","Чэр",
+	"Ліп","Жні","Вер","Кас","Ліс","Сьн" ],
+	dayNames: [ "нядзеля","панядзелак","аўторак","серада","чацьвер","пятніца","субота" ],
+	dayNamesShort: [ "ндз","пнд","аўт","срд","чцв","птн","сбт" ],
+	dayNamesMin: [ "Нд","Пн","Аў","Ср","Чц","Пт","Сб" ],
+	weekHeader: "Тд",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['be']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.be );
 
-return datepicker.regional['be'];
+return datepicker.regional.be;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-bg.js b/ui/i18n/datepicker-bg.js
index c2db5e6799c..cb066a4c9df 100644
--- a/ui/i18n/datepicker-bg.js
+++ b/ui/i18n/datepicker-bg.js
@@ -1,38 +1,38 @@
 /* Bulgarian initialisation for the jQuery UI date picker plugin. */
 /* Written by Stoyan Kyosev (http://svest.org). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['bg'] = {
-	closeText: 'затвори',
-	prevText: '&#x3C;назад',
-	nextText: 'напред&#x3E;',
-	nextBigText: '&#x3E;&#x3E;',
-	currentText: 'днес',
-	monthNames: ['Януари','Февруари','Март','Април','Май','Юни',
-	'Юли','Август','Септември','Октомври','Ноември','Декември'],
-	monthNamesShort: ['Яну','Фев','Мар','Апр','Май','Юни',
-	'Юли','Авг','Сеп','Окт','Нов','Дек'],
-	dayNames: ['Неделя','Понеделник','Вторник','Сряда','Четвъртък','Петък','Събота'],
-	dayNamesShort: ['Нед','Пон','Вто','Сря','Чет','Пет','Съб'],
-	dayNamesMin: ['Не','По','Вт','Ср','Че','Пе','Съ'],
-	weekHeader: 'Wk',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.bg = {
+	closeText: "затвори",
+	prevText: "&#x3C;назад",
+	nextText: "напред&#x3E;",
+	nextBigText: "&#x3E;&#x3E;",
+	currentText: "днес",
+	monthNames: [ "Януари","Февруари","Март","Април","Май","Юни",
+	"Юли","Август","Септември","Октомври","Ноември","Декември" ],
+	monthNamesShort: [ "Яну","Фев","Мар","Апр","Май","Юни",
+	"Юли","Авг","Сеп","Окт","Нов","Дек" ],
+	dayNames: [ "Неделя","Понеделник","Вторник","Сряда","Четвъртък","Петък","Събота" ],
+	dayNamesShort: [ "Нед","Пон","Вто","Сря","Чет","Пет","Съб" ],
+	dayNamesMin: [ "Не","По","Вт","Ср","Че","Пе","Съ" ],
+	weekHeader: "Wk",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['bg']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.bg );
 
-return datepicker.regional['bg'];
+return datepicker.regional.bg;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-bs.js b/ui/i18n/datepicker-bs.js
index 3b83064f431..b9f2e286917 100644
--- a/ui/i18n/datepicker-bs.js
+++ b/ui/i18n/datepicker-bs.js
@@ -1,37 +1,37 @@
 /* Bosnian i18n for the jQuery UI date picker plugin. */
 /* Written by Kenan Konjo. */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['bs'] = {
-	closeText: 'Zatvori',
-	prevText: '&#x3C;',
-	nextText: '&#x3E;',
-	currentText: 'Danas',
-	monthNames: ['Januar','Februar','Mart','April','Maj','Juni',
-	'Juli','August','Septembar','Oktobar','Novembar','Decembar'],
-	monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
-	'Jul','Aug','Sep','Okt','Nov','Dec'],
-	dayNames: ['Nedelja','Ponedeljak','Utorak','Srijeda','Četvrtak','Petak','Subota'],
-	dayNamesShort: ['Ned','Pon','Uto','Sri','Čet','Pet','Sub'],
-	dayNamesMin: ['Ne','Po','Ut','Sr','Če','Pe','Su'],
-	weekHeader: 'Wk',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.bs = {
+	closeText: "Zatvori",
+	prevText: "&#x3C;",
+	nextText: "&#x3E;",
+	currentText: "Danas",
+	monthNames: [ "Januar","Februar","Mart","April","Maj","Juni",
+	"Juli","August","Septembar","Oktobar","Novembar","Decembar" ],
+	monthNamesShort: [ "Jan","Feb","Mar","Apr","Maj","Jun",
+	"Jul","Aug","Sep","Okt","Nov","Dec" ],
+	dayNames: [ "Nedelja","Ponedeljak","Utorak","Srijeda","Četvrtak","Petak","Subota" ],
+	dayNamesShort: [ "Ned","Pon","Uto","Sri","Čet","Pet","Sub" ],
+	dayNamesMin: [ "Ne","Po","Ut","Sr","Če","Pe","Su" ],
+	weekHeader: "Wk",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['bs']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.bs );
 
-return datepicker.regional['bs'];
+return datepicker.regional.bs;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-ca.js b/ui/i18n/datepicker-ca.js
index c35fa08a193..9febd90eef6 100644
--- a/ui/i18n/datepicker-ca.js
+++ b/ui/i18n/datepicker-ca.js
@@ -1,37 +1,37 @@
 /* Inicialització en català per a l'extensió 'UI date picker' per jQuery. */
 /* Writers: (joan.leon@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['ca'] = {
-	closeText: 'Tanca',
-	prevText: 'Anterior',
-	nextText: 'Següent',
-	currentText: 'Avui',
-	monthNames: ['gener','febrer','març','abril','maig','juny',
-	'juliol','agost','setembre','octubre','novembre','desembre'],
-	monthNamesShort: ['gen','feb','març','abr','maig','juny',
-	'jul','ag','set','oct','nov','des'],
-	dayNames: ['diumenge','dilluns','dimarts','dimecres','dijous','divendres','dissabte'],
-	dayNamesShort: ['dg','dl','dt','dc','dj','dv','ds'],
-	dayNamesMin: ['dg','dl','dt','dc','dj','dv','ds'],
-	weekHeader: 'Set',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.ca = {
+	closeText: "Tanca",
+	prevText: "Anterior",
+	nextText: "Següent",
+	currentText: "Avui",
+	monthNames: [ "gener","febrer","març","abril","maig","juny",
+	"juliol","agost","setembre","octubre","novembre","desembre" ],
+	monthNamesShort: [ "gen","feb","març","abr","maig","juny",
+	"jul","ag","set","oct","nov","des" ],
+	dayNames: [ "diumenge","dilluns","dimarts","dimecres","dijous","divendres","dissabte" ],
+	dayNamesShort: [ "dg","dl","dt","dc","dj","dv","ds" ],
+	dayNamesMin: [ "dg","dl","dt","dc","dj","dv","ds" ],
+	weekHeader: "Set",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['ca']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.ca );
 
-return datepicker.regional['ca'];
+return datepicker.regional.ca;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-cs.js b/ui/i18n/datepicker-cs.js
index cb6dfe09588..c2f79cf9e41 100644
--- a/ui/i18n/datepicker-cs.js
+++ b/ui/i18n/datepicker-cs.js
@@ -1,37 +1,37 @@
 /* Czech initialisation for the jQuery UI date picker plugin. */
 /* Written by Tomas Muller (tomas@tomas-muller.net). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['cs'] = {
-	closeText: 'Zavřít',
-	prevText: '&#x3C;Dříve',
-	nextText: 'Později&#x3E;',
-	currentText: 'Nyní',
-	monthNames: ['leden','únor','březen','duben','květen','červen',
-	'červenec','srpen','září','říjen','listopad','prosinec'],
-	monthNamesShort: ['led','úno','bře','dub','kvě','čer',
-	'čvc','srp','zář','říj','lis','pro'],
-	dayNames: ['neděle', 'pondělí', 'úterý', 'středa', 'čtvrtek', 'pátek', 'sobota'],
-	dayNamesShort: ['ne', 'po', 'út', 'st', 'čt', 'pá', 'so'],
-	dayNamesMin: ['ne','po','út','st','čt','pá','so'],
-	weekHeader: 'Týd',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.cs = {
+	closeText: "Zavřít",
+	prevText: "&#x3C;Dříve",
+	nextText: "Později&#x3E;",
+	currentText: "Nyní",
+	monthNames: [ "leden","únor","březen","duben","květen","červen",
+	"červenec","srpen","září","říjen","listopad","prosinec" ],
+	monthNamesShort: [ "led","úno","bře","dub","kvě","čer",
+	"čvc","srp","zář","říj","lis","pro" ],
+	dayNames: [ "neděle", "pondělí", "úterý", "středa", "čtvrtek", "pátek", "sobota" ],
+	dayNamesShort: [ "ne", "po", "út", "st", "čt", "pá", "so" ],
+	dayNamesMin: [ "ne","po","út","st","čt","pá","so" ],
+	weekHeader: "Týd",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['cs']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.cs );
 
-return datepicker.regional['cs'];
+return datepicker.regional.cs;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-cy-GB.js b/ui/i18n/datepicker-cy-GB.js
index 0935bd0346b..26643b50c50 100644
--- a/ui/i18n/datepicker-cy-GB.js
+++ b/ui/i18n/datepicker-cy-GB.js
@@ -1,37 +1,37 @@
 /* Welsh/UK initialisation for the jQuery UI date picker plugin. */
 /* Written by William Griffiths. */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['cy-GB'] = {
-	closeText: 'Done',
-	prevText: 'Prev',
-	nextText: 'Next',
-	currentText: 'Today',
-	monthNames: ['Ionawr','Chwefror','Mawrth','Ebrill','Mai','Mehefin',
-	'Gorffennaf','Awst','Medi','Hydref','Tachwedd','Rhagfyr'],
-	monthNamesShort: ['Ion', 'Chw', 'Maw', 'Ebr', 'Mai', 'Meh',
-	'Gor', 'Aws', 'Med', 'Hyd', 'Tac', 'Rha'],
-	dayNames: ['Dydd Sul', 'Dydd Llun', 'Dydd Mawrth', 'Dydd Mercher', 'Dydd Iau', 'Dydd Gwener', 'Dydd Sadwrn'],
-	dayNamesShort: ['Sul', 'Llu', 'Maw', 'Mer', 'Iau', 'Gwe', 'Sad'],
-	dayNamesMin: ['Su','Ll','Ma','Me','Ia','Gw','Sa'],
-	weekHeader: 'Wy',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional[ "cy-GB" ] = {
+	closeText: "Done",
+	prevText: "Prev",
+	nextText: "Next",
+	currentText: "Today",
+	monthNames: [ "Ionawr","Chwefror","Mawrth","Ebrill","Mai","Mehefin",
+	"Gorffennaf","Awst","Medi","Hydref","Tachwedd","Rhagfyr" ],
+	monthNamesShort: [ "Ion", "Chw", "Maw", "Ebr", "Mai", "Meh",
+	"Gor", "Aws", "Med", "Hyd", "Tac", "Rha" ],
+	dayNames: [ "Dydd Sul", "Dydd Llun", "Dydd Mawrth", "Dydd Mercher", "Dydd Iau", "Dydd Gwener", "Dydd Sadwrn" ],
+	dayNamesShort: [ "Sul", "Llu", "Maw", "Mer", "Iau", "Gwe", "Sad" ],
+	dayNamesMin: [ "Su","Ll","Ma","Me","Ia","Gw","Sa" ],
+	weekHeader: "Wy",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['cy-GB']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional[ "cy-GB" ] );
 
-return datepicker.regional['cy-GB'];
+return datepicker.regional[ "cy-GB" ];
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-da.js b/ui/i18n/datepicker-da.js
index 4c9f4b72761..273f0e3ff6e 100644
--- a/ui/i18n/datepicker-da.js
+++ b/ui/i18n/datepicker-da.js
@@ -1,37 +1,37 @@
 /* Danish initialisation for the jQuery UI date picker plugin. */
 /* Written by Jan Christensen ( deletestuff@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['da'] = {
-	closeText: 'Luk',
-	prevText: '&#x3C;Forrige',
-	nextText: 'Næste&#x3E;',
-	currentText: 'Idag',
-	monthNames: ['Januar','Februar','Marts','April','Maj','Juni',
-	'Juli','August','September','Oktober','November','December'],
-	monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
-	'Jul','Aug','Sep','Okt','Nov','Dec'],
-	dayNames: ['Søndag','Mandag','Tirsdag','Onsdag','Torsdag','Fredag','Lørdag'],
-	dayNamesShort: ['Søn','Man','Tir','Ons','Tor','Fre','Lør'],
-	dayNamesMin: ['Sø','Ma','Ti','On','To','Fr','Lø'],
-	weekHeader: 'Uge',
-	dateFormat: 'dd-mm-yy',
+datepicker.regional.da = {
+	closeText: "Luk",
+	prevText: "&#x3C;Forrige",
+	nextText: "Næste&#x3E;",
+	currentText: "Idag",
+	monthNames: [ "Januar","Februar","Marts","April","Maj","Juni",
+	"Juli","August","September","Oktober","November","December" ],
+	monthNamesShort: [ "Jan","Feb","Mar","Apr","Maj","Jun",
+	"Jul","Aug","Sep","Okt","Nov","Dec" ],
+	dayNames: [ "Søndag","Mandag","Tirsdag","Onsdag","Torsdag","Fredag","Lørdag" ],
+	dayNamesShort: [ "Søn","Man","Tir","Ons","Tor","Fre","Lør" ],
+	dayNamesMin: [ "Sø","Ma","Ti","On","To","Fr","Lø" ],
+	weekHeader: "Uge",
+	dateFormat: "dd-mm-yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['da']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.da );
 
-return datepicker.regional['da'];
+return datepicker.regional.da;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-de.js b/ui/i18n/datepicker-de.js
index 7de94e531d1..a67790844a9 100644
--- a/ui/i18n/datepicker-de.js
+++ b/ui/i18n/datepicker-de.js
@@ -1,37 +1,37 @@
 /* German initialisation for the jQuery UI date picker plugin. */
 /* Written by Milian Wolff (mail@milianw.de). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['de'] = {
-	closeText: 'Schließen',
-	prevText: '&#x3C;Zurück',
-	nextText: 'Vor&#x3E;',
-	currentText: 'Heute',
-	monthNames: ['Januar','Februar','März','April','Mai','Juni',
-	'Juli','August','September','Oktober','November','Dezember'],
-	monthNamesShort: ['Jan','Feb','Mär','Apr','Mai','Jun',
-	'Jul','Aug','Sep','Okt','Nov','Dez'],
-	dayNames: ['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'],
-	dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'],
-	dayNamesMin: ['So','Mo','Di','Mi','Do','Fr','Sa'],
-	weekHeader: 'KW',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.de = {
+	closeText: "Schließen",
+	prevText: "&#x3C;Zurück",
+	nextText: "Vor&#x3E;",
+	currentText: "Heute",
+	monthNames: [ "Januar","Februar","März","April","Mai","Juni",
+	"Juli","August","September","Oktober","November","Dezember" ],
+	monthNamesShort: [ "Jan","Feb","Mär","Apr","Mai","Jun",
+	"Jul","Aug","Sep","Okt","Nov","Dez" ],
+	dayNames: [ "Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag" ],
+	dayNamesShort: [ "So","Mo","Di","Mi","Do","Fr","Sa" ],
+	dayNamesMin: [ "So","Mo","Di","Mi","Do","Fr","Sa" ],
+	weekHeader: "KW",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['de']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.de );
 
-return datepicker.regional['de'];
+return datepicker.regional.de;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-el.js b/ui/i18n/datepicker-el.js
index 648a90631d1..f08d6f27d42 100644
--- a/ui/i18n/datepicker-el.js
+++ b/ui/i18n/datepicker-el.js
@@ -1,37 +1,37 @@
 /* Greek (el) initialisation for the jQuery UI date picker plugin. */
 /* Written by Alex Cicovic (http://www.alexcicovic.com) */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['el'] = {
-	closeText: 'Κλείσιμο',
-	prevText: 'Προηγούμενος',
-	nextText: 'Επόμενος',
-	currentText: 'Σήμερα',
-	monthNames: ['Ιανουάριος','Φεβρουάριος','Μάρτιος','Απρίλιος','Μάιος','Ιούνιος',
-	'Ιούλιος','Αύγουστος','Σεπτέμβριος','Οκτώβριος','Νοέμβριος','Δεκέμβριος'],
-	monthNamesShort: ['Ιαν','Φεβ','Μαρ','Απρ','Μαι','Ιουν',
-	'Ιουλ','Αυγ','Σεπ','Οκτ','Νοε','Δεκ'],
-	dayNames: ['Κυριακή','Δευτέρα','Τρίτη','Τετάρτη','Πέμπτη','Παρασκευή','Σάββατο'],
-	dayNamesShort: ['Κυρ','Δευ','Τρι','Τετ','Πεμ','Παρ','Σαβ'],
-	dayNamesMin: ['Κυ','Δε','Τρ','Τε','Πε','Πα','Σα'],
-	weekHeader: 'Εβδ',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.el = {
+	closeText: "Κλείσιμο",
+	prevText: "Προηγούμενος",
+	nextText: "Επόμενος",
+	currentText: "Σήμερα",
+	monthNames: [ "Ιανουάριος","Φεβρουάριος","Μάρτιος","Απρίλιος","Μάιος","Ιούνιος",
+	"Ιούλιος","Αύγουστος","Σεπτέμβριος","Οκτώβριος","Νοέμβριος","Δεκέμβριος" ],
+	monthNamesShort: [ "Ιαν","Φεβ","Μαρ","Απρ","Μαι","Ιουν",
+	"Ιουλ","Αυγ","Σεπ","Οκτ","Νοε","Δεκ" ],
+	dayNames: [ "Κυριακή","Δευτέρα","Τρίτη","Τετάρτη","Πέμπτη","Παρασκευή","Σάββατο" ],
+	dayNamesShort: [ "Κυρ","Δευ","Τρι","Τετ","Πεμ","Παρ","Σαβ" ],
+	dayNamesMin: [ "Κυ","Δε","Τρ","Τε","Πε","Πα","Σα" ],
+	weekHeader: "Εβδ",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['el']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.el );
 
-return datepicker.regional['el'];
+return datepicker.regional.el;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-en-AU.js b/ui/i18n/datepicker-en-AU.js
index c1f6b249f30..f15277c37bc 100644
--- a/ui/i18n/datepicker-en-AU.js
+++ b/ui/i18n/datepicker-en-AU.js
@@ -1,37 +1,37 @@
 /* English/Australia initialisation for the jQuery UI date picker plugin. */
 /* Based on the en-GB initialisation. */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['en-AU'] = {
-	closeText: 'Done',
-	prevText: 'Prev',
-	nextText: 'Next',
-	currentText: 'Today',
-	monthNames: ['January','February','March','April','May','June',
-	'July','August','September','October','November','December'],
-	monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-	'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-	dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
-	dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-	dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
-	weekHeader: 'Wk',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional[ "en-AU" ] = {
+	closeText: "Done",
+	prevText: "Prev",
+	nextText: "Next",
+	currentText: "Today",
+	monthNames: [ "January","February","March","April","May","June",
+	"July","August","September","October","November","December" ],
+	monthNamesShort: [ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ],
+	dayNames: [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ],
+	dayNamesShort: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ],
+	dayNamesMin: [ "Su","Mo","Tu","We","Th","Fr","Sa" ],
+	weekHeader: "Wk",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['en-AU']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional[ "en-AU" ] );
 
-return datepicker.regional['en-AU'];
+return datepicker.regional[ "en-AU" ];
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-en-GB.js b/ui/i18n/datepicker-en-GB.js
index 0db3015479a..c961c18659e 100644
--- a/ui/i18n/datepicker-en-GB.js
+++ b/ui/i18n/datepicker-en-GB.js
@@ -1,37 +1,37 @@
 /* English/UK initialisation for the jQuery UI date picker plugin. */
 /* Written by Stuart. */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['en-GB'] = {
-	closeText: 'Done',
-	prevText: 'Prev',
-	nextText: 'Next',
-	currentText: 'Today',
-	monthNames: ['January','February','March','April','May','June',
-	'July','August','September','October','November','December'],
-	monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-	'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-	dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
-	dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-	dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
-	weekHeader: 'Wk',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional[ "en-GB" ] = {
+	closeText: "Done",
+	prevText: "Prev",
+	nextText: "Next",
+	currentText: "Today",
+	monthNames: [ "January","February","March","April","May","June",
+	"July","August","September","October","November","December" ],
+	monthNamesShort: [ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ],
+	dayNames: [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ],
+	dayNamesShort: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ],
+	dayNamesMin: [ "Su","Mo","Tu","We","Th","Fr","Sa" ],
+	weekHeader: "Wk",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['en-GB']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional[ "en-GB" ] );
 
-return datepicker.regional['en-GB'];
+return datepicker.regional[ "en-GB" ];
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-en-NZ.js b/ui/i18n/datepicker-en-NZ.js
index d40e159607f..70463622541 100644
--- a/ui/i18n/datepicker-en-NZ.js
+++ b/ui/i18n/datepicker-en-NZ.js
@@ -1,37 +1,37 @@
 /* English/New Zealand initialisation for the jQuery UI date picker plugin. */
 /* Based on the en-GB initialisation. */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['en-NZ'] = {
-	closeText: 'Done',
-	prevText: 'Prev',
-	nextText: 'Next',
-	currentText: 'Today',
-	monthNames: ['January','February','March','April','May','June',
-	'July','August','September','October','November','December'],
-	monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-	'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-	dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
-	dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-	dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
-	weekHeader: 'Wk',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional[ "en-NZ" ] = {
+	closeText: "Done",
+	prevText: "Prev",
+	nextText: "Next",
+	currentText: "Today",
+	monthNames: [ "January","February","March","April","May","June",
+	"July","August","September","October","November","December" ],
+	monthNamesShort: [ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ],
+	dayNames: [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ],
+	dayNamesShort: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ],
+	dayNamesMin: [ "Su","Mo","Tu","We","Th","Fr","Sa" ],
+	weekHeader: "Wk",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['en-NZ']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional[ "en-NZ" ] );
 
-return datepicker.regional['en-NZ'];
+return datepicker.regional[ "en-NZ" ];
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-eo.js b/ui/i18n/datepicker-eo.js
index d65a3423700..25f6162b5cd 100644
--- a/ui/i18n/datepicker-eo.js
+++ b/ui/i18n/datepicker-eo.js
@@ -1,37 +1,37 @@
 /* Esperanto initialisation for the jQuery UI date picker plugin. */
 /* Written by Olivier M. (olivierweb@ifrance.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['eo'] = {
-	closeText: 'Fermi',
-	prevText: '&#x3C;Anta',
-	nextText: 'Sekv&#x3E;',
-	currentText: 'Nuna',
-	monthNames: ['Januaro','Februaro','Marto','Aprilo','Majo','Junio',
-	'Julio','Aŭgusto','Septembro','Oktobro','Novembro','Decembro'],
-	monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
-	'Jul','Aŭg','Sep','Okt','Nov','Dec'],
-	dayNames: ['Dimanĉo','Lundo','Mardo','Merkredo','Ĵaŭdo','Vendredo','Sabato'],
-	dayNamesShort: ['Dim','Lun','Mar','Mer','Ĵaŭ','Ven','Sab'],
-	dayNamesMin: ['Di','Lu','Ma','Me','Ĵa','Ve','Sa'],
-	weekHeader: 'Sb',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.eo = {
+	closeText: "Fermi",
+	prevText: "&#x3C;Anta",
+	nextText: "Sekv&#x3E;",
+	currentText: "Nuna",
+	monthNames: [ "Januaro","Februaro","Marto","Aprilo","Majo","Junio",
+	"Julio","Aŭgusto","Septembro","Oktobro","Novembro","Decembro" ],
+	monthNamesShort: [ "Jan","Feb","Mar","Apr","Maj","Jun",
+	"Jul","Aŭg","Sep","Okt","Nov","Dec" ],
+	dayNames: [ "Dimanĉo","Lundo","Mardo","Merkredo","Ĵaŭdo","Vendredo","Sabato" ],
+	dayNamesShort: [ "Dim","Lun","Mar","Mer","Ĵaŭ","Ven","Sab" ],
+	dayNamesMin: [ "Di","Lu","Ma","Me","Ĵa","Ve","Sa" ],
+	weekHeader: "Sb",
+	dateFormat: "dd/mm/yy",
 	firstDay: 0,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['eo']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.eo );
 
-return datepicker.regional['eo'];
+return datepicker.regional.eo;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-es.js b/ui/i18n/datepicker-es.js
index 79830c5f9ce..ea7116e0bfd 100644
--- a/ui/i18n/datepicker-es.js
+++ b/ui/i18n/datepicker-es.js
@@ -1,37 +1,37 @@
 /* Inicialización en español para la extensión 'UI date picker' para jQuery. */
 /* Traducido por Vester (xvester@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['es'] = {
-	closeText: 'Cerrar',
-	prevText: '&#x3C;Ant',
-	nextText: 'Sig&#x3E;',
-	currentText: 'Hoy',
-	monthNames: ['enero','febrero','marzo','abril','mayo','junio',
-	'julio','agosto','septiembre','octubre','noviembre','diciembre'],
-	monthNamesShort: ['ene','feb','mar','abr','may','jun',
-	'jul','ago','sep','oct','nov','dic'],
-	dayNames: ['domingo','lunes','martes','miércoles','jueves','viernes','sábado'],
-	dayNamesShort: ['dom','lun','mar','mié','jue','vie','sáb'],
-	dayNamesMin: ['D','L','M','X','J','V','S'],
-	weekHeader: 'Sm',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.es = {
+	closeText: "Cerrar",
+	prevText: "&#x3C;Ant",
+	nextText: "Sig&#x3E;",
+	currentText: "Hoy",
+	monthNames: [ "enero","febrero","marzo","abril","mayo","junio",
+	"julio","agosto","septiembre","octubre","noviembre","diciembre" ],
+	monthNamesShort: [ "ene","feb","mar","abr","may","jun",
+	"jul","ago","sep","oct","nov","dic" ],
+	dayNames: [ "domingo","lunes","martes","miércoles","jueves","viernes","sábado" ],
+	dayNamesShort: [ "dom","lun","mar","mié","jue","vie","sáb" ],
+	dayNamesMin: [ "D","L","M","X","J","V","S" ],
+	weekHeader: "Sm",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['es']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.es );
 
-return datepicker.regional['es'];
+return datepicker.regional.es;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-et.js b/ui/i18n/datepicker-et.js
index ebffcdbd31a..691675a9892 100644
--- a/ui/i18n/datepicker-et.js
+++ b/ui/i18n/datepicker-et.js
@@ -1,37 +1,37 @@
 /* Estonian initialisation for the jQuery UI date picker plugin. */
 /* Written by Mart Sõmermaa (mrts.pydev at gmail com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['et'] = {
-	closeText: 'Sulge',
-	prevText: 'Eelnev',
-	nextText: 'Järgnev',
-	currentText: 'Täna',
-	monthNames: ['Jaanuar','Veebruar','Märts','Aprill','Mai','Juuni',
-	'Juuli','August','September','Oktoober','November','Detsember'],
-	monthNamesShort: ['Jaan', 'Veebr', 'Märts', 'Apr', 'Mai', 'Juuni',
-	'Juuli', 'Aug', 'Sept', 'Okt', 'Nov', 'Dets'],
-	dayNames: ['Pühapäev', 'Esmaspäev', 'Teisipäev', 'Kolmapäev', 'Neljapäev', 'Reede', 'Laupäev'],
-	dayNamesShort: ['Pühap', 'Esmasp', 'Teisip', 'Kolmap', 'Neljap', 'Reede', 'Laup'],
-	dayNamesMin: ['P','E','T','K','N','R','L'],
-	weekHeader: 'näd',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.et = {
+	closeText: "Sulge",
+	prevText: "Eelnev",
+	nextText: "Järgnev",
+	currentText: "Täna",
+	monthNames: [ "Jaanuar","Veebruar","Märts","Aprill","Mai","Juuni",
+	"Juuli","August","September","Oktoober","November","Detsember" ],
+	monthNamesShort: [ "Jaan", "Veebr", "Märts", "Apr", "Mai", "Juuni",
+	"Juuli", "Aug", "Sept", "Okt", "Nov", "Dets" ],
+	dayNames: [ "Pühapäev", "Esmaspäev", "Teisipäev", "Kolmapäev", "Neljapäev", "Reede", "Laupäev" ],
+	dayNamesShort: [ "Pühap", "Esmasp", "Teisip", "Kolmap", "Neljap", "Reede", "Laup" ],
+	dayNamesMin: [ "P","E","T","K","N","R","L" ],
+	weekHeader: "näd",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['et']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.et );
 
-return datepicker.regional['et'];
+return datepicker.regional.et;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-eu.js b/ui/i18n/datepicker-eu.js
index 6f15f3402c1..8ea1ef9e584 100644
--- a/ui/i18n/datepicker-eu.js
+++ b/ui/i18n/datepicker-eu.js
@@ -1,36 +1,36 @@
 /* Karrikas-ek itzulia (karrikas@karrikas.com) */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['eu'] = {
-	closeText: 'Egina',
-	prevText: '&#x3C;Aur',
-	nextText: 'Hur&#x3E;',
-	currentText: 'Gaur',
-	monthNames: ['urtarrila','otsaila','martxoa','apirila','maiatza','ekaina',
-		'uztaila','abuztua','iraila','urria','azaroa','abendua'],
-	monthNamesShort: ['urt.','ots.','mar.','api.','mai.','eka.',
-		'uzt.','abu.','ira.','urr.','aza.','abe.'],
-	dayNames: ['igandea','astelehena','asteartea','asteazkena','osteguna','ostirala','larunbata'],
-	dayNamesShort: ['ig.','al.','ar.','az.','og.','ol.','lr.'],
-	dayNamesMin: ['ig','al','ar','az','og','ol','lr'],
-	weekHeader: 'As',
-	dateFormat: 'yy-mm-dd',
+datepicker.regional.eu = {
+	closeText: "Egina",
+	prevText: "&#x3C;Aur",
+	nextText: "Hur&#x3E;",
+	currentText: "Gaur",
+	monthNames: [ "urtarrila","otsaila","martxoa","apirila","maiatza","ekaina",
+		"uztaila","abuztua","iraila","urria","azaroa","abendua" ],
+	monthNamesShort: [ "urt.","ots.","mar.","api.","mai.","eka.",
+		"uzt.","abu.","ira.","urr.","aza.","abe." ],
+	dayNames: [ "igandea","astelehena","asteartea","asteazkena","osteguna","ostirala","larunbata" ],
+	dayNamesShort: [ "ig.","al.","ar.","az.","og.","ol.","lr." ],
+	dayNamesMin: [ "ig","al","ar","az","og","ol","lr" ],
+	weekHeader: "As",
+	dateFormat: "yy-mm-dd",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['eu']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.eu );
 
-return datepicker.regional['eu'];
+return datepicker.regional.eu;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-fa.js b/ui/i18n/datepicker-fa.js
index 89abc5be19a..71da4981d3d 100644
--- a/ui/i18n/datepicker-fa.js
+++ b/ui/i18n/datepicker-fa.js
@@ -1,73 +1,73 @@
 /* Persian (Farsi) Translation for the jQuery UI date picker plugin. */
 /* Javad Mowlanezhad -- jmowla@gmail.com */
 /* Jalali calendar should supported soon! (Its implemented but I have to test it) */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['fa'] = {
-	closeText: 'بستن',
-	prevText: '&#x3C;قبلی',
-	nextText: 'بعدی&#x3E;',
-	currentText: 'امروز',
+datepicker.regional.fa = {
+	closeText: "بستن",
+	prevText: "&#x3C;قبلی",
+	nextText: "بعدی&#x3E;",
+	currentText: "امروز",
 	monthNames: [
-		'ژانویه',
-		'فوریه',
-		'مارس',
-		'آوریل',
-		'مه',
-		'ژوئن',
-		'ژوئیه',
-		'اوت',
-		'سپتامبر',
-		'اکتبر',
-		'نوامبر',
-		'دسامبر'
+		"ژانویه",
+		"فوریه",
+		"مارس",
+		"آوریل",
+		"مه",
+		"ژوئن",
+		"ژوئیه",
+		"اوت",
+		"سپتامبر",
+		"اکتبر",
+		"نوامبر",
+		"دسامبر"
 	],
-	monthNamesShort: ['1','2','3','4','5','6','7','8','9','10','11','12'],
+	monthNamesShort: [ "1","2","3","4","5","6","7","8","9","10","11","12" ],
 	dayNames: [
-		'يکشنبه',
-		'دوشنبه',
-		'سه‌شنبه',
-		'چهارشنبه',
-		'پنجشنبه',
-		'جمعه',
-		'شنبه'
+		"يکشنبه",
+		"دوشنبه",
+		"سه‌شنبه",
+		"چهارشنبه",
+		"پنجشنبه",
+		"جمعه",
+		"شنبه"
 	],
 	dayNamesShort: [
-		'ی',
-		'د',
-		'س',
-		'چ',
-		'پ',
-		'ج',
-		'ش'
+		"ی",
+		"د",
+		"س",
+		"چ",
+		"پ",
+		"ج",
+		"ش"
 	],
 	dayNamesMin: [
-		'ی',
-		'د',
-		'س',
-		'چ',
-		'پ',
-		'ج',
-		'ش'
+		"ی",
+		"د",
+		"س",
+		"چ",
+		"پ",
+		"ج",
+		"ش"
 	],
-	weekHeader: 'هف',
-	dateFormat: 'yy/mm/dd',
+	weekHeader: "هف",
+	dateFormat: "yy/mm/dd",
 	firstDay: 6,
 	isRTL: true,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['fa']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.fa );
 
-return datepicker.regional['fa'];
+return datepicker.regional.fa;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-fi.js b/ui/i18n/datepicker-fi.js
index a9964cfdd60..a8386ff6267 100644
--- a/ui/i18n/datepicker-fi.js
+++ b/ui/i18n/datepicker-fi.js
@@ -1,37 +1,37 @@
 /* Finnish initialisation for the jQuery UI date picker plugin. */
 /* Written by Harri Kilpiö (harrikilpio@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['fi'] = {
-	closeText: 'Sulje',
-	prevText: '&#xAB;Edellinen',
-	nextText: 'Seuraava&#xBB;',
-	currentText: 'Tänään',
-	monthNames: ['Tammikuu','Helmikuu','Maaliskuu','Huhtikuu','Toukokuu','Kesäkuu',
-	'Heinäkuu','Elokuu','Syyskuu','Lokakuu','Marraskuu','Joulukuu'],
-	monthNamesShort: ['Tammi','Helmi','Maalis','Huhti','Touko','Kesä',
-	'Heinä','Elo','Syys','Loka','Marras','Joulu'],
-	dayNamesShort: ['Su','Ma','Ti','Ke','To','Pe','La'],
-	dayNames: ['Sunnuntai','Maanantai','Tiistai','Keskiviikko','Torstai','Perjantai','Lauantai'],
-	dayNamesMin: ['Su','Ma','Ti','Ke','To','Pe','La'],
-	weekHeader: 'Vk',
-	dateFormat: 'd.m.yy',
+datepicker.regional.fi = {
+	closeText: "Sulje",
+	prevText: "&#xAB;Edellinen",
+	nextText: "Seuraava&#xBB;",
+	currentText: "Tänään",
+	monthNames: [ "Tammikuu","Helmikuu","Maaliskuu","Huhtikuu","Toukokuu","Kesäkuu",
+	"Heinäkuu","Elokuu","Syyskuu","Lokakuu","Marraskuu","Joulukuu" ],
+	monthNamesShort: [ "Tammi","Helmi","Maalis","Huhti","Touko","Kesä",
+	"Heinä","Elo","Syys","Loka","Marras","Joulu" ],
+	dayNamesShort: [ "Su","Ma","Ti","Ke","To","Pe","La" ],
+	dayNames: [ "Sunnuntai","Maanantai","Tiistai","Keskiviikko","Torstai","Perjantai","Lauantai" ],
+	dayNamesMin: [ "Su","Ma","Ti","Ke","To","Pe","La" ],
+	weekHeader: "Vk",
+	dateFormat: "d.m.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['fi']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.fi );
 
-return datepicker.regional['fi'];
+return datepicker.regional.fi;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-fo.js b/ui/i18n/datepicker-fo.js
index 7b76db42828..df1e089519a 100644
--- a/ui/i18n/datepicker-fo.js
+++ b/ui/i18n/datepicker-fo.js
@@ -1,37 +1,37 @@
 /* Faroese initialisation for the jQuery UI date picker plugin */
 /* Written by Sverri Mohr Olsen, sverrimo@gmail.com */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['fo'] = {
-	closeText: 'Lat aftur',
-	prevText: '&#x3C;Fyrra',
-	nextText: 'Næsta&#x3E;',
-	currentText: 'Í dag',
-	monthNames: ['Januar','Februar','Mars','Apríl','Mei','Juni',
-	'Juli','August','September','Oktober','November','Desember'],
-	monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun',
-	'Jul','Aug','Sep','Okt','Nov','Des'],
-	dayNames: ['Sunnudagur','Mánadagur','Týsdagur','Mikudagur','Hósdagur','Fríggjadagur','Leyardagur'],
-	dayNamesShort: ['Sun','Mán','Týs','Mik','Hós','Frí','Ley'],
-	dayNamesMin: ['Su','Má','Tý','Mi','Hó','Fr','Le'],
-	weekHeader: 'Vk',
-	dateFormat: 'dd-mm-yy',
+datepicker.regional.fo = {
+	closeText: "Lat aftur",
+	prevText: "&#x3C;Fyrra",
+	nextText: "Næsta&#x3E;",
+	currentText: "Í dag",
+	monthNames: [ "Januar","Februar","Mars","Apríl","Mei","Juni",
+	"Juli","August","September","Oktober","November","Desember" ],
+	monthNamesShort: [ "Jan","Feb","Mar","Apr","Mei","Jun",
+	"Jul","Aug","Sep","Okt","Nov","Des" ],
+	dayNames: [ "Sunnudagur","Mánadagur","Týsdagur","Mikudagur","Hósdagur","Fríggjadagur","Leyardagur" ],
+	dayNamesShort: [ "Sun","Mán","Týs","Mik","Hós","Frí","Ley" ],
+	dayNamesMin: [ "Su","Má","Tý","Mi","Hó","Fr","Le" ],
+	weekHeader: "Vk",
+	dateFormat: "dd-mm-yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['fo']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.fo );
 
-return datepicker.regional['fo'];
+return datepicker.regional.fo;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-fr-CA.js b/ui/i18n/datepicker-fr-CA.js
index c3262b718d3..b590277d4b0 100644
--- a/ui/i18n/datepicker-fr-CA.js
+++ b/ui/i18n/datepicker-fr-CA.js
@@ -1,37 +1,37 @@
 /* Canadian-French initialisation for the jQuery UI date picker plugin. */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['fr-CA'] = {
-	closeText: 'Fermer',
-	prevText: 'Précédent',
-	nextText: 'Suivant',
-	currentText: 'Aujourd\'hui',
-	monthNames: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin',
-		'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
-	monthNamesShort: ['janv.', 'févr.', 'mars', 'avril', 'mai', 'juin',
-		'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'],
-	dayNames: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
-	dayNamesShort: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
-	dayNamesMin: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-	weekHeader: 'Sem.',
-	dateFormat: 'yy-mm-dd',
+datepicker.regional[ "fr-CA" ] = {
+	closeText: "Fermer",
+	prevText: "Précédent",
+	nextText: "Suivant",
+	currentText: "Aujourd'hui",
+	monthNames: [ "janvier", "février", "mars", "avril", "mai", "juin",
+		"juillet", "août", "septembre", "octobre", "novembre", "décembre" ],
+	monthNamesShort: [ "janv.", "févr.", "mars", "avril", "mai", "juin",
+		"juil.", "août", "sept.", "oct.", "nov.", "déc." ],
+	dayNames: [ "dimanche", "lundi", "mardi", "mercredi", "jeudi", "vendredi", "samedi" ],
+	dayNamesShort: [ "dim.", "lun.", "mar.", "mer.", "jeu.", "ven.", "sam." ],
+	dayNamesMin: [ "D", "L", "M", "M", "J", "V", "S" ],
+	weekHeader: "Sem.",
+	dateFormat: "yy-mm-dd",
 	firstDay: 0,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''
+	yearSuffix: ""
 };
-datepicker.setDefaults(datepicker.regional['fr-CA']);
+datepicker.setDefaults( datepicker.regional[ "fr-CA" ] );
 
-return datepicker.regional['fr-CA'];
+return datepicker.regional[ "fr-CA" ];
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-fr-CH.js b/ui/i18n/datepicker-fr-CH.js
index 727a79107da..d2f0584d6a8 100644
--- a/ui/i18n/datepicker-fr-CH.js
+++ b/ui/i18n/datepicker-fr-CH.js
@@ -1,37 +1,37 @@
 /* Swiss-French initialisation for the jQuery UI date picker plugin. */
 /* Written Martin Voelkle (martin.voelkle@e-tc.ch). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['fr-CH'] = {
-	closeText: 'Fermer',
-	prevText: '&#x3C;Préc',
-	nextText: 'Suiv&#x3E;',
-	currentText: 'Courant',
-	monthNames: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin',
-		'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
-	monthNamesShort: ['janv.', 'févr.', 'mars', 'avril', 'mai', 'juin',
-		'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'],
-	dayNames: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
-	dayNamesShort: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
-	dayNamesMin: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-	weekHeader: 'Sm',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional[ "fr-CH" ] = {
+	closeText: "Fermer",
+	prevText: "&#x3C;Préc",
+	nextText: "Suiv&#x3E;",
+	currentText: "Courant",
+	monthNames: [ "janvier", "février", "mars", "avril", "mai", "juin",
+		"juillet", "août", "septembre", "octobre", "novembre", "décembre" ],
+	monthNamesShort: [ "janv.", "févr.", "mars", "avril", "mai", "juin",
+		"juil.", "août", "sept.", "oct.", "nov.", "déc." ],
+	dayNames: [ "dimanche", "lundi", "mardi", "mercredi", "jeudi", "vendredi", "samedi" ],
+	dayNamesShort: [ "dim.", "lun.", "mar.", "mer.", "jeu.", "ven.", "sam." ],
+	dayNamesMin: [ "D", "L", "M", "M", "J", "V", "S" ],
+	weekHeader: "Sm",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['fr-CH']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional[ "fr-CH" ] );
 
-return datepicker.regional['fr-CH'];
+return datepicker.regional[ "fr-CH" ];
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-fr.js b/ui/i18n/datepicker-fr.js
index e4cb3f5af2d..9e39fbd68f5 100644
--- a/ui/i18n/datepicker-fr.js
+++ b/ui/i18n/datepicker-fr.js
@@ -2,38 +2,38 @@
 /* Written by Keith Wood (kbwood{at}iinet.com.au),
 			  Stéphane Nahmani (sholby@sholby.net),
 			  Stéphane Raimbault <stephane.raimbault@gmail.com> */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['fr'] = {
-	closeText: 'Fermer',
-	prevText: 'Précédent',
-	nextText: 'Suivant',
-	currentText: 'Aujourd\'hui',
-	monthNames: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin',
-		'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
-	monthNamesShort: ['janv.', 'févr.', 'mars', 'avr.', 'mai', 'juin',
-		'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'],
-	dayNames: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
-	dayNamesShort: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
-	dayNamesMin: ['D','L','M','M','J','V','S'],
-	weekHeader: 'Sem.',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.fr = {
+	closeText: "Fermer",
+	prevText: "Précédent",
+	nextText: "Suivant",
+	currentText: "Aujourd'hui",
+	monthNames: [ "janvier", "février", "mars", "avril", "mai", "juin",
+		"juillet", "août", "septembre", "octobre", "novembre", "décembre" ],
+	monthNamesShort: [ "janv.", "févr.", "mars", "avr.", "mai", "juin",
+		"juil.", "août", "sept.", "oct.", "nov.", "déc." ],
+	dayNames: [ "dimanche", "lundi", "mardi", "mercredi", "jeudi", "vendredi", "samedi" ],
+	dayNamesShort: [ "dim.", "lun.", "mar.", "mer.", "jeu.", "ven.", "sam." ],
+	dayNamesMin: [ "D","L","M","M","J","V","S" ],
+	weekHeader: "Sem.",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['fr']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.fr );
 
-return datepicker.regional['fr'];
+return datepicker.regional.fr;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-gl.js b/ui/i18n/datepicker-gl.js
index 45e94fcb9f3..2765230746e 100644
--- a/ui/i18n/datepicker-gl.js
+++ b/ui/i18n/datepicker-gl.js
@@ -1,37 +1,37 @@
 /* Galician localization for 'UI date picker' jQuery extension. */
 /* Translated by Jorge Barreiro <yortx.barry@gmail.com>. */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['gl'] = {
-	closeText: 'Pechar',
-	prevText: '&#x3C;Ant',
-	nextText: 'Seg&#x3E;',
-	currentText: 'Hoxe',
-	monthNames: ['Xaneiro','Febreiro','Marzo','Abril','Maio','Xuño',
-	'Xullo','Agosto','Setembro','Outubro','Novembro','Decembro'],
-	monthNamesShort: ['Xan','Feb','Mar','Abr','Mai','Xuñ',
-	'Xul','Ago','Set','Out','Nov','Dec'],
-	dayNames: ['Domingo','Luns','Martes','Mércores','Xoves','Venres','Sábado'],
-	dayNamesShort: ['Dom','Lun','Mar','Mér','Xov','Ven','Sáb'],
-	dayNamesMin: ['Do','Lu','Ma','Mé','Xo','Ve','Sá'],
-	weekHeader: 'Sm',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.gl = {
+	closeText: "Pechar",
+	prevText: "&#x3C;Ant",
+	nextText: "Seg&#x3E;",
+	currentText: "Hoxe",
+	monthNames: [ "Xaneiro","Febreiro","Marzo","Abril","Maio","Xuño",
+	"Xullo","Agosto","Setembro","Outubro","Novembro","Decembro" ],
+	monthNamesShort: [ "Xan","Feb","Mar","Abr","Mai","Xuñ",
+	"Xul","Ago","Set","Out","Nov","Dec" ],
+	dayNames: [ "Domingo","Luns","Martes","Mércores","Xoves","Venres","Sábado" ],
+	dayNamesShort: [ "Dom","Lun","Mar","Mér","Xov","Ven","Sáb" ],
+	dayNamesMin: [ "Do","Lu","Ma","Mé","Xo","Ve","Sá" ],
+	weekHeader: "Sm",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['gl']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.gl );
 
-return datepicker.regional['gl'];
+return datepicker.regional.gl;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-he.js b/ui/i18n/datepicker-he.js
index eeb9a2f7d1b..fb6238fdac7 100644
--- a/ui/i18n/datepicker-he.js
+++ b/ui/i18n/datepicker-he.js
@@ -1,37 +1,37 @@
 /* Hebrew initialisation for the UI Datepicker extension. */
 /* Written by Amir Hardon (ahardon at gmail dot com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['he'] = {
-	closeText: 'סגור',
-	prevText: '&#x3C;הקודם',
-	nextText: 'הבא&#x3E;',
-	currentText: 'היום',
-	monthNames: ['ינואר','פברואר','מרץ','אפריל','מאי','יוני',
-	'יולי','אוגוסט','ספטמבר','אוקטובר','נובמבר','דצמבר'],
-	monthNamesShort: ['ינו','פבר','מרץ','אפר','מאי','יוני',
-	'יולי','אוג','ספט','אוק','נוב','דצמ'],
-	dayNames: ['ראשון','שני','שלישי','רביעי','חמישי','שישי','שבת'],
-	dayNamesShort: ['א\'','ב\'','ג\'','ד\'','ה\'','ו\'','שבת'],
-	dayNamesMin: ['א\'','ב\'','ג\'','ד\'','ה\'','ו\'','שבת'],
-	weekHeader: 'Wk',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.he = {
+	closeText: "סגור",
+	prevText: "&#x3C;הקודם",
+	nextText: "הבא&#x3E;",
+	currentText: "היום",
+	monthNames: [ "ינואר","פברואר","מרץ","אפריל","מאי","יוני",
+	"יולי","אוגוסט","ספטמבר","אוקטובר","נובמבר","דצמבר" ],
+	monthNamesShort: [ "ינו","פבר","מרץ","אפר","מאי","יוני",
+	"יולי","אוג","ספט","אוק","נוב","דצמ" ],
+	dayNames: [ "ראשון","שני","שלישי","רביעי","חמישי","שישי","שבת" ],
+	dayNamesShort: [ "א'","ב'","ג'","ד'","ה'","ו'","שבת" ],
+	dayNamesMin: [ "א'","ב'","ג'","ד'","ה'","ו'","שבת" ],
+	weekHeader: "Wk",
+	dateFormat: "dd/mm/yy",
 	firstDay: 0,
 	isRTL: true,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['he']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.he );
 
-return datepicker.regional['he'];
+return datepicker.regional.he;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-hi.js b/ui/i18n/datepicker-hi.js
index 78e2a9a637a..3b120972459 100644
--- a/ui/i18n/datepicker-hi.js
+++ b/ui/i18n/datepicker-hi.js
@@ -1,37 +1,37 @@
 /* Hindi initialisation for the jQuery UI date picker plugin. */
 /* Written by Michael Dawart. */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['hi'] = {
-	closeText: 'बंद',
-	prevText: 'पिछला',
-	nextText: 'अगला',
-	currentText: 'आज',
-	monthNames: ['जनवरी ','फरवरी','मार्च','अप्रेल','मई','जून',
-	'जूलाई','अगस्त ','सितम्बर','अक्टूबर','नवम्बर','दिसम्बर'],
-	monthNamesShort: ['जन', 'फर', 'मार्च', 'अप्रेल', 'मई', 'जून',
-	'जूलाई', 'अग', 'सित', 'अक्ट', 'नव', 'दि'],
-	dayNames: ['रविवार', 'सोमवार', 'मंगलवार', 'बुधवार', 'गुरुवार', 'शुक्रवार', 'शनिवार'],
-	dayNamesShort: ['रवि', 'सोम', 'मंगल', 'बुध', 'गुरु', 'शुक्र', 'शनि'],
-	dayNamesMin: ['रवि', 'सोम', 'मंगल', 'बुध', 'गुरु', 'शुक्र', 'शनि'],
-	weekHeader: 'हफ्ता',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.hi = {
+	closeText: "बंद",
+	prevText: "पिछला",
+	nextText: "अगला",
+	currentText: "आज",
+	monthNames: [ "जनवरी ","फरवरी","मार्च","अप्रेल","मई","जून",
+	"जूलाई","अगस्त ","सितम्बर","अक्टूबर","नवम्बर","दिसम्बर" ],
+	monthNamesShort: [ "जन", "फर", "मार्च", "अप्रेल", "मई", "जून",
+	"जूलाई", "अग", "सित", "अक्ट", "नव", "दि" ],
+	dayNames: [ "रविवार", "सोमवार", "मंगलवार", "बुधवार", "गुरुवार", "शुक्रवार", "शनिवार" ],
+	dayNamesShort: [ "रवि", "सोम", "मंगल", "बुध", "गुरु", "शुक्र", "शनि" ],
+	dayNamesMin: [ "रवि", "सोम", "मंगल", "बुध", "गुरु", "शुक्र", "शनि" ],
+	weekHeader: "हफ्ता",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['hi']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.hi );
 
-return datepicker.regional['hi'];
+return datepicker.regional.hi;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-hr.js b/ui/i18n/datepicker-hr.js
index 7c278168e23..5e218c12d8a 100644
--- a/ui/i18n/datepicker-hr.js
+++ b/ui/i18n/datepicker-hr.js
@@ -1,37 +1,37 @@
 /* Croatian i18n for the jQuery UI date picker plugin. */
 /* Written by Vjekoslav Nesek. */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['hr'] = {
-	closeText: 'Zatvori',
-	prevText: '&#x3C;',
-	nextText: '&#x3E;',
-	currentText: 'Danas',
-	monthNames: ['Siječanj','Veljača','Ožujak','Travanj','Svibanj','Lipanj',
-	'Srpanj','Kolovoz','Rujan','Listopad','Studeni','Prosinac'],
-	monthNamesShort: ['Sij','Velj','Ožu','Tra','Svi','Lip',
-	'Srp','Kol','Ruj','Lis','Stu','Pro'],
-	dayNames: ['Nedjelja','Ponedjeljak','Utorak','Srijeda','Četvrtak','Petak','Subota'],
-	dayNamesShort: ['Ned','Pon','Uto','Sri','Čet','Pet','Sub'],
-	dayNamesMin: ['Ne','Po','Ut','Sr','Če','Pe','Su'],
-	weekHeader: 'Tje',
-	dateFormat: 'dd.mm.yy.',
+datepicker.regional.hr = {
+	closeText: "Zatvori",
+	prevText: "&#x3C;",
+	nextText: "&#x3E;",
+	currentText: "Danas",
+	monthNames: [ "Siječanj","Veljača","Ožujak","Travanj","Svibanj","Lipanj",
+	"Srpanj","Kolovoz","Rujan","Listopad","Studeni","Prosinac" ],
+	monthNamesShort: [ "Sij","Velj","Ožu","Tra","Svi","Lip",
+	"Srp","Kol","Ruj","Lis","Stu","Pro" ],
+	dayNames: [ "Nedjelja","Ponedjeljak","Utorak","Srijeda","Četvrtak","Petak","Subota" ],
+	dayNamesShort: [ "Ned","Pon","Uto","Sri","Čet","Pet","Sub" ],
+	dayNamesMin: [ "Ne","Po","Ut","Sr","Če","Pe","Su" ],
+	weekHeader: "Tje",
+	dateFormat: "dd.mm.yy.",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['hr']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.hr );
 
-return datepicker.regional['hr'];
+return datepicker.regional.hr;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-hu.js b/ui/i18n/datepicker-hu.js
index 8d28e1aa63e..22bbe7031e9 100644
--- a/ui/i18n/datepicker-hu.js
+++ b/ui/i18n/datepicker-hu.js
@@ -1,36 +1,36 @@
 /* Hungarian initialisation for the jQuery UI date picker plugin. */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['hu'] = {
-	closeText: 'bezár',
-	prevText: 'vissza',
-	nextText: 'előre',
-	currentText: 'ma',
-	monthNames: ['Január', 'Február', 'Március', 'Április', 'Május', 'Június',
-	'Július', 'Augusztus', 'Szeptember', 'Október', 'November', 'December'],
-	monthNamesShort: ['Jan', 'Feb', 'Már', 'Ápr', 'Máj', 'Jún',
-	'Júl', 'Aug', 'Szep', 'Okt', 'Nov', 'Dec'],
-	dayNames: ['Vasárnap', 'Hétfő', 'Kedd', 'Szerda', 'Csütörtök', 'Péntek', 'Szombat'],
-	dayNamesShort: ['Vas', 'Hét', 'Ked', 'Sze', 'Csü', 'Pén', 'Szo'],
-	dayNamesMin: ['V', 'H', 'K', 'Sze', 'Cs', 'P', 'Szo'],
-	weekHeader: 'Hét',
-	dateFormat: 'yy.mm.dd.',
+datepicker.regional.hu = {
+	closeText: "bezár",
+	prevText: "vissza",
+	nextText: "előre",
+	currentText: "ma",
+	monthNames: [ "Január", "Február", "Március", "Április", "Május", "Június",
+	"Július", "Augusztus", "Szeptember", "Október", "November", "December" ],
+	monthNamesShort: [ "Jan", "Feb", "Már", "Ápr", "Máj", "Jún",
+	"Júl", "Aug", "Szep", "Okt", "Nov", "Dec" ],
+	dayNames: [ "Vasárnap", "Hétfő", "Kedd", "Szerda", "Csütörtök", "Péntek", "Szombat" ],
+	dayNamesShort: [ "Vas", "Hét", "Ked", "Sze", "Csü", "Pén", "Szo" ],
+	dayNamesMin: [ "V", "H", "K", "Sze", "Cs", "P", "Szo" ],
+	weekHeader: "Hét",
+	dateFormat: "yy.mm.dd.",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: true,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['hu']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.hu );
 
-return datepicker.regional['hu'];
+return datepicker.regional.hu;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-hy.js b/ui/i18n/datepicker-hy.js
index 69fb79fd1b0..95638b31078 100644
--- a/ui/i18n/datepicker-hy.js
+++ b/ui/i18n/datepicker-hy.js
@@ -1,37 +1,37 @@
 /* Armenian(UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by Levon Zakaryan (levon.zakaryan@gmail.com)*/
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['hy'] = {
-	closeText: 'Փակել',
-	prevText: '&#x3C;Նախ.',
-	nextText: 'Հաջ.&#x3E;',
-	currentText: 'Այսօր',
-	monthNames: ['Հունվար','Փետրվար','Մարտ','Ապրիլ','Մայիս','Հունիս',
-	'Հուլիս','Օգոստոս','Սեպտեմբեր','Հոկտեմբեր','Նոյեմբեր','Դեկտեմբեր'],
-	monthNamesShort: ['Հունվ','Փետր','Մարտ','Ապր','Մայիս','Հունիս',
-	'Հուլ','Օգս','Սեպ','Հոկ','Նոյ','Դեկ'],
-	dayNames: ['կիրակի','եկուշաբթի','երեքշաբթի','չորեքշաբթի','հինգշաբթի','ուրբաթ','շաբաթ'],
-	dayNamesShort: ['կիր','երկ','երք','չրք','հնգ','ուրբ','շբթ'],
-	dayNamesMin: ['կիր','երկ','երք','չրք','հնգ','ուրբ','շբթ'],
-	weekHeader: 'ՇԲՏ',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.hy = {
+	closeText: "Փակել",
+	prevText: "&#x3C;Նախ.",
+	nextText: "Հաջ.&#x3E;",
+	currentText: "Այսօր",
+	monthNames: [ "Հունվար","Փետրվար","Մարտ","Ապրիլ","Մայիս","Հունիս",
+	"Հուլիս","Օգոստոս","Սեպտեմբեր","Հոկտեմբեր","Նոյեմբեր","Դեկտեմբեր" ],
+	monthNamesShort: [ "Հունվ","Փետր","Մարտ","Ապր","Մայիս","Հունիս",
+	"Հուլ","Օգս","Սեպ","Հոկ","Նոյ","Դեկ" ],
+	dayNames: [ "կիրակի","եկուշաբթի","երեքշաբթի","չորեքշաբթի","հինգշաբթի","ուրբաթ","շաբաթ" ],
+	dayNamesShort: [ "կիր","երկ","երք","չրք","հնգ","ուրբ","շբթ" ],
+	dayNamesMin: [ "կիր","երկ","երք","չրք","հնգ","ուրբ","շբթ" ],
+	weekHeader: "ՇԲՏ",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['hy']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.hy );
 
-return datepicker.regional['hy'];
+return datepicker.regional.hy;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-id.js b/ui/i18n/datepicker-id.js
index 135c8620e6a..5aef348af85 100644
--- a/ui/i18n/datepicker-id.js
+++ b/ui/i18n/datepicker-id.js
@@ -1,37 +1,37 @@
 /* Indonesian initialisation for the jQuery UI date picker plugin. */
 /* Written by Deden Fathurahman (dedenf@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['id'] = {
-	closeText: 'Tutup',
-	prevText: '&#x3C;mundur',
-	nextText: 'maju&#x3E;',
-	currentText: 'hari ini',
-	monthNames: ['Januari','Februari','Maret','April','Mei','Juni',
-	'Juli','Agustus','September','Oktober','Nopember','Desember'],
-	monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun',
-	'Jul','Agus','Sep','Okt','Nop','Des'],
-	dayNames: ['Minggu','Senin','Selasa','Rabu','Kamis','Jumat','Sabtu'],
-	dayNamesShort: ['Min','Sen','Sel','Rab','kam','Jum','Sab'],
-	dayNamesMin: ['Mg','Sn','Sl','Rb','Km','jm','Sb'],
-	weekHeader: 'Mg',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.id = {
+	closeText: "Tutup",
+	prevText: "&#x3C;mundur",
+	nextText: "maju&#x3E;",
+	currentText: "hari ini",
+	monthNames: [ "Januari","Februari","Maret","April","Mei","Juni",
+	"Juli","Agustus","September","Oktober","Nopember","Desember" ],
+	monthNamesShort: [ "Jan","Feb","Mar","Apr","Mei","Jun",
+	"Jul","Agus","Sep","Okt","Nop","Des" ],
+	dayNames: [ "Minggu","Senin","Selasa","Rabu","Kamis","Jumat","Sabtu" ],
+	dayNamesShort: [ "Min","Sen","Sel","Rab","kam","Jum","Sab" ],
+	dayNamesMin: [ "Mg","Sn","Sl","Rb","Km","jm","Sb" ],
+	weekHeader: "Mg",
+	dateFormat: "dd/mm/yy",
 	firstDay: 0,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['id']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.id );
 
-return datepicker.regional['id'];
+return datepicker.regional.id;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-is.js b/ui/i18n/datepicker-is.js
index 76fce6374a4..f977de3266f 100644
--- a/ui/i18n/datepicker-is.js
+++ b/ui/i18n/datepicker-is.js
@@ -1,37 +1,37 @@
 /* Icelandic initialisation for the jQuery UI date picker plugin. */
 /* Written by Haukur H. Thorsson (haukur@eskill.is). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['is'] = {
-	closeText: 'Loka',
-	prevText: '&#x3C; Fyrri',
-	nextText: 'Næsti &#x3E;',
-	currentText: 'Í dag',
-	monthNames: ['Janúar','Febrúar','Mars','Apríl','Maí','Júní',
-	'Júlí','Ágúst','September','Október','Nóvember','Desember'],
-	monthNamesShort: ['Jan','Feb','Mar','Apr','Maí','Jún',
-	'Júl','Ágú','Sep','Okt','Nóv','Des'],
-	dayNames: ['Sunnudagur','Mánudagur','Þriðjudagur','Miðvikudagur','Fimmtudagur','Föstudagur','Laugardagur'],
-	dayNamesShort: ['Sun','Mán','Þri','Mið','Fim','Fös','Lau'],
-	dayNamesMin: ['Su','Má','Þr','Mi','Fi','Fö','La'],
-	weekHeader: 'Vika',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.is = {
+	closeText: "Loka",
+	prevText: "&#x3C; Fyrri",
+	nextText: "Næsti &#x3E;",
+	currentText: "Í dag",
+	monthNames: [ "Janúar","Febrúar","Mars","Apríl","Maí","Júní",
+	"Júlí","Ágúst","September","Október","Nóvember","Desember" ],
+	monthNamesShort: [ "Jan","Feb","Mar","Apr","Maí","Jún",
+	"Júl","Ágú","Sep","Okt","Nóv","Des" ],
+	dayNames: [ "Sunnudagur","Mánudagur","Þriðjudagur","Miðvikudagur","Fimmtudagur","Föstudagur","Laugardagur" ],
+	dayNamesShort: [ "Sun","Mán","Þri","Mið","Fim","Fös","Lau" ],
+	dayNamesMin: [ "Su","Má","Þr","Mi","Fi","Fö","La" ],
+	weekHeader: "Vika",
+	dateFormat: "dd.mm.yy",
 	firstDay: 0,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['is']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.is );
 
-return datepicker.regional['is'];
+return datepicker.regional.is;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-it-CH.js b/ui/i18n/datepicker-it-CH.js
index 7f44730256c..9895da4cc32 100644
--- a/ui/i18n/datepicker-it-CH.js
+++ b/ui/i18n/datepicker-it-CH.js
@@ -1,37 +1,37 @@
 /* Italian initialisation for the jQuery UI date picker plugin. */
 /* Written by Antonello Pasella (antonello.pasella@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['it-CH'] = {
-	closeText: 'Chiudi',
-	prevText: '&#x3C;Prec',
-	nextText: 'Succ&#x3E;',
-	currentText: 'Oggi',
-	monthNames: ['Gennaio','Febbraio','Marzo','Aprile','Maggio','Giugno',
-		'Luglio','Agosto','Settembre','Ottobre','Novembre','Dicembre'],
-	monthNamesShort: ['Gen','Feb','Mar','Apr','Mag','Giu',
-		'Lug','Ago','Set','Ott','Nov','Dic'],
-	dayNames: ['Domenica','Lunedì','Martedì','Mercoledì','Giovedì','Venerdì','Sabato'],
-	dayNamesShort: ['Dom','Lun','Mar','Mer','Gio','Ven','Sab'],
-	dayNamesMin: ['Do','Lu','Ma','Me','Gi','Ve','Sa'],
-	weekHeader: 'Sm',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional[ "it-CH" ] = {
+	closeText: "Chiudi",
+	prevText: "&#x3C;Prec",
+	nextText: "Succ&#x3E;",
+	currentText: "Oggi",
+	monthNames: [ "Gennaio","Febbraio","Marzo","Aprile","Maggio","Giugno",
+		"Luglio","Agosto","Settembre","Ottobre","Novembre","Dicembre" ],
+	monthNamesShort: [ "Gen","Feb","Mar","Apr","Mag","Giu",
+		"Lug","Ago","Set","Ott","Nov","Dic" ],
+	dayNames: [ "Domenica","Lunedì","Martedì","Mercoledì","Giovedì","Venerdì","Sabato" ],
+	dayNamesShort: [ "Dom","Lun","Mar","Mer","Gio","Ven","Sab" ],
+	dayNamesMin: [ "Do","Lu","Ma","Me","Gi","Ve","Sa" ],
+	weekHeader: "Sm",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['it-CH']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional[ "it-CH" ] );
 
-return datepicker.regional['it-CH'];
+return datepicker.regional[ "it-CH" ];
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-it.js b/ui/i18n/datepicker-it.js
index 24dff6ee6ed..d67cb6c248a 100644
--- a/ui/i18n/datepicker-it.js
+++ b/ui/i18n/datepicker-it.js
@@ -1,37 +1,37 @@
 /* Italian initialisation for the jQuery UI date picker plugin. */
 /* Written by Antonello Pasella (antonello.pasella@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['it'] = {
-	closeText: 'Chiudi',
-	prevText: '&#x3C;Prec',
-	nextText: 'Succ&#x3E;',
-	currentText: 'Oggi',
-	monthNames: ['Gennaio','Febbraio','Marzo','Aprile','Maggio','Giugno',
-		'Luglio','Agosto','Settembre','Ottobre','Novembre','Dicembre'],
-	monthNamesShort: ['Gen','Feb','Mar','Apr','Mag','Giu',
-		'Lug','Ago','Set','Ott','Nov','Dic'],
-	dayNames: ['Domenica','Lunedì','Martedì','Mercoledì','Giovedì','Venerdì','Sabato'],
-	dayNamesShort: ['Dom','Lun','Mar','Mer','Gio','Ven','Sab'],
-	dayNamesMin: ['Do','Lu','Ma','Me','Gi','Ve','Sa'],
-	weekHeader: 'Sm',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.it = {
+	closeText: "Chiudi",
+	prevText: "&#x3C;Prec",
+	nextText: "Succ&#x3E;",
+	currentText: "Oggi",
+	monthNames: [ "Gennaio","Febbraio","Marzo","Aprile","Maggio","Giugno",
+		"Luglio","Agosto","Settembre","Ottobre","Novembre","Dicembre" ],
+	monthNamesShort: [ "Gen","Feb","Mar","Apr","Mag","Giu",
+		"Lug","Ago","Set","Ott","Nov","Dic" ],
+	dayNames: [ "Domenica","Lunedì","Martedì","Mercoledì","Giovedì","Venerdì","Sabato" ],
+	dayNamesShort: [ "Dom","Lun","Mar","Mer","Gio","Ven","Sab" ],
+	dayNamesMin: [ "Do","Lu","Ma","Me","Gi","Ve","Sa" ],
+	weekHeader: "Sm",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['it']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.it );
 
-return datepicker.regional['it'];
+return datepicker.regional.it;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-ja.js b/ui/i18n/datepicker-ja.js
index 8806d194b24..52b10583cab 100644
--- a/ui/i18n/datepicker-ja.js
+++ b/ui/i18n/datepicker-ja.js
@@ -1,37 +1,37 @@
 /* Japanese initialisation for the jQuery UI date picker plugin. */
 /* Written by Kentaro SATO (kentaro@ranvis.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['ja'] = {
-	closeText: '閉じる',
-	prevText: '&#x3C;前',
-	nextText: '次&#x3E;',
-	currentText: '今日',
-	monthNames: ['1月','2月','3月','4月','5月','6月',
-	'7月','8月','9月','10月','11月','12月'],
-	monthNamesShort: ['1月','2月','3月','4月','5月','6月',
-	'7月','8月','9月','10月','11月','12月'],
-	dayNames: ['日曜日','月曜日','火曜日','水曜日','木曜日','金曜日','土曜日'],
-	dayNamesShort: ['日','月','火','水','木','金','土'],
-	dayNamesMin: ['日','月','火','水','木','金','土'],
-	weekHeader: '週',
-	dateFormat: 'yy/mm/dd',
+datepicker.regional.ja = {
+	closeText: "閉じる",
+	prevText: "&#x3C;前",
+	nextText: "次&#x3E;",
+	currentText: "今日",
+	monthNames: [ "1月","2月","3月","4月","5月","6月",
+	"7月","8月","9月","10月","11月","12月" ],
+	monthNamesShort: [ "1月","2月","3月","4月","5月","6月",
+	"7月","8月","9月","10月","11月","12月" ],
+	dayNames: [ "日曜日","月曜日","火曜日","水曜日","木曜日","金曜日","土曜日" ],
+	dayNamesShort: [ "日","月","火","水","木","金","土" ],
+	dayNamesMin: [ "日","月","火","水","木","金","土" ],
+	weekHeader: "週",
+	dateFormat: "yy/mm/dd",
 	firstDay: 0,
 	isRTL: false,
 	showMonthAfterYear: true,
-	yearSuffix: '年'};
-datepicker.setDefaults(datepicker.regional['ja']);
+	yearSuffix: "年" };
+datepicker.setDefaults( datepicker.regional.ja );
 
-return datepicker.regional['ja'];
+return datepicker.regional.ja;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-ka.js b/ui/i18n/datepicker-ka.js
index e3dd2f0c465..6a4aa392ff2 100644
--- a/ui/i18n/datepicker-ka.js
+++ b/ui/i18n/datepicker-ka.js
@@ -1,35 +1,35 @@
 /* Georgian (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by Lado Lomidze (lado.lomidze@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['ka'] = {
-	closeText: 'დახურვა',
-	prevText: '&#x3c; წინა',
-	nextText: 'შემდეგი &#x3e;',
-	currentText: 'დღეს',
-	monthNames: ['იანვარი','თებერვალი','მარტი','აპრილი','მაისი','ივნისი', 'ივლისი','აგვისტო','სექტემბერი','ოქტომბერი','ნოემბერი','დეკემბერი'],
-	monthNamesShort: ['იან','თებ','მარ','აპრ','მაი','ივნ', 'ივლ','აგვ','სექ','ოქტ','ნოე','დეკ'],
-	dayNames: ['კვირა','ორშაბათი','სამშაბათი','ოთხშაბათი','ხუთშაბათი','პარასკევი','შაბათი'],
-	dayNamesShort: ['კვ','ორშ','სამ','ოთხ','ხუთ','პარ','შაბ'],
-	dayNamesMin: ['კვ','ორშ','სამ','ოთხ','ხუთ','პარ','შაბ'],
-	weekHeader: 'კვირა',
-	dateFormat: 'dd-mm-yy',
+datepicker.regional.ka = {
+	closeText: "დახურვა",
+	prevText: "&#x3c; წინა",
+	nextText: "შემდეგი &#x3e;",
+	currentText: "დღეს",
+	monthNames: [ "იანვარი","თებერვალი","მარტი","აპრილი","მაისი","ივნისი", "ივლისი","აგვისტო","სექტემბერი","ოქტომბერი","ნოემბერი","დეკემბერი" ],
+	monthNamesShort: [ "იან","თებ","მარ","აპრ","მაი","ივნ", "ივლ","აგვ","სექ","ოქტ","ნოე","დეკ" ],
+	dayNames: [ "კვირა","ორშაბათი","სამშაბათი","ოთხშაბათი","ხუთშაბათი","პარასკევი","შაბათი" ],
+	dayNamesShort: [ "კვ","ორშ","სამ","ოთხ","ხუთ","პარ","შაბ" ],
+	dayNamesMin: [ "კვ","ორშ","სამ","ოთხ","ხუთ","პარ","შაბ" ],
+	weekHeader: "კვირა",
+	dateFormat: "dd-mm-yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['ka']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.ka );
 
-return datepicker.regional['ka'];
+return datepicker.regional.ka;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-kk.js b/ui/i18n/datepicker-kk.js
index a4d2d5c4b48..fa0121f8c2a 100644
--- a/ui/i18n/datepicker-kk.js
+++ b/ui/i18n/datepicker-kk.js
@@ -1,37 +1,37 @@
 /* Kazakh (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by Dmitriy Karasyov (dmitriy.karasyov@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['kk'] = {
-	closeText: 'Жабу',
-	prevText: '&#x3C;Алдыңғы',
-	nextText: 'Келесі&#x3E;',
-	currentText: 'Бүгін',
-	monthNames: ['Қаңтар','Ақпан','Наурыз','Сәуір','Мамыр','Маусым',
-	'Шілде','Тамыз','Қыркүйек','Қазан','Қараша','Желтоқсан'],
-	monthNamesShort: ['Қаң','Ақп','Нау','Сәу','Мам','Мау',
-	'Шіл','Там','Қыр','Қаз','Қар','Жел'],
-	dayNames: ['Жексенбі','Дүйсенбі','Сейсенбі','Сәрсенбі','Бейсенбі','Жұма','Сенбі'],
-	dayNamesShort: ['жкс','дсн','ссн','срс','бсн','жма','снб'],
-	dayNamesMin: ['Жк','Дс','Сс','Ср','Бс','Жм','Сн'],
-	weekHeader: 'Не',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.kk = {
+	closeText: "Жабу",
+	prevText: "&#x3C;Алдыңғы",
+	nextText: "Келесі&#x3E;",
+	currentText: "Бүгін",
+	monthNames: [ "Қаңтар","Ақпан","Наурыз","Сәуір","Мамыр","Маусым",
+	"Шілде","Тамыз","Қыркүйек","Қазан","Қараша","Желтоқсан" ],
+	monthNamesShort: [ "Қаң","Ақп","Нау","Сәу","Мам","Мау",
+	"Шіл","Там","Қыр","Қаз","Қар","Жел" ],
+	dayNames: [ "Жексенбі","Дүйсенбі","Сейсенбі","Сәрсенбі","Бейсенбі","Жұма","Сенбі" ],
+	dayNamesShort: [ "жкс","дсн","ссн","срс","бсн","жма","снб" ],
+	dayNamesMin: [ "Жк","Дс","Сс","Ср","Бс","Жм","Сн" ],
+	weekHeader: "Не",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['kk']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.kk );
 
-return datepicker.regional['kk'];
+return datepicker.regional.kk;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-km.js b/ui/i18n/datepicker-km.js
index 48e35a14760..d8a4596bce7 100644
--- a/ui/i18n/datepicker-km.js
+++ b/ui/i18n/datepicker-km.js
@@ -1,37 +1,37 @@
 /* Khmer initialisation for the jQuery calendar extension. */
 /* Written by Chandara Om (chandara.teacher@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['km'] = {
-	closeText: 'ធ្វើ​រួច',
-	prevText: 'មុន',
-	nextText: 'បន្ទាប់',
-	currentText: 'ថ្ងៃ​នេះ',
-	monthNames: ['មករា','កុម្ភៈ','មីនា','មេសា','ឧសភា','មិថុនា',
-	'កក្កដា','សីហា','កញ្ញា','តុលា','វិច្ឆិកា','ធ្នូ'],
-	monthNamesShort: ['មករា','កុម្ភៈ','មីនា','មេសា','ឧសភា','មិថុនា',
-	'កក្កដា','សីហា','កញ្ញា','តុលា','វិច្ឆិកា','ធ្នូ'],
-	dayNames: ['អាទិត្យ', 'ចន្ទ', 'អង្គារ', 'ពុធ', 'ព្រហស្បតិ៍', 'សុក្រ', 'សៅរ៍'],
-	dayNamesShort: ['អា', 'ច', 'អ', 'ពុ', 'ព្រហ', 'សុ', 'សៅ'],
-	dayNamesMin: ['អា', 'ច', 'អ', 'ពុ', 'ព្រហ', 'សុ', 'សៅ'],
-	weekHeader: 'សប្ដាហ៍',
-	dateFormat: 'dd-mm-yy',
+datepicker.regional.km = {
+	closeText: "ធ្វើ​រួច",
+	prevText: "មុន",
+	nextText: "បន្ទាប់",
+	currentText: "ថ្ងៃ​នេះ",
+	monthNames: [ "មករា","កុម្ភៈ","មីនា","មេសា","ឧសភា","មិថុនា",
+	"កក្កដា","សីហា","កញ្ញា","តុលា","វិច្ឆិកា","ធ្នូ" ],
+	monthNamesShort: [ "មករា","កុម្ភៈ","មីនា","មេសា","ឧសភា","មិថុនា",
+	"កក្កដា","សីហា","កញ្ញា","តុលា","វិច្ឆិកា","ធ្នូ" ],
+	dayNames: [ "អាទិត្យ", "ចន្ទ", "អង្គារ", "ពុធ", "ព្រហស្បតិ៍", "សុក្រ", "សៅរ៍" ],
+	dayNamesShort: [ "អា", "ច", "អ", "ពុ", "ព្រហ", "សុ", "សៅ" ],
+	dayNamesMin: [ "អា", "ច", "អ", "ពុ", "ព្រហ", "សុ", "សៅ" ],
+	weekHeader: "សប្ដាហ៍",
+	dateFormat: "dd-mm-yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['km']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.km );
 
-return datepicker.regional['km'];
+return datepicker.regional.km;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-ko.js b/ui/i18n/datepicker-ko.js
index 2c90102580b..31c195e0c3d 100644
--- a/ui/i18n/datepicker-ko.js
+++ b/ui/i18n/datepicker-ko.js
@@ -1,37 +1,37 @@
 /* Korean initialisation for the jQuery calendar extension. */
 /* Written by DaeKwon Kang (ncrash.dk@gmail.com), Edited by Genie. */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['ko'] = {
-	closeText: '닫기',
-	prevText: '이전달',
-	nextText: '다음달',
-	currentText: '오늘',
-	monthNames: ['1월','2월','3월','4월','5월','6월',
-	'7월','8월','9월','10월','11월','12월'],
-	monthNamesShort: ['1월','2월','3월','4월','5월','6월',
-	'7월','8월','9월','10월','11월','12월'],
-	dayNames: ['일요일','월요일','화요일','수요일','목요일','금요일','토요일'],
-	dayNamesShort: ['일','월','화','수','목','금','토'],
-	dayNamesMin: ['일','월','화','수','목','금','토'],
-	weekHeader: 'Wk',
-	dateFormat: 'yy-mm-dd',
+datepicker.regional.ko = {
+	closeText: "닫기",
+	prevText: "이전달",
+	nextText: "다음달",
+	currentText: "오늘",
+	monthNames: [ "1월","2월","3월","4월","5월","6월",
+	"7월","8월","9월","10월","11월","12월" ],
+	monthNamesShort: [ "1월","2월","3월","4월","5월","6월",
+	"7월","8월","9월","10월","11월","12월" ],
+	dayNames: [ "일요일","월요일","화요일","수요일","목요일","금요일","토요일" ],
+	dayNamesShort: [ "일","월","화","수","목","금","토" ],
+	dayNamesMin: [ "일","월","화","수","목","금","토" ],
+	weekHeader: "Wk",
+	dateFormat: "yy-mm-dd",
 	firstDay: 0,
 	isRTL: false,
 	showMonthAfterYear: true,
-	yearSuffix: '년'};
-datepicker.setDefaults(datepicker.regional['ko']);
+	yearSuffix: "년" };
+datepicker.setDefaults( datepicker.regional.ko );
 
-return datepicker.regional['ko'];
+return datepicker.regional.ko;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-ky.js b/ui/i18n/datepicker-ky.js
index 4fa84be89e0..f748bc60607 100644
--- a/ui/i18n/datepicker-ky.js
+++ b/ui/i18n/datepicker-ky.js
@@ -1,38 +1,38 @@
 /* Kyrgyz (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by Sergey Kartashov (ebishkek@yandex.ru). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['ky'] = {
-	closeText: 'Жабуу',
-	prevText: '&#x3c;Мур',
-	nextText: 'Кий&#x3e;',
-	currentText: 'Бүгүн',
-	monthNames: ['Январь','Февраль','Март','Апрель','Май','Июнь',
-	'Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'],
-	monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн',
-	'Июл','Авг','Сен','Окт','Ноя','Дек'],
-	dayNames: ['жекшемби', 'дүйшөмбү', 'шейшемби', 'шаршемби', 'бейшемби', 'жума', 'ишемби'],
-	dayNamesShort: ['жек', 'дүй', 'шей', 'шар', 'бей', 'жум', 'ише'],
-	dayNamesMin: ['Жк','Дш','Шш','Шр','Бш','Жм','Иш'],
-	weekHeader: 'Жум',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.ky = {
+	closeText: "Жабуу",
+	prevText: "&#x3c;Мур",
+	nextText: "Кий&#x3e;",
+	currentText: "Бүгүн",
+	monthNames: [ "Январь","Февраль","Март","Апрель","Май","Июнь",
+	"Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь" ],
+	monthNamesShort: [ "Янв","Фев","Мар","Апр","Май","Июн",
+	"Июл","Авг","Сен","Окт","Ноя","Дек" ],
+	dayNames: [ "жекшемби", "дүйшөмбү", "шейшемби", "шаршемби", "бейшемби", "жума", "ишемби" ],
+	dayNamesShort: [ "жек", "дүй", "шей", "шар", "бей", "жум", "ише" ],
+	dayNamesMin: [ "Жк","Дш","Шш","Шр","Бш","Жм","Иш" ],
+	weekHeader: "Жум",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''
+	yearSuffix: ""
 };
-datepicker.setDefaults(datepicker.regional['ky']);
+datepicker.setDefaults( datepicker.regional.ky );
 
-return datepicker.regional['ky'];
+return datepicker.regional.ky;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-lb.js b/ui/i18n/datepicker-lb.js
index 02465655061..a8fa03b8ff1 100644
--- a/ui/i18n/datepicker-lb.js
+++ b/ui/i18n/datepicker-lb.js
@@ -1,37 +1,37 @@
 /* Luxembourgish initialisation for the jQuery UI date picker plugin. */
 /* Written by Michel Weimerskirch <michel@weimerskirch.net> */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['lb'] = {
-	closeText: 'Fäerdeg',
-	prevText: 'Zréck',
-	nextText: 'Weider',
-	currentText: 'Haut',
-	monthNames: ['Januar','Februar','Mäerz','Abrëll','Mee','Juni',
-	'Juli','August','September','Oktober','November','Dezember'],
-	monthNamesShort: ['Jan', 'Feb', 'Mäe', 'Abr', 'Mee', 'Jun',
-	'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
-	dayNames: ['Sonndeg', 'Méindeg', 'Dënschdeg', 'Mëttwoch', 'Donneschdeg', 'Freideg', 'Samschdeg'],
-	dayNamesShort: ['Son', 'Méi', 'Dën', 'Mët', 'Don', 'Fre', 'Sam'],
-	dayNamesMin: ['So','Mé','Dë','Më','Do','Fr','Sa'],
-	weekHeader: 'W',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.lb = {
+	closeText: "Fäerdeg",
+	prevText: "Zréck",
+	nextText: "Weider",
+	currentText: "Haut",
+	monthNames: [ "Januar","Februar","Mäerz","Abrëll","Mee","Juni",
+	"Juli","August","September","Oktober","November","Dezember" ],
+	monthNamesShort: [ "Jan", "Feb", "Mäe", "Abr", "Mee", "Jun",
+	"Jul", "Aug", "Sep", "Okt", "Nov", "Dez" ],
+	dayNames: [ "Sonndeg", "Méindeg", "Dënschdeg", "Mëttwoch", "Donneschdeg", "Freideg", "Samschdeg" ],
+	dayNamesShort: [ "Son", "Méi", "Dën", "Mët", "Don", "Fre", "Sam" ],
+	dayNamesMin: [ "So","Mé","Dë","Më","Do","Fr","Sa" ],
+	weekHeader: "W",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['lb']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.lb );
 
-return datepicker.regional['lb'];
+return datepicker.regional.lb;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-lt.js b/ui/i18n/datepicker-lt.js
index 2f5a67e1d9e..35554764f63 100644
--- a/ui/i18n/datepicker-lt.js
+++ b/ui/i18n/datepicker-lt.js
@@ -1,37 +1,37 @@
 /* Lithuanian (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* @author Arturas Paleicikas <arturas@avalon.lt> */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['lt'] = {
-	closeText: 'Uždaryti',
-	prevText: '&#x3C;Atgal',
-	nextText: 'Pirmyn&#x3E;',
-	currentText: 'Šiandien',
-	monthNames: ['Sausis','Vasaris','Kovas','Balandis','Gegužė','Birželis',
-	'Liepa','Rugpjūtis','Rugsėjis','Spalis','Lapkritis','Gruodis'],
-	monthNamesShort: ['Sau','Vas','Kov','Bal','Geg','Bir',
-	'Lie','Rugp','Rugs','Spa','Lap','Gru'],
-	dayNames: ['sekmadienis','pirmadienis','antradienis','trečiadienis','ketvirtadienis','penktadienis','šeštadienis'],
-	dayNamesShort: ['sek','pir','ant','tre','ket','pen','šeš'],
-	dayNamesMin: ['Se','Pr','An','Tr','Ke','Pe','Še'],
-	weekHeader: 'SAV',
-	dateFormat: 'yy-mm-dd',
+datepicker.regional.lt = {
+	closeText: "Uždaryti",
+	prevText: "&#x3C;Atgal",
+	nextText: "Pirmyn&#x3E;",
+	currentText: "Šiandien",
+	monthNames: [ "Sausis","Vasaris","Kovas","Balandis","Gegužė","Birželis",
+	"Liepa","Rugpjūtis","Rugsėjis","Spalis","Lapkritis","Gruodis" ],
+	monthNamesShort: [ "Sau","Vas","Kov","Bal","Geg","Bir",
+	"Lie","Rugp","Rugs","Spa","Lap","Gru" ],
+	dayNames: [ "sekmadienis","pirmadienis","antradienis","trečiadienis","ketvirtadienis","penktadienis","šeštadienis" ],
+	dayNamesShort: [ "sek","pir","ant","tre","ket","pen","šeš" ],
+	dayNamesMin: [ "Se","Pr","An","Tr","Ke","Pe","Še" ],
+	weekHeader: "SAV",
+	dateFormat: "yy-mm-dd",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: true,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['lt']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.lt );
 
-return datepicker.regional['lt'];
+return datepicker.regional.lt;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-lv.js b/ui/i18n/datepicker-lv.js
index 20dda0acb12..ec49c43a646 100644
--- a/ui/i18n/datepicker-lv.js
+++ b/ui/i18n/datepicker-lv.js
@@ -1,37 +1,37 @@
 /* Latvian (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* @author Arturas Paleicikas <arturas.paleicikas@metasite.net> */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['lv'] = {
-	closeText: 'Aizvērt',
-	prevText: 'Iepr.',
-	nextText: 'Nāk.',
-	currentText: 'Šodien',
-	monthNames: ['Janvāris','Februāris','Marts','Aprīlis','Maijs','Jūnijs',
-	'Jūlijs','Augusts','Septembris','Oktobris','Novembris','Decembris'],
-	monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jūn',
-	'Jūl','Aug','Sep','Okt','Nov','Dec'],
-	dayNames: ['svētdiena','pirmdiena','otrdiena','trešdiena','ceturtdiena','piektdiena','sestdiena'],
-	dayNamesShort: ['svt','prm','otr','tre','ctr','pkt','sst'],
-	dayNamesMin: ['Sv','Pr','Ot','Tr','Ct','Pk','Ss'],
-	weekHeader: 'Ned.',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.lv = {
+	closeText: "Aizvērt",
+	prevText: "Iepr.",
+	nextText: "Nāk.",
+	currentText: "Šodien",
+	monthNames: [ "Janvāris","Februāris","Marts","Aprīlis","Maijs","Jūnijs",
+	"Jūlijs","Augusts","Septembris","Oktobris","Novembris","Decembris" ],
+	monthNamesShort: [ "Jan","Feb","Mar","Apr","Mai","Jūn",
+	"Jūl","Aug","Sep","Okt","Nov","Dec" ],
+	dayNames: [ "svētdiena","pirmdiena","otrdiena","trešdiena","ceturtdiena","piektdiena","sestdiena" ],
+	dayNamesShort: [ "svt","prm","otr","tre","ctr","pkt","sst" ],
+	dayNamesMin: [ "Sv","Pr","Ot","Tr","Ct","Pk","Ss" ],
+	weekHeader: "Ned.",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['lv']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.lv );
 
-return datepicker.regional['lv'];
+return datepicker.regional.lv;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-mk.js b/ui/i18n/datepicker-mk.js
index b5463d182c2..97864ab1516 100644
--- a/ui/i18n/datepicker-mk.js
+++ b/ui/i18n/datepicker-mk.js
@@ -1,37 +1,37 @@
 /* Macedonian i18n for the jQuery UI date picker plugin. */
 /* Written by Stojce Slavkovski. */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['mk'] = {
-	closeText: 'Затвори',
-	prevText: '&#x3C;',
-	nextText: '&#x3E;',
-	currentText: 'Денес',
-	monthNames: ['Јануари','Февруари','Март','Април','Мај','Јуни',
-	'Јули','Август','Септември','Октомври','Ноември','Декември'],
-	monthNamesShort: ['Јан','Фев','Мар','Апр','Мај','Јун',
-	'Јул','Авг','Сеп','Окт','Ное','Дек'],
-	dayNames: ['Недела','Понеделник','Вторник','Среда','Четврток','Петок','Сабота'],
-	dayNamesShort: ['Нед','Пон','Вто','Сре','Чет','Пет','Саб'],
-	dayNamesMin: ['Не','По','Вт','Ср','Че','Пе','Са'],
-	weekHeader: 'Сед',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.mk = {
+	closeText: "Затвори",
+	prevText: "&#x3C;",
+	nextText: "&#x3E;",
+	currentText: "Денес",
+	monthNames: [ "Јануари","Февруари","Март","Април","Мај","Јуни",
+	"Јули","Август","Септември","Октомври","Ноември","Декември" ],
+	monthNamesShort: [ "Јан","Фев","Мар","Апр","Мај","Јун",
+	"Јул","Авг","Сеп","Окт","Ное","Дек" ],
+	dayNames: [ "Недела","Понеделник","Вторник","Среда","Четврток","Петок","Сабота" ],
+	dayNamesShort: [ "Нед","Пон","Вто","Сре","Чет","Пет","Саб" ],
+	dayNamesMin: [ "Не","По","Вт","Ср","Че","Пе","Са" ],
+	weekHeader: "Сед",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['mk']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.mk );
 
-return datepicker.regional['mk'];
+return datepicker.regional.mk;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-ml.js b/ui/i18n/datepicker-ml.js
index 554cb16675f..440e09e0346 100644
--- a/ui/i18n/datepicker-ml.js
+++ b/ui/i18n/datepicker-ml.js
@@ -1,37 +1,37 @@
 /* Malayalam (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by Saji Nediyanchath (saji89@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['ml'] = {
-	closeText: 'ശരി',
-	prevText: 'മുന്നത്തെ',
-	nextText: 'അടുത്തത് ',
-	currentText: 'ഇന്ന്',
-	monthNames: ['ജനുവരി','ഫെബ്രുവരി','മാര്‍ച്ച്','ഏപ്രില്‍','മേയ്','ജൂണ്‍',
-	'ജൂലൈ','ആഗസ്റ്റ്','സെപ്റ്റംബര്‍','ഒക്ടോബര്‍','നവംബര്‍','ഡിസംബര്‍'],
-	monthNamesShort: ['ജനു', 'ഫെബ്', 'മാര്‍', 'ഏപ്രി', 'മേയ്', 'ജൂണ്‍',
-	'ജൂലാ', 'ആഗ', 'സെപ്', 'ഒക്ടോ', 'നവം', 'ഡിസ'],
-	dayNames: ['ഞായര്‍', 'തിങ്കള്‍', 'ചൊവ്വ', 'ബുധന്‍', 'വ്യാഴം', 'വെള്ളി', 'ശനി'],
-	dayNamesShort: ['ഞായ', 'തിങ്ക', 'ചൊവ്വ', 'ബുധ', 'വ്യാഴം', 'വെള്ളി', 'ശനി'],
-	dayNamesMin: ['ഞാ','തി','ചൊ','ബു','വ്യാ','വെ','ശ'],
-	weekHeader: 'ആ',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.ml = {
+	closeText: "ശരി",
+	prevText: "മുന്നത്തെ",
+	nextText: "അടുത്തത് ",
+	currentText: "ഇന്ന്",
+	monthNames: [ "ജനുവരി","ഫെബ്രുവരി","മാര്‍ച്ച്","ഏപ്രില്‍","മേയ്","ജൂണ്‍",
+	"ജൂലൈ","ആഗസ്റ്റ്","സെപ്റ്റംബര്‍","ഒക്ടോബര്‍","നവംബര്‍","ഡിസംബര്‍" ],
+	monthNamesShort: [ "ജനു", "ഫെബ്", "മാര്‍", "ഏപ്രി", "മേയ്", "ജൂണ്‍",
+	"ജൂലാ", "ആഗ", "സെപ്", "ഒക്ടോ", "നവം", "ഡിസ" ],
+	dayNames: [ "ഞായര്‍", "തിങ്കള്‍", "ചൊവ്വ", "ബുധന്‍", "വ്യാഴം", "വെള്ളി", "ശനി" ],
+	dayNamesShort: [ "ഞായ", "തിങ്ക", "ചൊവ്വ", "ബുധ", "വ്യാഴം", "വെള്ളി", "ശനി" ],
+	dayNamesMin: [ "ഞാ","തി","ചൊ","ബു","വ്യാ","വെ","ശ" ],
+	weekHeader: "ആ",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['ml']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.ml );
 
-return datepicker.regional['ml'];
+return datepicker.regional.ml;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-ms.js b/ui/i18n/datepicker-ms.js
index 4a13ec4e47d..58bc4f579e0 100644
--- a/ui/i18n/datepicker-ms.js
+++ b/ui/i18n/datepicker-ms.js
@@ -1,37 +1,37 @@
 /* Malaysian initialisation for the jQuery UI date picker plugin. */
 /* Written by Mohd Nawawi Mohamad Jamili (nawawi@ronggeng.net). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['ms'] = {
-	closeText: 'Tutup',
-	prevText: '&#x3C;Sebelum',
-	nextText: 'Selepas&#x3E;',
-	currentText: 'hari ini',
-	monthNames: ['Januari','Februari','Mac','April','Mei','Jun',
-	'Julai','Ogos','September','Oktober','November','Disember'],
-	monthNamesShort: ['Jan','Feb','Mac','Apr','Mei','Jun',
-	'Jul','Ogo','Sep','Okt','Nov','Dis'],
-	dayNames: ['Ahad','Isnin','Selasa','Rabu','Khamis','Jumaat','Sabtu'],
-	dayNamesShort: ['Aha','Isn','Sel','Rab','kha','Jum','Sab'],
-	dayNamesMin: ['Ah','Is','Se','Ra','Kh','Ju','Sa'],
-	weekHeader: 'Mg',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.ms = {
+	closeText: "Tutup",
+	prevText: "&#x3C;Sebelum",
+	nextText: "Selepas&#x3E;",
+	currentText: "hari ini",
+	monthNames: [ "Januari","Februari","Mac","April","Mei","Jun",
+	"Julai","Ogos","September","Oktober","November","Disember" ],
+	monthNamesShort: [ "Jan","Feb","Mac","Apr","Mei","Jun",
+	"Jul","Ogo","Sep","Okt","Nov","Dis" ],
+	dayNames: [ "Ahad","Isnin","Selasa","Rabu","Khamis","Jumaat","Sabtu" ],
+	dayNamesShort: [ "Aha","Isn","Sel","Rab","kha","Jum","Sab" ],
+	dayNamesMin: [ "Ah","Is","Se","Ra","Kh","Ju","Sa" ],
+	weekHeader: "Mg",
+	dateFormat: "dd/mm/yy",
 	firstDay: 0,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['ms']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.ms );
 
-return datepicker.regional['ms'];
+return datepicker.regional.ms;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-nb.js b/ui/i18n/datepicker-nb.js
index 2ad0e03b471..128f6836d5a 100644
--- a/ui/i18n/datepicker-nb.js
+++ b/ui/i18n/datepicker-nb.js
@@ -1,36 +1,36 @@
 /* Norwegian Bokmål initialisation for the jQuery UI date picker plugin. */
 /* Written by Bjørn Johansen (post@bjornjohansen.no). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['nb'] = {
-	closeText: 'Lukk',
-	prevText: '&#xAB;Forrige',
-	nextText: 'Neste&#xBB;',
-	currentText: 'I dag',
-	monthNames: ['januar','februar','mars','april','mai','juni','juli','august','september','oktober','november','desember'],
-	monthNamesShort: ['jan','feb','mar','apr','mai','jun','jul','aug','sep','okt','nov','des'],
-	dayNamesShort: ['søn','man','tir','ons','tor','fre','lør'],
-	dayNames: ['søndag','mandag','tirsdag','onsdag','torsdag','fredag','lørdag'],
-	dayNamesMin: ['sø','ma','ti','on','to','fr','lø'],
-	weekHeader: 'Uke',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.nb = {
+	closeText: "Lukk",
+	prevText: "&#xAB;Forrige",
+	nextText: "Neste&#xBB;",
+	currentText: "I dag",
+	monthNames: [ "januar","februar","mars","april","mai","juni","juli","august","september","oktober","november","desember" ],
+	monthNamesShort: [ "jan","feb","mar","apr","mai","jun","jul","aug","sep","okt","nov","des" ],
+	dayNamesShort: [ "søn","man","tir","ons","tor","fre","lør" ],
+	dayNames: [ "søndag","mandag","tirsdag","onsdag","torsdag","fredag","lørdag" ],
+	dayNamesMin: [ "sø","ma","ti","on","to","fr","lø" ],
+	weekHeader: "Uke",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''
+	yearSuffix: ""
 };
-datepicker.setDefaults(datepicker.regional['nb']);
+datepicker.setDefaults( datepicker.regional.nb );
 
-return datepicker.regional['nb'];
+return datepicker.regional.nb;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-nl-BE.js b/ui/i18n/datepicker-nl-BE.js
index 192aeb7edb7..9ea22002d68 100644
--- a/ui/i18n/datepicker-nl-BE.js
+++ b/ui/i18n/datepicker-nl-BE.js
@@ -1,37 +1,37 @@
 /* Dutch (Belgium) initialisation for the jQuery UI date picker plugin. */
 /* David De Sloovere @DavidDeSloovere */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['nl-BE'] = {
-	closeText: 'Sluiten',
-	prevText: '←',
-	nextText: '→',
-	currentText: 'Vandaag',
-	monthNames: ['januari', 'februari', 'maart', 'april', 'mei', 'juni',
-	'juli', 'augustus', 'september', 'oktober', 'november', 'december'],
-	monthNamesShort: ['jan', 'feb', 'mrt', 'apr', 'mei', 'jun',
-	'jul', 'aug', 'sep', 'okt', 'nov', 'dec'],
-	dayNames: ['zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag'],
-	dayNamesShort: ['zon', 'maa', 'din', 'woe', 'don', 'vri', 'zat'],
-	dayNamesMin: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'],
-	weekHeader: 'Wk',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional[ "nl-BE" ] = {
+	closeText: "Sluiten",
+	prevText: "←",
+	nextText: "→",
+	currentText: "Vandaag",
+	monthNames: [ "januari", "februari", "maart", "april", "mei", "juni",
+	"juli", "augustus", "september", "oktober", "november", "december" ],
+	monthNamesShort: [ "jan", "feb", "mrt", "apr", "mei", "jun",
+	"jul", "aug", "sep", "okt", "nov", "dec" ],
+	dayNames: [ "zondag", "maandag", "dinsdag", "woensdag", "donderdag", "vrijdag", "zaterdag" ],
+	dayNamesShort: [ "zon", "maa", "din", "woe", "don", "vri", "zat" ],
+	dayNamesMin: [ "zo", "ma", "di", "wo", "do", "vr", "za" ],
+	weekHeader: "Wk",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['nl-BE']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional[ "nl-BE" ] );
 
-return datepicker.regional['nl-BE'];
+return datepicker.regional[ "nl-BE" ];
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-nl.js b/ui/i18n/datepicker-nl.js
index bfbb1a68822..7fcbff1ac10 100644
--- a/ui/i18n/datepicker-nl.js
+++ b/ui/i18n/datepicker-nl.js
@@ -1,37 +1,37 @@
 /* Dutch (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by Mathias Bynens <http://mathiasbynens.be/> */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
 datepicker.regional.nl = {
-	closeText: 'Sluiten',
-	prevText: '←',
-	nextText: '→',
-	currentText: 'Vandaag',
-	monthNames: ['januari', 'februari', 'maart', 'april', 'mei', 'juni',
-	'juli', 'augustus', 'september', 'oktober', 'november', 'december'],
-	monthNamesShort: ['jan', 'feb', 'mrt', 'apr', 'mei', 'jun',
-	'jul', 'aug', 'sep', 'okt', 'nov', 'dec'],
-	dayNames: ['zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag'],
-	dayNamesShort: ['zon', 'maa', 'din', 'woe', 'don', 'vri', 'zat'],
-	dayNamesMin: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'],
-	weekHeader: 'Wk',
-	dateFormat: 'dd-mm-yy',
+	closeText: "Sluiten",
+	prevText: "←",
+	nextText: "→",
+	currentText: "Vandaag",
+	monthNames: [ "januari", "februari", "maart", "april", "mei", "juni",
+	"juli", "augustus", "september", "oktober", "november", "december" ],
+	monthNamesShort: [ "jan", "feb", "mrt", "apr", "mei", "jun",
+	"jul", "aug", "sep", "okt", "nov", "dec" ],
+	dayNames: [ "zondag", "maandag", "dinsdag", "woensdag", "donderdag", "vrijdag", "zaterdag" ],
+	dayNamesShort: [ "zon", "maa", "din", "woe", "don", "vri", "zat" ],
+	dayNamesMin: [ "zo", "ma", "di", "wo", "do", "vr", "za" ],
+	weekHeader: "Wk",
+	dateFormat: "dd-mm-yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional.nl);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.nl );
 
 return datepicker.regional.nl;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-nn.js b/ui/i18n/datepicker-nn.js
index 6d8fdc8577c..dfaec387bc3 100644
--- a/ui/i18n/datepicker-nn.js
+++ b/ui/i18n/datepicker-nn.js
@@ -1,36 +1,36 @@
 /* Norwegian Nynorsk initialisation for the jQuery UI date picker plugin. */
 /* Written by Bjørn Johansen (post@bjornjohansen.no). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['nn'] = {
-	closeText: 'Lukk',
-	prevText: '&#xAB;Førre',
-	nextText: 'Neste&#xBB;',
-	currentText: 'I dag',
-	monthNames: ['januar','februar','mars','april','mai','juni','juli','august','september','oktober','november','desember'],
-	monthNamesShort: ['jan','feb','mar','apr','mai','jun','jul','aug','sep','okt','nov','des'],
-	dayNamesShort: ['sun','mån','tys','ons','tor','fre','lau'],
-	dayNames: ['sundag','måndag','tysdag','onsdag','torsdag','fredag','laurdag'],
-	dayNamesMin: ['su','må','ty','on','to','fr','la'],
-	weekHeader: 'Veke',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.nn = {
+	closeText: "Lukk",
+	prevText: "&#xAB;Førre",
+	nextText: "Neste&#xBB;",
+	currentText: "I dag",
+	monthNames: [ "januar","februar","mars","april","mai","juni","juli","august","september","oktober","november","desember" ],
+	monthNamesShort: [ "jan","feb","mar","apr","mai","jun","jul","aug","sep","okt","nov","des" ],
+	dayNamesShort: [ "sun","mån","tys","ons","tor","fre","lau" ],
+	dayNames: [ "sundag","måndag","tysdag","onsdag","torsdag","fredag","laurdag" ],
+	dayNamesMin: [ "su","må","ty","on","to","fr","la" ],
+	weekHeader: "Veke",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''
+	yearSuffix: ""
 };
-datepicker.setDefaults(datepicker.regional['nn']);
+datepicker.setDefaults( datepicker.regional.nn );
 
-return datepicker.regional['nn'];
+return datepicker.regional.nn;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-no.js b/ui/i18n/datepicker-no.js
index 316e9c333db..559aa111bc9 100644
--- a/ui/i18n/datepicker-no.js
+++ b/ui/i18n/datepicker-no.js
@@ -1,37 +1,37 @@
 /* Norwegian initialisation for the jQuery UI date picker plugin. */
 /* Written by Naimdjon Takhirov (naimdjon@gmail.com). */
 
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['no'] = {
-	closeText: 'Lukk',
-	prevText: '&#xAB;Forrige',
-	nextText: 'Neste&#xBB;',
-	currentText: 'I dag',
-	monthNames: ['januar','februar','mars','april','mai','juni','juli','august','september','oktober','november','desember'],
-	monthNamesShort: ['jan','feb','mar','apr','mai','jun','jul','aug','sep','okt','nov','des'],
-	dayNamesShort: ['søn','man','tir','ons','tor','fre','lør'],
-	dayNames: ['søndag','mandag','tirsdag','onsdag','torsdag','fredag','lørdag'],
-	dayNamesMin: ['sø','ma','ti','on','to','fr','lø'],
-	weekHeader: 'Uke',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.no = {
+	closeText: "Lukk",
+	prevText: "&#xAB;Forrige",
+	nextText: "Neste&#xBB;",
+	currentText: "I dag",
+	monthNames: [ "januar","februar","mars","april","mai","juni","juli","august","september","oktober","november","desember" ],
+	monthNamesShort: [ "jan","feb","mar","apr","mai","jun","jul","aug","sep","okt","nov","des" ],
+	dayNamesShort: [ "søn","man","tir","ons","tor","fre","lør" ],
+	dayNames: [ "søndag","mandag","tirsdag","onsdag","torsdag","fredag","lørdag" ],
+	dayNamesMin: [ "sø","ma","ti","on","to","fr","lø" ],
+	weekHeader: "Uke",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''
+	yearSuffix: ""
 };
-datepicker.setDefaults(datepicker.regional['no']);
+datepicker.setDefaults( datepicker.regional.no );
 
-return datepicker.regional['no'];
+return datepicker.regional.no;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-pl.js b/ui/i18n/datepicker-pl.js
index c9dd9d2b9b9..c2fddc13278 100644
--- a/ui/i18n/datepicker-pl.js
+++ b/ui/i18n/datepicker-pl.js
@@ -1,37 +1,37 @@
 /* Polish initialisation for the jQuery UI date picker plugin. */
 /* Written by Jacek Wysocki (jacek.wysocki@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['pl'] = {
-	closeText: 'Zamknij',
-	prevText: '&#x3C;Poprzedni',
-	nextText: 'Następny&#x3E;',
-	currentText: 'Dziś',
-	monthNames: ['Styczeń','Luty','Marzec','Kwiecień','Maj','Czerwiec',
-	'Lipiec','Sierpień','Wrzesień','Październik','Listopad','Grudzień'],
-	monthNamesShort: ['Sty','Lu','Mar','Kw','Maj','Cze',
-	'Lip','Sie','Wrz','Pa','Lis','Gru'],
-	dayNames: ['Niedziela','Poniedziałek','Wtorek','Środa','Czwartek','Piątek','Sobota'],
-	dayNamesShort: ['Nie','Pn','Wt','Śr','Czw','Pt','So'],
-	dayNamesMin: ['N','Pn','Wt','Śr','Cz','Pt','So'],
-	weekHeader: 'Tydz',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.pl = {
+	closeText: "Zamknij",
+	prevText: "&#x3C;Poprzedni",
+	nextText: "Następny&#x3E;",
+	currentText: "Dziś",
+	monthNames: [ "Styczeń","Luty","Marzec","Kwiecień","Maj","Czerwiec",
+	"Lipiec","Sierpień","Wrzesień","Październik","Listopad","Grudzień" ],
+	monthNamesShort: [ "Sty","Lu","Mar","Kw","Maj","Cze",
+	"Lip","Sie","Wrz","Pa","Lis","Gru" ],
+	dayNames: [ "Niedziela","Poniedziałek","Wtorek","Środa","Czwartek","Piątek","Sobota" ],
+	dayNamesShort: [ "Nie","Pn","Wt","Śr","Czw","Pt","So" ],
+	dayNamesMin: [ "N","Pn","Wt","Śr","Cz","Pt","So" ],
+	weekHeader: "Tydz",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['pl']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.pl );
 
-return datepicker.regional['pl'];
+return datepicker.regional.pl;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-pt-BR.js b/ui/i18n/datepicker-pt-BR.js
index 90cf0abc1d3..c4c0d541c9c 100644
--- a/ui/i18n/datepicker-pt-BR.js
+++ b/ui/i18n/datepicker-pt-BR.js
@@ -1,37 +1,37 @@
 /* Brazilian initialisation for the jQuery UI date picker plugin. */
 /* Written by Leonildo Costa Silva (leocsilva@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['pt-BR'] = {
-	closeText: 'Fechar',
-	prevText: '&#x3C;Anterior',
-	nextText: 'Próximo&#x3E;',
-	currentText: 'Hoje',
-	monthNames: ['Janeiro','Fevereiro','Março','Abril','Maio','Junho',
-	'Julho','Agosto','Setembro','Outubro','Novembro','Dezembro'],
-	monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun',
-	'Jul','Ago','Set','Out','Nov','Dez'],
-	dayNames: ['Domingo','Segunda-feira','Terça-feira','Quarta-feira','Quinta-feira','Sexta-feira','Sábado'],
-	dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'],
-	dayNamesMin: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'],
-	weekHeader: 'Sm',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional[ "pt-BR" ] = {
+	closeText: "Fechar",
+	prevText: "&#x3C;Anterior",
+	nextText: "Próximo&#x3E;",
+	currentText: "Hoje",
+	monthNames: [ "Janeiro","Fevereiro","Março","Abril","Maio","Junho",
+	"Julho","Agosto","Setembro","Outubro","Novembro","Dezembro" ],
+	monthNamesShort: [ "Jan","Fev","Mar","Abr","Mai","Jun",
+	"Jul","Ago","Set","Out","Nov","Dez" ],
+	dayNames: [ "Domingo","Segunda-feira","Terça-feira","Quarta-feira","Quinta-feira","Sexta-feira","Sábado" ],
+	dayNamesShort: [ "Dom","Seg","Ter","Qua","Qui","Sex","Sáb" ],
+	dayNamesMin: [ "Dom","Seg","Ter","Qua","Qui","Sex","Sáb" ],
+	weekHeader: "Sm",
+	dateFormat: "dd/mm/yy",
 	firstDay: 0,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['pt-BR']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional[ "pt-BR" ] );
 
-return datepicker.regional['pt-BR'];
+return datepicker.regional[ "pt-BR" ];
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-pt.js b/ui/i18n/datepicker-pt.js
index cce2d7efebb..baed7f3de53 100644
--- a/ui/i18n/datepicker-pt.js
+++ b/ui/i18n/datepicker-pt.js
@@ -1,36 +1,36 @@
 /* Portuguese initialisation for the jQuery UI date picker plugin. */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['pt'] = {
-	closeText: 'Fechar',
-	prevText: 'Anterior',
-	nextText: 'Seguinte',
-	currentText: 'Hoje',
-	monthNames: ['Janeiro','Fevereiro','Março','Abril','Maio','Junho',
-	'Julho','Agosto','Setembro','Outubro','Novembro','Dezembro'],
-	monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun',
-	'Jul','Ago','Set','Out','Nov','Dez'],
-	dayNames: ['Domingo','Segunda-feira','Terça-feira','Quarta-feira','Quinta-feira','Sexta-feira','Sábado'],
-	dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'],
-	dayNamesMin: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'],
-	weekHeader: 'Sem',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.pt = {
+	closeText: "Fechar",
+	prevText: "Anterior",
+	nextText: "Seguinte",
+	currentText: "Hoje",
+	monthNames: [ "Janeiro","Fevereiro","Março","Abril","Maio","Junho",
+	"Julho","Agosto","Setembro","Outubro","Novembro","Dezembro" ],
+	monthNamesShort: [ "Jan","Fev","Mar","Abr","Mai","Jun",
+	"Jul","Ago","Set","Out","Nov","Dez" ],
+	dayNames: [ "Domingo","Segunda-feira","Terça-feira","Quarta-feira","Quinta-feira","Sexta-feira","Sábado" ],
+	dayNamesShort: [ "Dom","Seg","Ter","Qua","Qui","Sex","Sáb" ],
+	dayNamesMin: [ "Dom","Seg","Ter","Qua","Qui","Sex","Sáb" ],
+	weekHeader: "Sem",
+	dateFormat: "dd/mm/yy",
 	firstDay: 0,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['pt']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.pt );
 
-return datepicker.regional['pt'];
+return datepicker.regional.pt;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-rm.js b/ui/i18n/datepicker-rm.js
index 2c12e9e93b7..856c8c2543c 100644
--- a/ui/i18n/datepicker-rm.js
+++ b/ui/i18n/datepicker-rm.js
@@ -1,35 +1,35 @@
 /* Romansh initialisation for the jQuery UI date picker plugin. */
 /* Written by Yvonne Gienal (yvonne.gienal@educa.ch). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['rm'] = {
-	closeText: 'Serrar',
-	prevText: '&#x3C;Suandant',
-	nextText: 'Precedent&#x3E;',
-	currentText: 'Actual',
-	monthNames: ['Schaner','Favrer','Mars','Avrigl','Matg','Zercladur', 'Fanadur','Avust','Settember','October','November','December'],
-	monthNamesShort: ['Scha','Fev','Mar','Avr','Matg','Zer', 'Fan','Avu','Sett','Oct','Nov','Dec'],
-	dayNames: ['Dumengia','Glindesdi','Mardi','Mesemna','Gievgia','Venderdi','Sonda'],
-	dayNamesShort: ['Dum','Gli','Mar','Mes','Gie','Ven','Som'],
-	dayNamesMin: ['Du','Gl','Ma','Me','Gi','Ve','So'],
-	weekHeader: 'emna',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.rm = {
+	closeText: "Serrar",
+	prevText: "&#x3C;Suandant",
+	nextText: "Precedent&#x3E;",
+	currentText: "Actual",
+	monthNames: [ "Schaner","Favrer","Mars","Avrigl","Matg","Zercladur", "Fanadur","Avust","Settember","October","November","December" ],
+	monthNamesShort: [ "Scha","Fev","Mar","Avr","Matg","Zer", "Fan","Avu","Sett","Oct","Nov","Dec" ],
+	dayNames: [ "Dumengia","Glindesdi","Mardi","Mesemna","Gievgia","Venderdi","Sonda" ],
+	dayNamesShort: [ "Dum","Gli","Mar","Mes","Gie","Ven","Som" ],
+	dayNamesMin: [ "Du","Gl","Ma","Me","Gi","Ve","So" ],
+	weekHeader: "emna",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['rm']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.rm );
 
-return datepicker.regional['rm'];
+return datepicker.regional.rm;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-ro.js b/ui/i18n/datepicker-ro.js
index ef658472fa0..b26665c2564 100644
--- a/ui/i18n/datepicker-ro.js
+++ b/ui/i18n/datepicker-ro.js
@@ -3,38 +3,38 @@
  * Written by Edmond L. (ll_edmond@walla.com)
  * and Ionut G. Stan (ionut.g.stan@gmail.com)
  */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['ro'] = {
-	closeText: 'Închide',
-	prevText: '&#xAB; Luna precedentă',
-	nextText: 'Luna următoare &#xBB;',
-	currentText: 'Azi',
-	monthNames: ['Ianuarie','Februarie','Martie','Aprilie','Mai','Iunie',
-	'Iulie','August','Septembrie','Octombrie','Noiembrie','Decembrie'],
-	monthNamesShort: ['Ian', 'Feb', 'Mar', 'Apr', 'Mai', 'Iun',
-	'Iul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-	dayNames: ['Duminică', 'Luni', 'Marţi', 'Miercuri', 'Joi', 'Vineri', 'Sâmbătă'],
-	dayNamesShort: ['Dum', 'Lun', 'Mar', 'Mie', 'Joi', 'Vin', 'Sâm'],
-	dayNamesMin: ['Du','Lu','Ma','Mi','Jo','Vi','Sâ'],
-	weekHeader: 'Săpt',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.ro = {
+	closeText: "Închide",
+	prevText: "&#xAB; Luna precedentă",
+	nextText: "Luna următoare &#xBB;",
+	currentText: "Azi",
+	monthNames: [ "Ianuarie","Februarie","Martie","Aprilie","Mai","Iunie",
+	"Iulie","August","Septembrie","Octombrie","Noiembrie","Decembrie" ],
+	monthNamesShort: [ "Ian", "Feb", "Mar", "Apr", "Mai", "Iun",
+	"Iul", "Aug", "Sep", "Oct", "Nov", "Dec" ],
+	dayNames: [ "Duminică", "Luni", "Marţi", "Miercuri", "Joi", "Vineri", "Sâmbătă" ],
+	dayNamesShort: [ "Dum", "Lun", "Mar", "Mie", "Joi", "Vin", "Sâm" ],
+	dayNamesMin: [ "Du","Lu","Ma","Mi","Jo","Vi","Sâ" ],
+	weekHeader: "Săpt",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['ro']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.ro );
 
-return datepicker.regional['ro'];
+return datepicker.regional.ro;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-ru.js b/ui/i18n/datepicker-ru.js
index e2b16623a1b..223e77645e7 100644
--- a/ui/i18n/datepicker-ru.js
+++ b/ui/i18n/datepicker-ru.js
@@ -1,37 +1,37 @@
 /* Russian (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by Andrew Stromnov (stromnov@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['ru'] = {
-	closeText: 'Закрыть',
-	prevText: '&#x3C;Пред',
-	nextText: 'След&#x3E;',
-	currentText: 'Сегодня',
-	monthNames: ['Январь','Февраль','Март','Апрель','Май','Июнь',
-	'Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'],
-	monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн',
-	'Июл','Авг','Сен','Окт','Ноя','Дек'],
-	dayNames: ['воскресенье','понедельник','вторник','среда','четверг','пятница','суббота'],
-	dayNamesShort: ['вск','пнд','втр','срд','чтв','птн','сбт'],
-	dayNamesMin: ['Вс','Пн','Вт','Ср','Чт','Пт','Сб'],
-	weekHeader: 'Нед',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.ru = {
+	closeText: "Закрыть",
+	prevText: "&#x3C;Пред",
+	nextText: "След&#x3E;",
+	currentText: "Сегодня",
+	monthNames: [ "Январь","Февраль","Март","Апрель","Май","Июнь",
+	"Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь" ],
+	monthNamesShort: [ "Янв","Фев","Мар","Апр","Май","Июн",
+	"Июл","Авг","Сен","Окт","Ноя","Дек" ],
+	dayNames: [ "воскресенье","понедельник","вторник","среда","четверг","пятница","суббота" ],
+	dayNamesShort: [ "вск","пнд","втр","срд","чтв","птн","сбт" ],
+	dayNamesMin: [ "Вс","Пн","Вт","Ср","Чт","Пт","Сб" ],
+	weekHeader: "Нед",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['ru']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.ru );
 
-return datepicker.regional['ru'];
+return datepicker.regional.ru;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-sk.js b/ui/i18n/datepicker-sk.js
index 73b4907187d..16d8bdfe4e4 100644
--- a/ui/i18n/datepicker-sk.js
+++ b/ui/i18n/datepicker-sk.js
@@ -1,37 +1,37 @@
 /* Slovak initialisation for the jQuery UI date picker plugin. */
 /* Written by Vojtech Rinik (vojto@hmm.sk). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['sk'] = {
-	closeText: 'Zavrieť',
-	prevText: '&#x3C;Predchádzajúci',
-	nextText: 'Nasledujúci&#x3E;',
-	currentText: 'Dnes',
-	monthNames: ['január','február','marec','apríl','máj','jún',
-	'júl','august','september','október','november','december'],
-	monthNamesShort: ['Jan','Feb','Mar','Apr','Máj','Jún',
-	'Júl','Aug','Sep','Okt','Nov','Dec'],
-	dayNames: ['nedeľa','pondelok','utorok','streda','štvrtok','piatok','sobota'],
-	dayNamesShort: ['Ned','Pon','Uto','Str','Štv','Pia','Sob'],
-	dayNamesMin: ['Ne','Po','Ut','St','Št','Pia','So'],
-	weekHeader: 'Ty',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.sk = {
+	closeText: "Zavrieť",
+	prevText: "&#x3C;Predchádzajúci",
+	nextText: "Nasledujúci&#x3E;",
+	currentText: "Dnes",
+	monthNames: [ "január","február","marec","apríl","máj","jún",
+	"júl","august","september","október","november","december" ],
+	monthNamesShort: [ "Jan","Feb","Mar","Apr","Máj","Jún",
+	"Júl","Aug","Sep","Okt","Nov","Dec" ],
+	dayNames: [ "nedeľa","pondelok","utorok","streda","štvrtok","piatok","sobota" ],
+	dayNamesShort: [ "Ned","Pon","Uto","Str","Štv","Pia","Sob" ],
+	dayNamesMin: [ "Ne","Po","Ut","St","Št","Pia","So" ],
+	weekHeader: "Ty",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['sk']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.sk );
 
-return datepicker.regional['sk'];
+return datepicker.regional.sk;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-sl.js b/ui/i18n/datepicker-sl.js
index 083b2ae40f5..6891624926a 100644
--- a/ui/i18n/datepicker-sl.js
+++ b/ui/i18n/datepicker-sl.js
@@ -1,38 +1,38 @@
 /* Slovenian initialisation for the jQuery UI date picker plugin. */
 /* Written by Jaka Jancar (jaka@kubje.org). */
 /* c = č, s = š z = ž C = Č S = Š Z = Ž */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['sl'] = {
-	closeText: 'Zapri',
-	prevText: '&#x3C;Prejšnji',
-	nextText: 'Naslednji&#x3E;',
-	currentText: 'Trenutni',
-	monthNames: ['Januar','Februar','Marec','April','Maj','Junij',
-	'Julij','Avgust','September','Oktober','November','December'],
-	monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
-	'Jul','Avg','Sep','Okt','Nov','Dec'],
-	dayNames: ['Nedelja','Ponedeljek','Torek','Sreda','Četrtek','Petek','Sobota'],
-	dayNamesShort: ['Ned','Pon','Tor','Sre','Čet','Pet','Sob'],
-	dayNamesMin: ['Ne','Po','To','Sr','Če','Pe','So'],
-	weekHeader: 'Teden',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.sl = {
+	closeText: "Zapri",
+	prevText: "&#x3C;Prejšnji",
+	nextText: "Naslednji&#x3E;",
+	currentText: "Trenutni",
+	monthNames: [ "Januar","Februar","Marec","April","Maj","Junij",
+	"Julij","Avgust","September","Oktober","November","December" ],
+	monthNamesShort: [ "Jan","Feb","Mar","Apr","Maj","Jun",
+	"Jul","Avg","Sep","Okt","Nov","Dec" ],
+	dayNames: [ "Nedelja","Ponedeljek","Torek","Sreda","Četrtek","Petek","Sobota" ],
+	dayNamesShort: [ "Ned","Pon","Tor","Sre","Čet","Pet","Sob" ],
+	dayNamesMin: [ "Ne","Po","To","Sr","Če","Pe","So" ],
+	weekHeader: "Teden",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['sl']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.sl );
 
-return datepicker.regional['sl'];
+return datepicker.regional.sl;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-sq.js b/ui/i18n/datepicker-sq.js
index d0d8f5703db..34fe66a59cd 100644
--- a/ui/i18n/datepicker-sq.js
+++ b/ui/i18n/datepicker-sq.js
@@ -1,37 +1,37 @@
 /* Albanian initialisation for the jQuery UI date picker plugin. */
 /* Written by Flakron Bytyqi (flakron@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['sq'] = {
-	closeText: 'mbylle',
-	prevText: '&#x3C;mbrapa',
-	nextText: 'Përpara&#x3E;',
-	currentText: 'sot',
-	monthNames: ['Janar','Shkurt','Mars','Prill','Maj','Qershor',
-	'Korrik','Gusht','Shtator','Tetor','Nëntor','Dhjetor'],
-	monthNamesShort: ['Jan','Shk','Mar','Pri','Maj','Qer',
-	'Kor','Gus','Sht','Tet','Nën','Dhj'],
-	dayNames: ['E Diel','E Hënë','E Martë','E Mërkurë','E Enjte','E Premte','E Shtune'],
-	dayNamesShort: ['Di','Hë','Ma','Më','En','Pr','Sh'],
-	dayNamesMin: ['Di','Hë','Ma','Më','En','Pr','Sh'],
-	weekHeader: 'Ja',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.sq = {
+	closeText: "mbylle",
+	prevText: "&#x3C;mbrapa",
+	nextText: "Përpara&#x3E;",
+	currentText: "sot",
+	monthNames: [ "Janar","Shkurt","Mars","Prill","Maj","Qershor",
+	"Korrik","Gusht","Shtator","Tetor","Nëntor","Dhjetor" ],
+	monthNamesShort: [ "Jan","Shk","Mar","Pri","Maj","Qer",
+	"Kor","Gus","Sht","Tet","Nën","Dhj" ],
+	dayNames: [ "E Diel","E Hënë","E Martë","E Mërkurë","E Enjte","E Premte","E Shtune" ],
+	dayNamesShort: [ "Di","Hë","Ma","Më","En","Pr","Sh" ],
+	dayNamesMin: [ "Di","Hë","Ma","Më","En","Pr","Sh" ],
+	weekHeader: "Ja",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['sq']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.sq );
 
-return datepicker.regional['sq'];
+return datepicker.regional.sq;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-sr-SR.js b/ui/i18n/datepicker-sr-SR.js
index 0c2d2af49c3..e9db26a42e2 100644
--- a/ui/i18n/datepicker-sr-SR.js
+++ b/ui/i18n/datepicker-sr-SR.js
@@ -1,37 +1,37 @@
 /* Serbian i18n for the jQuery UI date picker plugin. */
 /* Written by Dejan Dimić. */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['sr-SR'] = {
-	closeText: 'Zatvori',
-	prevText: '&#x3C;',
-	nextText: '&#x3E;',
-	currentText: 'Danas',
-	monthNames: ['Januar','Februar','Mart','April','Maj','Jun',
-	'Jul','Avgust','Septembar','Oktobar','Novembar','Decembar'],
-	monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
-	'Jul','Avg','Sep','Okt','Nov','Dec'],
-	dayNames: ['Nedelja','Ponedeljak','Utorak','Sreda','Četvrtak','Petak','Subota'],
-	dayNamesShort: ['Ned','Pon','Uto','Sre','Čet','Pet','Sub'],
-	dayNamesMin: ['Ne','Po','Ut','Sr','Če','Pe','Su'],
-	weekHeader: 'Sed',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional[ "sr-SR" ] = {
+	closeText: "Zatvori",
+	prevText: "&#x3C;",
+	nextText: "&#x3E;",
+	currentText: "Danas",
+	monthNames: [ "Januar","Februar","Mart","April","Maj","Jun",
+	"Jul","Avgust","Septembar","Oktobar","Novembar","Decembar" ],
+	monthNamesShort: [ "Jan","Feb","Mar","Apr","Maj","Jun",
+	"Jul","Avg","Sep","Okt","Nov","Dec" ],
+	dayNames: [ "Nedelja","Ponedeljak","Utorak","Sreda","Četvrtak","Petak","Subota" ],
+	dayNamesShort: [ "Ned","Pon","Uto","Sre","Čet","Pet","Sub" ],
+	dayNamesMin: [ "Ne","Po","Ut","Sr","Če","Pe","Su" ],
+	weekHeader: "Sed",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['sr-SR']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional[ "sr-SR" ] );
 
-return datepicker.regional['sr-SR'];
+return datepicker.regional[ "sr-SR" ];
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-sr.js b/ui/i18n/datepicker-sr.js
index 2d28e17c07c..fa8827aa128 100644
--- a/ui/i18n/datepicker-sr.js
+++ b/ui/i18n/datepicker-sr.js
@@ -1,37 +1,37 @@
 /* Serbian i18n for the jQuery UI date picker plugin. */
 /* Written by Dejan Dimić. */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['sr'] = {
-	closeText: 'Затвори',
-	prevText: '&#x3C;',
-	nextText: '&#x3E;',
-	currentText: 'Данас',
-	monthNames: ['Јануар','Фебруар','Март','Април','Мај','Јун',
-	'Јул','Август','Септембар','Октобар','Новембар','Децембар'],
-	monthNamesShort: ['Јан','Феб','Мар','Апр','Мај','Јун',
-	'Јул','Авг','Сеп','Окт','Нов','Дец'],
-	dayNames: ['Недеља','Понедељак','Уторак','Среда','Четвртак','Петак','Субота'],
-	dayNamesShort: ['Нед','Пон','Уто','Сре','Чет','Пет','Суб'],
-	dayNamesMin: ['Не','По','Ут','Ср','Че','Пе','Су'],
-	weekHeader: 'Сед',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.sr = {
+	closeText: "Затвори",
+	prevText: "&#x3C;",
+	nextText: "&#x3E;",
+	currentText: "Данас",
+	monthNames: [ "Јануар","Фебруар","Март","Април","Мај","Јун",
+	"Јул","Август","Септембар","Октобар","Новембар","Децембар" ],
+	monthNamesShort: [ "Јан","Феб","Мар","Апр","Мај","Јун",
+	"Јул","Авг","Сеп","Окт","Нов","Дец" ],
+	dayNames: [ "Недеља","Понедељак","Уторак","Среда","Четвртак","Петак","Субота" ],
+	dayNamesShort: [ "Нед","Пон","Уто","Сре","Чет","Пет","Суб" ],
+	dayNamesMin: [ "Не","По","Ут","Ср","Че","Пе","Су" ],
+	weekHeader: "Сед",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['sr']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.sr );
 
-return datepicker.regional['sr'];
+return datepicker.regional.sr;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-sv.js b/ui/i18n/datepicker-sv.js
index 87e02cc007f..92686efa4f7 100644
--- a/ui/i18n/datepicker-sv.js
+++ b/ui/i18n/datepicker-sv.js
@@ -1,37 +1,37 @@
 /* Swedish initialisation for the jQuery UI date picker plugin. */
 /* Written by Anders Ekdahl ( anders@nomadiz.se). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['sv'] = {
-	closeText: 'Stäng',
-	prevText: '&#xAB;Förra',
-	nextText: 'Nästa&#xBB;',
-	currentText: 'Idag',
-	monthNames: ['Januari','Februari','Mars','April','Maj','Juni',
-	'Juli','Augusti','September','Oktober','November','December'],
-	monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
-	'Jul','Aug','Sep','Okt','Nov','Dec'],
-	dayNamesShort: ['Sön','Mån','Tis','Ons','Tor','Fre','Lör'],
-	dayNames: ['Söndag','Måndag','Tisdag','Onsdag','Torsdag','Fredag','Lördag'],
-	dayNamesMin: ['Sö','Må','Ti','On','To','Fr','Lö'],
-	weekHeader: 'Ve',
-	dateFormat: 'yy-mm-dd',
+datepicker.regional.sv = {
+	closeText: "Stäng",
+	prevText: "&#xAB;Förra",
+	nextText: "Nästa&#xBB;",
+	currentText: "Idag",
+	monthNames: [ "Januari","Februari","Mars","April","Maj","Juni",
+	"Juli","Augusti","September","Oktober","November","December" ],
+	monthNamesShort: [ "Jan","Feb","Mar","Apr","Maj","Jun",
+	"Jul","Aug","Sep","Okt","Nov","Dec" ],
+	dayNamesShort: [ "Sön","Mån","Tis","Ons","Tor","Fre","Lör" ],
+	dayNames: [ "Söndag","Måndag","Tisdag","Onsdag","Torsdag","Fredag","Lördag" ],
+	dayNamesMin: [ "Sö","Må","Ti","On","To","Fr","Lö" ],
+	weekHeader: "Ve",
+	dateFormat: "yy-mm-dd",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['sv']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.sv );
 
-return datepicker.regional['sv'];
+return datepicker.regional.sv;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-ta.js b/ui/i18n/datepicker-ta.js
index e3b66fe3781..e3f09b00c79 100644
--- a/ui/i18n/datepicker-ta.js
+++ b/ui/i18n/datepicker-ta.js
@@ -1,37 +1,37 @@
 /* Tamil (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by S A Sureshkumar (saskumar@live.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['ta'] = {
-	closeText: 'மூடு',
-	prevText: 'முன்னையது',
-	nextText: 'அடுத்தது',
-	currentText: 'இன்று',
-	monthNames: ['தை','மாசி','பங்குனி','சித்திரை','வைகாசி','ஆனி',
-	'ஆடி','ஆவணி','புரட்டாசி','ஐப்பசி','கார்த்திகை','மார்கழி'],
-	monthNamesShort: ['தை','மாசி','பங்','சித்','வைகா','ஆனி',
-	'ஆடி','ஆவ','புர','ஐப்','கார்','மார்'],
-	dayNames: ['ஞாயிற்றுக்கிழமை','திங்கட்கிழமை','செவ்வாய்க்கிழமை','புதன்கிழமை','வியாழக்கிழமை','வெள்ளிக்கிழமை','சனிக்கிழமை'],
-	dayNamesShort: ['ஞாயிறு','திங்கள்','செவ்வாய்','புதன்','வியாழன்','வெள்ளி','சனி'],
-	dayNamesMin: ['ஞா','தி','செ','பு','வி','வெ','ச'],
-	weekHeader: 'Не',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.ta = {
+	closeText: "மூடு",
+	prevText: "முன்னையது",
+	nextText: "அடுத்தது",
+	currentText: "இன்று",
+	monthNames: [ "தை","மாசி","பங்குனி","சித்திரை","வைகாசி","ஆனி",
+	"ஆடி","ஆவணி","புரட்டாசி","ஐப்பசி","கார்த்திகை","மார்கழி" ],
+	monthNamesShort: [ "தை","மாசி","பங்","சித்","வைகா","ஆனி",
+	"ஆடி","ஆவ","புர","ஐப்","கார்","மார்" ],
+	dayNames: [ "ஞாயிற்றுக்கிழமை","திங்கட்கிழமை","செவ்வாய்க்கிழமை","புதன்கிழமை","வியாழக்கிழமை","வெள்ளிக்கிழமை","சனிக்கிழமை" ],
+	dayNamesShort: [ "ஞாயிறு","திங்கள்","செவ்வாய்","புதன்","வியாழன்","வெள்ளி","சனி" ],
+	dayNamesMin: [ "ஞா","தி","செ","பு","வி","வெ","ச" ],
+	weekHeader: "Не",
+	dateFormat: "dd/mm/yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['ta']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.ta );
 
-return datepicker.regional['ta'];
+return datepicker.regional.ta;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-th.js b/ui/i18n/datepicker-th.js
index 2a174f6705a..6de48cf9681 100644
--- a/ui/i18n/datepicker-th.js
+++ b/ui/i18n/datepicker-th.js
@@ -1,37 +1,37 @@
 /* Thai initialisation for the jQuery UI date picker plugin. */
 /* Written by pipo (pipo@sixhead.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['th'] = {
-	closeText: 'ปิด',
-	prevText: '&#xAB;&#xA0;ย้อน',
-	nextText: 'ถัดไป&#xA0;&#xBB;',
-	currentText: 'วันนี้',
-	monthNames: ['มกราคม','กุมภาพันธ์','มีนาคม','เมษายน','พฤษภาคม','มิถุนายน',
-	'กรกฎาคม','สิงหาคม','กันยายน','ตุลาคม','พฤศจิกายน','ธันวาคม'],
-	monthNamesShort: ['ม.ค.','ก.พ.','มี.ค.','เม.ย.','พ.ค.','มิ.ย.',
-	'ก.ค.','ส.ค.','ก.ย.','ต.ค.','พ.ย.','ธ.ค.'],
-	dayNames: ['อาทิตย์','จันทร์','อังคาร','พุธ','พฤหัสบดี','ศุกร์','เสาร์'],
-	dayNamesShort: ['อา.','จ.','อ.','พ.','พฤ.','ศ.','ส.'],
-	dayNamesMin: ['อา.','จ.','อ.','พ.','พฤ.','ศ.','ส.'],
-	weekHeader: 'Wk',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.th = {
+	closeText: "ปิด",
+	prevText: "&#xAB;&#xA0;ย้อน",
+	nextText: "ถัดไป&#xA0;&#xBB;",
+	currentText: "วันนี้",
+	monthNames: [ "มกราคม","กุมภาพันธ์","มีนาคม","เมษายน","พฤษภาคม","มิถุนายน",
+	"กรกฎาคม","สิงหาคม","กันยายน","ตุลาคม","พฤศจิกายน","ธันวาคม" ],
+	monthNamesShort: [ "ม.ค.","ก.พ.","มี.ค.","เม.ย.","พ.ค.","มิ.ย.",
+	"ก.ค.","ส.ค.","ก.ย.","ต.ค.","พ.ย.","ธ.ค." ],
+	dayNames: [ "อาทิตย์","จันทร์","อังคาร","พุธ","พฤหัสบดี","ศุกร์","เสาร์" ],
+	dayNamesShort: [ "อา.","จ.","อ.","พ.","พฤ.","ศ.","ส." ],
+	dayNamesMin: [ "อา.","จ.","อ.","พ.","พฤ.","ศ.","ส." ],
+	weekHeader: "Wk",
+	dateFormat: "dd/mm/yy",
 	firstDay: 0,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['th']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.th );
 
-return datepicker.regional['th'];
+return datepicker.regional.th;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-tj.js b/ui/i18n/datepicker-tj.js
index 7bfcc75955c..8ede4ddcb03 100644
--- a/ui/i18n/datepicker-tj.js
+++ b/ui/i18n/datepicker-tj.js
@@ -1,37 +1,37 @@
 /* Tajiki (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by Abdurahmon Saidov (saidovab@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['tj'] = {
-	closeText: 'Идома',
-	prevText: '&#x3c;Қафо',
-	nextText: 'Пеш&#x3e;',
-	currentText: 'Имрӯз',
-	monthNames: ['Январ','Феврал','Март','Апрел','Май','Июн',
-	'Июл','Август','Сентябр','Октябр','Ноябр','Декабр'],
-	monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн',
-	'Июл','Авг','Сен','Окт','Ноя','Дек'],
-	dayNames: ['якшанбе','душанбе','сешанбе','чоршанбе','панҷшанбе','ҷумъа','шанбе'],
-	dayNamesShort: ['якш','душ','сеш','чор','пан','ҷум','шан'],
-	dayNamesMin: ['Як','Дш','Сш','Чш','Пш','Ҷм','Шн'],
-	weekHeader: 'Хф',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.tj = {
+	closeText: "Идома",
+	prevText: "&#x3c;Қафо",
+	nextText: "Пеш&#x3e;",
+	currentText: "Имрӯз",
+	monthNames: [ "Январ","Феврал","Март","Апрел","Май","Июн",
+	"Июл","Август","Сентябр","Октябр","Ноябр","Декабр" ],
+	monthNamesShort: [ "Янв","Фев","Мар","Апр","Май","Июн",
+	"Июл","Авг","Сен","Окт","Ноя","Дек" ],
+	dayNames: [ "якшанбе","душанбе","сешанбе","чоршанбе","панҷшанбе","ҷумъа","шанбе" ],
+	dayNamesShort: [ "якш","душ","сеш","чор","пан","ҷум","шан" ],
+	dayNamesMin: [ "Як","Дш","Сш","Чш","Пш","Ҷм","Шн" ],
+	weekHeader: "Хф",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['tj']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.tj );
 
-return datepicker.regional['tj'];
+return datepicker.regional.tj;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-tr.js b/ui/i18n/datepicker-tr.js
index 98370d38ceb..8328e219926 100644
--- a/ui/i18n/datepicker-tr.js
+++ b/ui/i18n/datepicker-tr.js
@@ -1,37 +1,37 @@
 /* Turkish initialisation for the jQuery UI date picker plugin. */
 /* Written by Izzet Emre Erkan (kara@karalamalar.net). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['tr'] = {
-	closeText: 'kapat',
-	prevText: '&#x3C;geri',
-	nextText: 'ileri&#x3e',
-	currentText: 'bugün',
-	monthNames: ['Ocak','Şubat','Mart','Nisan','Mayıs','Haziran',
-	'Temmuz','Ağustos','Eylül','Ekim','Kasım','Aralık'],
-	monthNamesShort: ['Oca','Şub','Mar','Nis','May','Haz',
-	'Tem','Ağu','Eyl','Eki','Kas','Ara'],
-	dayNames: ['Pazar','Pazartesi','Salı','Çarşamba','Perşembe','Cuma','Cumartesi'],
-	dayNamesShort: ['Pz','Pt','Sa','Ça','Pe','Cu','Ct'],
-	dayNamesMin: ['Pz','Pt','Sa','Ça','Pe','Cu','Ct'],
-	weekHeader: 'Hf',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.tr = {
+	closeText: "kapat",
+	prevText: "&#x3C;geri",
+	nextText: "ileri&#x3e",
+	currentText: "bugün",
+	monthNames: [ "Ocak","Şubat","Mart","Nisan","Mayıs","Haziran",
+	"Temmuz","Ağustos","Eylül","Ekim","Kasım","Aralık" ],
+	monthNamesShort: [ "Oca","Şub","Mar","Nis","May","Haz",
+	"Tem","Ağu","Eyl","Eki","Kas","Ara" ],
+	dayNames: [ "Pazar","Pazartesi","Salı","Çarşamba","Perşembe","Cuma","Cumartesi" ],
+	dayNamesShort: [ "Pz","Pt","Sa","Ça","Pe","Cu","Ct" ],
+	dayNamesMin: [ "Pz","Pt","Sa","Ça","Pe","Cu","Ct" ],
+	weekHeader: "Hf",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['tr']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.tr );
 
-return datepicker.regional['tr'];
+return datepicker.regional.tr;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-uk.js b/ui/i18n/datepicker-uk.js
index 0dddc3eb8c5..c82501ad28d 100644
--- a/ui/i18n/datepicker-uk.js
+++ b/ui/i18n/datepicker-uk.js
@@ -1,38 +1,38 @@
 /* Ukrainian (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by Maxim Drogobitskiy (maxdao@gmail.com). */
 /* Corrected by Igor Milla (igor.fsp.milla@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['uk'] = {
-	closeText: 'Закрити',
-	prevText: '&#x3C;',
-	nextText: '&#x3E;',
-	currentText: 'Сьогодні',
-	monthNames: ['Січень','Лютий','Березень','Квітень','Травень','Червень',
-	'Липень','Серпень','Вересень','Жовтень','Листопад','Грудень'],
-	monthNamesShort: ['Січ','Лют','Бер','Кві','Тра','Чер',
-	'Лип','Сер','Вер','Жов','Лис','Гру'],
-	dayNames: ['неділя','понеділок','вівторок','середа','четвер','п’ятниця','субота'],
-	dayNamesShort: ['нед','пнд','вів','срд','чтв','птн','сбт'],
-	dayNamesMin: ['Нд','Пн','Вт','Ср','Чт','Пт','Сб'],
-	weekHeader: 'Тиж',
-	dateFormat: 'dd.mm.yy',
+datepicker.regional.uk = {
+	closeText: "Закрити",
+	prevText: "&#x3C;",
+	nextText: "&#x3E;",
+	currentText: "Сьогодні",
+	monthNames: [ "Січень","Лютий","Березень","Квітень","Травень","Червень",
+	"Липень","Серпень","Вересень","Жовтень","Листопад","Грудень" ],
+	monthNamesShort: [ "Січ","Лют","Бер","Кві","Тра","Чер",
+	"Лип","Сер","Вер","Жов","Лис","Гру" ],
+	dayNames: [ "неділя","понеділок","вівторок","середа","четвер","п’ятниця","субота" ],
+	dayNamesShort: [ "нед","пнд","вів","срд","чтв","птн","сбт" ],
+	dayNamesMin: [ "Нд","Пн","Вт","Ср","Чт","Пт","Сб" ],
+	weekHeader: "Тиж",
+	dateFormat: "dd.mm.yy",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['uk']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.uk );
 
-return datepicker.regional['uk'];
+return datepicker.regional.uk;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-vi.js b/ui/i18n/datepicker-vi.js
index de9e8c02cb2..2c208ab71c3 100644
--- a/ui/i18n/datepicker-vi.js
+++ b/ui/i18n/datepicker-vi.js
@@ -1,37 +1,37 @@
 /* Vietnamese initialisation for the jQuery UI date picker plugin. */
 /* Translated by Le Thanh Huy (lthanhhuy@cit.ctu.edu.vn). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['vi'] = {
-	closeText: 'Đóng',
-	prevText: '&#x3C;Trước',
-	nextText: 'Tiếp&#x3E;',
-	currentText: 'Hôm nay',
-	monthNames: ['Tháng Một', 'Tháng Hai', 'Tháng Ba', 'Tháng Tư', 'Tháng Năm', 'Tháng Sáu',
-	'Tháng Bảy', 'Tháng Tám', 'Tháng Chín', 'Tháng Mười', 'Tháng Mười Một', 'Tháng Mười Hai'],
-	monthNamesShort: ['Tháng 1', 'Tháng 2', 'Tháng 3', 'Tháng 4', 'Tháng 5', 'Tháng 6',
-	'Tháng 7', 'Tháng 8', 'Tháng 9', 'Tháng 10', 'Tháng 11', 'Tháng 12'],
-	dayNames: ['Chủ Nhật', 'Thứ Hai', 'Thứ Ba', 'Thứ Tư', 'Thứ Năm', 'Thứ Sáu', 'Thứ Bảy'],
-	dayNamesShort: ['CN', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7'],
-	dayNamesMin: ['CN', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7'],
-	weekHeader: 'Tu',
-	dateFormat: 'dd/mm/yy',
+datepicker.regional.vi = {
+	closeText: "Đóng",
+	prevText: "&#x3C;Trước",
+	nextText: "Tiếp&#x3E;",
+	currentText: "Hôm nay",
+	monthNames: [ "Tháng Một", "Tháng Hai", "Tháng Ba", "Tháng Tư", "Tháng Năm", "Tháng Sáu",
+	"Tháng Bảy", "Tháng Tám", "Tháng Chín", "Tháng Mười", "Tháng Mười Một", "Tháng Mười Hai" ],
+	monthNamesShort: [ "Tháng 1", "Tháng 2", "Tháng 3", "Tháng 4", "Tháng 5", "Tháng 6",
+	"Tháng 7", "Tháng 8", "Tháng 9", "Tháng 10", "Tháng 11", "Tháng 12" ],
+	dayNames: [ "Chủ Nhật", "Thứ Hai", "Thứ Ba", "Thứ Tư", "Thứ Năm", "Thứ Sáu", "Thứ Bảy" ],
+	dayNamesShort: [ "CN", "T2", "T3", "T4", "T5", "T6", "T7" ],
+	dayNamesMin: [ "CN", "T2", "T3", "T4", "T5", "T6", "T7" ],
+	weekHeader: "Tu",
+	dateFormat: "dd/mm/yy",
 	firstDay: 0,
 	isRTL: false,
 	showMonthAfterYear: false,
-	yearSuffix: ''};
-datepicker.setDefaults(datepicker.regional['vi']);
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.vi );
 
-return datepicker.regional['vi'];
+return datepicker.regional.vi;
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-zh-CN.js b/ui/i18n/datepicker-zh-CN.js
index 977e6628ccb..91f99b4ed51 100644
--- a/ui/i18n/datepicker-zh-CN.js
+++ b/ui/i18n/datepicker-zh-CN.js
@@ -1,37 +1,37 @@
 /* Chinese initialisation for the jQuery UI date picker plugin. */
 /* Written by Cloudream (cloudream@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['zh-CN'] = {
-	closeText: '关闭',
-	prevText: '&#x3C;上月',
-	nextText: '下月&#x3E;',
-	currentText: '今天',
-	monthNames: ['一月','二月','三月','四月','五月','六月',
-	'七月','八月','九月','十月','十一月','十二月'],
-	monthNamesShort: ['一月','二月','三月','四月','五月','六月',
-	'七月','八月','九月','十月','十一月','十二月'],
-	dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
-	dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
-	dayNamesMin: ['日','一','二','三','四','五','六'],
-	weekHeader: '周',
-	dateFormat: 'yy-mm-dd',
+datepicker.regional[ "zh-CN" ] = {
+	closeText: "关闭",
+	prevText: "&#x3C;上月",
+	nextText: "下月&#x3E;",
+	currentText: "今天",
+	monthNames: [ "一月","二月","三月","四月","五月","六月",
+	"七月","八月","九月","十月","十一月","十二月" ],
+	monthNamesShort: [ "一月","二月","三月","四月","五月","六月",
+	"七月","八月","九月","十月","十一月","十二月" ],
+	dayNames: [ "星期日","星期一","星期二","星期三","星期四","星期五","星期六" ],
+	dayNamesShort: [ "周日","周一","周二","周三","周四","周五","周六" ],
+	dayNamesMin: [ "日","一","二","三","四","五","六" ],
+	weekHeader: "周",
+	dateFormat: "yy-mm-dd",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: true,
-	yearSuffix: '年'};
-datepicker.setDefaults(datepicker.regional['zh-CN']);
+	yearSuffix: "年" };
+datepicker.setDefaults( datepicker.regional[ "zh-CN" ] );
 
-return datepicker.regional['zh-CN'];
+return datepicker.regional[ "zh-CN" ];
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-zh-HK.js b/ui/i18n/datepicker-zh-HK.js
index 4feb5a79d85..27f02bc6598 100644
--- a/ui/i18n/datepicker-zh-HK.js
+++ b/ui/i18n/datepicker-zh-HK.js
@@ -1,37 +1,37 @@
 /* Chinese initialisation for the jQuery UI date picker plugin. */
 /* Written by SCCY (samuelcychan@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['zh-HK'] = {
-	closeText: '關閉',
-	prevText: '&#x3C;上月',
-	nextText: '下月&#x3E;',
-	currentText: '今天',
-	monthNames: ['一月','二月','三月','四月','五月','六月',
-	'七月','八月','九月','十月','十一月','十二月'],
-	monthNamesShort: ['一月','二月','三月','四月','五月','六月',
-	'七月','八月','九月','十月','十一月','十二月'],
-	dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
-	dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
-	dayNamesMin: ['日','一','二','三','四','五','六'],
-	weekHeader: '周',
-	dateFormat: 'dd-mm-yy',
+datepicker.regional[ "zh-HK" ] = {
+	closeText: "關閉",
+	prevText: "&#x3C;上月",
+	nextText: "下月&#x3E;",
+	currentText: "今天",
+	monthNames: [ "一月","二月","三月","四月","五月","六月",
+	"七月","八月","九月","十月","十一月","十二月" ],
+	monthNamesShort: [ "一月","二月","三月","四月","五月","六月",
+	"七月","八月","九月","十月","十一月","十二月" ],
+	dayNames: [ "星期日","星期一","星期二","星期三","星期四","星期五","星期六" ],
+	dayNamesShort: [ "周日","周一","周二","周三","周四","周五","周六" ],
+	dayNamesMin: [ "日","一","二","三","四","五","六" ],
+	weekHeader: "周",
+	dateFormat: "dd-mm-yy",
 	firstDay: 0,
 	isRTL: false,
 	showMonthAfterYear: true,
-	yearSuffix: '年'};
-datepicker.setDefaults(datepicker.regional['zh-HK']);
+	yearSuffix: "年" };
+datepicker.setDefaults( datepicker.regional[ "zh-HK" ] );
 
-return datepicker.regional['zh-HK'];
+return datepicker.regional[ "zh-HK" ];
 
-}));
+} ) );
diff --git a/ui/i18n/datepicker-zh-TW.js b/ui/i18n/datepicker-zh-TW.js
index 120c4614302..c20754bd51e 100644
--- a/ui/i18n/datepicker-zh-TW.js
+++ b/ui/i18n/datepicker-zh-TW.js
@@ -1,37 +1,37 @@
 /* Chinese initialisation for the jQuery UI date picker plugin. */
 /* Written by Ressol (ressol@gmail.com). */
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "../widgets/datepicker" ], factory );
+		define( [ "../widgets/datepicker" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}(function( datepicker ) {
+}( function( datepicker ) {
 
-datepicker.regional['zh-TW'] = {
-	closeText: '關閉',
-	prevText: '&#x3C;上月',
-	nextText: '下月&#x3E;',
-	currentText: '今天',
-	monthNames: ['一月','二月','三月','四月','五月','六月',
-	'七月','八月','九月','十月','十一月','十二月'],
-	monthNamesShort: ['一月','二月','三月','四月','五月','六月',
-	'七月','八月','九月','十月','十一月','十二月'],
-	dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
-	dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
-	dayNamesMin: ['日','一','二','三','四','五','六'],
-	weekHeader: '周',
-	dateFormat: 'yy/mm/dd',
+datepicker.regional[ "zh-TW" ] = {
+	closeText: "關閉",
+	prevText: "&#x3C;上月",
+	nextText: "下月&#x3E;",
+	currentText: "今天",
+	monthNames: [ "一月","二月","三月","四月","五月","六月",
+	"七月","八月","九月","十月","十一月","十二月" ],
+	monthNamesShort: [ "一月","二月","三月","四月","五月","六月",
+	"七月","八月","九月","十月","十一月","十二月" ],
+	dayNames: [ "星期日","星期一","星期二","星期三","星期四","星期五","星期六" ],
+	dayNamesShort: [ "周日","周一","周二","周三","周四","周五","周六" ],
+	dayNamesMin: [ "日","一","二","三","四","五","六" ],
+	weekHeader: "周",
+	dateFormat: "yy/mm/dd",
 	firstDay: 1,
 	isRTL: false,
 	showMonthAfterYear: true,
-	yearSuffix: '年'};
-datepicker.setDefaults(datepicker.regional['zh-TW']);
+	yearSuffix: "年" };
+datepicker.setDefaults( datepicker.regional[ "zh-TW" ] );
 
-return datepicker.regional['zh-TW'];
+return datepicker.regional[ "zh-TW" ];
 
-}));
+} ) );
diff --git a/ui/widgets/datepicker.js b/ui/widgets/datepicker.js
index 36e7ef327b9..f5d406eec6a 100644
--- a/ui/widgets/datepicker.js
+++ b/ui/widgets/datepicker.js
@@ -16,11 +16,11 @@
 //>>css.structure: ../themes/base/datepicker.css
 //>>css.theme: ../themes/base/theme.css
 
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([
+		define( [
 			"jquery",
 			"../version",
 			"../keycode"
@@ -30,20 +30,22 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}(function( $ ) {
+}( function( $ ) {
 
-$.extend($.ui, { datepicker: { version: "@VERSION" } });
+$.extend( $.ui, { datepicker: { version: "@VERSION" } } );
 
 var datepicker_instActive;
 
 function datepicker_getZindex( elem ) {
 	var position, value;
 	while ( elem.length && elem[ 0 ] !== document ) {
+
 		// Ignore z-index if position is set to a value where z-index is ignored by the browser
 		// This makes behavior of this function consistent across browsers
 		// WebKit always returns auto if the element is positioned
 		position = elem.css( "position" );
 		if ( position === "absolute" || position === "relative" || position === "fixed" ) {
+
 			// IE returns 0 when zIndex is not specified
 			// other browsers return a string
 			// we ignore the case of nested elements with an explicit value of 0
@@ -79,17 +81,17 @@ function Datepicker() {
 	this._currentClass = "ui-datepicker-current-day"; // The name of the current day marker class
 	this._dayOverClass = "ui-datepicker-days-cell-over"; // The name of the day hover marker class
 	this.regional = []; // Available regional settings, indexed by language code
-	this.regional[""] = { // Default regional settings
+	this.regional[ "" ] = { // Default regional settings
 		closeText: "Done", // Display text for close link
 		prevText: "Prev", // Display text for previous month link
 		nextText: "Next", // Display text for next month link
 		currentText: "Today", // Display text for current month link
-		monthNames: ["January","February","March","April","May","June",
-			"July","August","September","October","November","December"], // Names of months for drop-down and formatting
-		monthNamesShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], // For formatting
-		dayNames: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], // For formatting
-		dayNamesShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], // For formatting
-		dayNamesMin: ["Su","Mo","Tu","We","Th","Fr","Sa"], // Column headings for days starting at Sunday
+		monthNames: [ "January","February","March","April","May","June",
+			"July","August","September","October","November","December" ], // Names of months for drop-down and formatting
+		monthNamesShort: [ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ], // For formatting
+		dayNames: [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ], // For formatting
+		dayNamesShort: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ], // For formatting
+		dayNamesMin: [ "Su","Mo","Tu","We","Th","Fr","Sa" ], // Column headings for days starting at Sunday
 		weekHeader: "Wk", // Column header for week of the year
 		dateFormat: "mm/dd/yy", // See format options on parseDate
 		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
@@ -147,13 +149,13 @@ function Datepicker() {
 		autoSize: false, // True to size the input for the date format, false to leave as is
 		disabled: false // The initial disabled state
 	};
-	$.extend(this._defaults, this.regional[""]);
-	this.regional.en = $.extend( true, {}, this.regional[ "" ]);
+	$.extend( this._defaults, this.regional[ "" ] );
+	this.regional.en = $.extend( true, {}, this.regional[ "" ] );
 	this.regional[ "en-US" ] = $.extend( true, {}, this.regional.en );
-	this.dpDiv = datepicker_bindHover($("<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"));
+	this.dpDiv = datepicker_bindHover( $( "<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>" ) );
 }
 
-$.extend(Datepicker.prototype, {
+$.extend( Datepicker.prototype, {
 	/* Class name added to elements to indicate already configured with a date picker. */
 	markerClassName: "hasDatepicker",
 
@@ -169,8 +171,8 @@ $.extend(Datepicker.prototype, {
 	 * @param  settings  object - the new settings to use as defaults (anonymous object)
 	 * @return the manager object
 	 */
-	setDefaults: function(settings) {
-		datepicker_extendRemove(this._defaults, settings || {});
+	setDefaults: function( settings ) {
+		datepicker_extendRemove( this._defaults, settings || {} );
 		return this;
 	},
 
@@ -178,144 +180,147 @@ $.extend(Datepicker.prototype, {
 	 * @param  target	element - the target input field or division or span
 	 * @param  settings  object - the new settings to use for this date picker instance (anonymous)
 	 */
-	_attachDatepicker: function(target, settings) {
+	_attachDatepicker: function( target, settings ) {
 		var nodeName, inline, inst;
 		nodeName = target.nodeName.toLowerCase();
-		inline = (nodeName === "div" || nodeName === "span");
-		if (!target.id) {
+		inline = ( nodeName === "div" || nodeName === "span" );
+		if ( !target.id ) {
 			this.uuid += 1;
 			target.id = "dp" + this.uuid;
 		}
-		inst = this._newInst($(target), inline);
-		inst.settings = $.extend({}, settings || {});
-		if (nodeName === "input") {
-			this._connectDatepicker(target, inst);
-		} else if (inline) {
-			this._inlineDatepicker(target, inst);
+		inst = this._newInst( $( target ), inline );
+		inst.settings = $.extend( {}, settings || {} );
+		if ( nodeName === "input" ) {
+			this._connectDatepicker( target, inst );
+		} else if ( inline ) {
+			this._inlineDatepicker( target, inst );
 		}
 	},
 
 	/* Create a new instance object. */
-	_newInst: function(target, inline) {
-		var id = target[0].id.replace(/([^A-Za-z0-9_\-])/g, "\\\\$1"); // escape jQuery meta chars
-		return {id: id, input: target, // associated target
+	_newInst: function( target, inline ) {
+		var id = target[ 0 ].id.replace( /([^A-Za-z0-9_\-])/g, "\\\\$1" ); // escape jQuery meta chars
+		return { id: id, input: target, // associated target
 			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
 			drawMonth: 0, drawYear: 0, // month being drawn
 			inline: inline, // is datepicker inline or not
-			dpDiv: (!inline ? this.dpDiv : // presentation div
-			datepicker_bindHover($("<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")))};
+			dpDiv: ( !inline ? this.dpDiv : // presentation div
+			datepicker_bindHover( $( "<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>" ) ) ) };
 	},
 
 	/* Attach the date picker to an input field. */
-	_connectDatepicker: function(target, inst) {
-		var input = $(target);
-		inst.append = $([]);
-		inst.trigger = $([]);
-		if (input.hasClass(this.markerClassName)) {
+	_connectDatepicker: function( target, inst ) {
+		var input = $( target );
+		inst.append = $( [] );
+		inst.trigger = $( [] );
+		if ( input.hasClass( this.markerClassName ) ) {
 			return;
 		}
-		this._attachments(input, inst);
-		input.addClass(this.markerClassName).on( "keydown", this._doKeyDown).
-			on( "keypress", this._doKeyPress).on( "keyup", this._doKeyUp);
-		this._autoSize(inst);
-		$.data(target, "datepicker", inst);
+		this._attachments( input, inst );
+		input.addClass( this.markerClassName ).on( "keydown", this._doKeyDown ).
+			on( "keypress", this._doKeyPress ).on( "keyup", this._doKeyUp );
+		this._autoSize( inst );
+		$.data( target, "datepicker", inst );
+
 		//If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
-		if( inst.settings.disabled ) {
+		if ( inst.settings.disabled ) {
 			this._disableDatepicker( target );
 		}
 	},
 
 	/* Make attachments based on settings. */
-	_attachments: function(input, inst) {
+	_attachments: function( input, inst ) {
 		var showOn, buttonText, buttonImage,
-			appendText = this._get(inst, "appendText"),
-			isRTL = this._get(inst, "isRTL");
+			appendText = this._get( inst, "appendText" ),
+			isRTL = this._get( inst, "isRTL" );
 
-		if (inst.append) {
+		if ( inst.append ) {
 			inst.append.remove();
 		}
-		if (appendText) {
-			inst.append = $("<span class='" + this._appendClass + "'>" + appendText + "</span>");
-			input[isRTL ? "before" : "after"](inst.append);
+		if ( appendText ) {
+			inst.append = $( "<span class='" + this._appendClass + "'>" + appendText + "</span>" );
+			input[ isRTL ? "before" : "after" ]( inst.append );
 		}
 
-		input.off("focus", this._showDatepicker);
+		input.off( "focus", this._showDatepicker );
 
-		if (inst.trigger) {
+		if ( inst.trigger ) {
 			inst.trigger.remove();
 		}
 
-		showOn = this._get(inst, "showOn");
-		if (showOn === "focus" || showOn === "both") { // pop-up date picker when in the marked field
+		showOn = this._get( inst, "showOn" );
+		if ( showOn === "focus" || showOn === "both" ) { // pop-up date picker when in the marked field
 			input.on( "focus", this._showDatepicker );
 		}
-		if (showOn === "button" || showOn === "both") { // pop-up date picker when button clicked
-			buttonText = this._get(inst, "buttonText");
-			buttonImage = this._get(inst, "buttonImage");
-			inst.trigger = $(this._get(inst, "buttonImageOnly") ?
-				$("<img/>").addClass(this._triggerClass).
-					attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
-				$("<button type='button'></button>").addClass(this._triggerClass).
-					html(!buttonImage ? buttonText : $("<img/>").attr(
-					{ src:buttonImage, alt:buttonText, title:buttonText })));
-			input[isRTL ? "before" : "after"](inst.trigger);
+		if ( showOn === "button" || showOn === "both" ) { // pop-up date picker when button clicked
+			buttonText = this._get( inst, "buttonText" );
+			buttonImage = this._get( inst, "buttonImage" );
+			inst.trigger = $( this._get( inst, "buttonImageOnly" ) ?
+				$( "<img/>" ).addClass( this._triggerClass ).
+					attr( { src: buttonImage, alt: buttonText, title: buttonText } ) :
+				$( "<button type='button'></button>" ).addClass( this._triggerClass ).
+					html( !buttonImage ? buttonText : $( "<img/>" ).attr(
+					{ src:buttonImage, alt:buttonText, title:buttonText } ) ) );
+			input[ isRTL ? "before" : "after" ]( inst.trigger );
 			inst.trigger.on( "click", function() {
-				if ($.datepicker._datepickerShowing && $.datepicker._lastInput === input[0]) {
+				if ( $.datepicker._datepickerShowing && $.datepicker._lastInput === input[ 0 ] ) {
 					$.datepicker._hideDatepicker();
-				} else if ($.datepicker._datepickerShowing && $.datepicker._lastInput !== input[0]) {
+				} else if ( $.datepicker._datepickerShowing && $.datepicker._lastInput !== input[ 0 ] ) {
 					$.datepicker._hideDatepicker();
-					$.datepicker._showDatepicker(input[0]);
+					$.datepicker._showDatepicker( input[ 0 ] );
 				} else {
-					$.datepicker._showDatepicker(input[0]);
+					$.datepicker._showDatepicker( input[ 0 ] );
 				}
 				return false;
-			});
+			} );
 		}
 	},
 
 	/* Apply the maximum length for the date format. */
-	_autoSize: function(inst) {
-		if (this._get(inst, "autoSize") && !inst.inline) {
+	_autoSize: function( inst ) {
+		if ( this._get( inst, "autoSize" ) && !inst.inline ) {
 			var findMax, max, maxI, i,
-				date = new Date(2009, 12 - 1, 20), // Ensure double digits
-				dateFormat = this._get(inst, "dateFormat");
+				date = new Date( 2009, 12 - 1, 20 ), // Ensure double digits
+				dateFormat = this._get( inst, "dateFormat" );
 
-			if (dateFormat.match(/[DM]/)) {
-				findMax = function(names) {
+			if ( dateFormat.match( /[DM]/ ) ) {
+				findMax = function( names ) {
 					max = 0;
 					maxI = 0;
-					for (i = 0; i < names.length; i++) {
-						if (names[i].length > max) {
-							max = names[i].length;
+					for ( i = 0; i < names.length; i++ ) {
+						if ( names[ i ].length > max ) {
+							max = names[ i ].length;
 							maxI = i;
 						}
 					}
 					return maxI;
 				};
-				date.setMonth(findMax(this._get(inst, (dateFormat.match(/MM/) ?
-					"monthNames" : "monthNamesShort"))));
-				date.setDate(findMax(this._get(inst, (dateFormat.match(/DD/) ?
-					"dayNames" : "dayNamesShort"))) + 20 - date.getDay());
+				date.setMonth( findMax( this._get( inst, ( dateFormat.match( /MM/ ) ?
+					"monthNames" : "monthNamesShort" ) ) ) );
+				date.setDate( findMax( this._get( inst, ( dateFormat.match( /DD/ ) ?
+					"dayNames" : "dayNamesShort" ) ) ) + 20 - date.getDay() );
 			}
-			inst.input.attr("size", this._formatDate(inst, date).length);
+			inst.input.attr( "size", this._formatDate( inst, date ).length );
 		}
 	},
 
 	/* Attach an inline date picker to a div. */
-	_inlineDatepicker: function(target, inst) {
-		var divSpan = $(target);
-		if (divSpan.hasClass(this.markerClassName)) {
+	_inlineDatepicker: function( target, inst ) {
+		var divSpan = $( target );
+		if ( divSpan.hasClass( this.markerClassName ) ) {
 			return;
 		}
-		divSpan.addClass(this.markerClassName).append(inst.dpDiv);
-		$.data(target, "datepicker", inst);
-		this._setDate(inst, this._getDefaultDate(inst), true);
-		this._updateDatepicker(inst);
-		this._updateAlternate(inst);
+		divSpan.addClass( this.markerClassName ).append( inst.dpDiv );
+		$.data( target, "datepicker", inst );
+		this._setDate( inst, this._getDefaultDate( inst ), true );
+		this._updateDatepicker( inst );
+		this._updateAlternate( inst );
+
 		//If disabled option is true, disable the datepicker before showing it (see ticket #5665)
-		if( inst.settings.disabled ) {
+		if ( inst.settings.disabled ) {
 			this._disableDatepicker( target );
 		}
+
 		// Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
 		// http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
 		inst.dpDiv.css( "display", "block" );
@@ -331,72 +336,72 @@ $.extend(Datepicker.prototype, {
 	 *					leave empty for default (screen centre)
 	 * @return the manager object
 	 */
-	_dialogDatepicker: function(input, date, onSelect, settings, pos) {
+	_dialogDatepicker: function( input, date, onSelect, settings, pos ) {
 		var id, browserWidth, browserHeight, scrollX, scrollY,
 			inst = this._dialogInst; // internal instance
 
-		if (!inst) {
+		if ( !inst ) {
 			this.uuid += 1;
 			id = "dp" + this.uuid;
-			this._dialogInput = $("<input type='text' id='" + id +
-				"' style='position: absolute; top: -100px; width: 0px;'/>");
+			this._dialogInput = $( "<input type='text' id='" + id +
+				"' style='position: absolute; top: -100px; width: 0px;'/>" );
 			this._dialogInput.on( "keydown", this._doKeyDown );
-			$("body").append(this._dialogInput);
-			inst = this._dialogInst = this._newInst(this._dialogInput, false);
+			$( "body" ).append( this._dialogInput );
+			inst = this._dialogInst = this._newInst( this._dialogInput, false );
 			inst.settings = {};
-			$.data(this._dialogInput[0], "datepicker", inst);
+			$.data( this._dialogInput[ 0 ], "datepicker", inst );
 		}
-		datepicker_extendRemove(inst.settings, settings || {});
-		date = (date && date.constructor === Date ? this._formatDate(inst, date) : date);
-		this._dialogInput.val(date);
+		datepicker_extendRemove( inst.settings, settings || {} );
+		date = ( date && date.constructor === Date ? this._formatDate( inst, date ) : date );
+		this._dialogInput.val( date );
 
-		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
-		if (!this._pos) {
+		this._pos = ( pos ? ( pos.length ? pos : [ pos.pageX, pos.pageY ] ) : null );
+		if ( !this._pos ) {
 			browserWidth = document.documentElement.clientWidth;
 			browserHeight = document.documentElement.clientHeight;
 			scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
 			scrollY = document.documentElement.scrollTop || document.body.scrollTop;
 			this._pos = // should use actual width/height below
-				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
+				[ ( browserWidth / 2 ) - 100 + scrollX, ( browserHeight / 2 ) - 150 + scrollY ];
 		}
 
 		// Move input on screen for focus, but hidden behind dialog
-		this._dialogInput.css("left", (this._pos[0] + 20) + "px").css("top", this._pos[1] + "px");
+		this._dialogInput.css( "left", ( this._pos[ 0 ] + 20 ) + "px" ).css( "top", this._pos[ 1 ] + "px" );
 		inst.settings.onSelect = onSelect;
 		this._inDialog = true;
-		this.dpDiv.addClass(this._dialogClass);
-		this._showDatepicker(this._dialogInput[0]);
-		if ($.blockUI) {
-			$.blockUI(this.dpDiv);
+		this.dpDiv.addClass( this._dialogClass );
+		this._showDatepicker( this._dialogInput[ 0 ] );
+		if ( $.blockUI ) {
+			$.blockUI( this.dpDiv );
 		}
-		$.data(this._dialogInput[0], "datepicker", inst);
+		$.data( this._dialogInput[ 0 ], "datepicker", inst );
 		return this;
 	},
 
 	/* Detach a datepicker from its control.
 	 * @param  target	element - the target input field or division or span
 	 */
-	_destroyDatepicker: function(target) {
+	_destroyDatepicker: function( target ) {
 		var nodeName,
-			$target = $(target),
-			inst = $.data(target, "datepicker");
+			$target = $( target ),
+			inst = $.data( target, "datepicker" );
 
-		if (!$target.hasClass(this.markerClassName)) {
+		if ( !$target.hasClass( this.markerClassName ) ) {
 			return;
 		}
 
 		nodeName = target.nodeName.toLowerCase();
-		$.removeData(target, "datepicker");
-		if (nodeName === "input") {
+		$.removeData( target, "datepicker" );
+		if ( nodeName === "input" ) {
 			inst.append.remove();
 			inst.trigger.remove();
-			$target.removeClass(this.markerClassName).
-				off("focus", this._showDatepicker).
-				off("keydown", this._doKeyDown).
-				off("keypress", this._doKeyPress).
-				off("keyup", this._doKeyUp);
-		} else if (nodeName === "div" || nodeName === "span") {
-			$target.removeClass(this.markerClassName).empty();
+			$target.removeClass( this.markerClassName ).
+				off( "focus", this._showDatepicker ).
+				off( "keydown", this._doKeyDown ).
+				off( "keypress", this._doKeyPress ).
+				off( "keyup", this._doKeyUp );
+		} else if ( nodeName === "div" || nodeName === "span" ) {
+			$target.removeClass( this.markerClassName ).empty();
 		}
 
 		if ( datepicker_instActive === inst ) {
@@ -407,70 +412,70 @@ $.extend(Datepicker.prototype, {
 	/* Enable the date picker to a jQuery selection.
 	 * @param  target	element - the target input field or division or span
 	 */
-	_enableDatepicker: function(target) {
+	_enableDatepicker: function( target ) {
 		var nodeName, inline,
-			$target = $(target),
-			inst = $.data(target, "datepicker");
+			$target = $( target ),
+			inst = $.data( target, "datepicker" );
 
-		if (!$target.hasClass(this.markerClassName)) {
+		if ( !$target.hasClass( this.markerClassName ) ) {
 			return;
 		}
 
 		nodeName = target.nodeName.toLowerCase();
-		if (nodeName === "input") {
+		if ( nodeName === "input" ) {
 			target.disabled = false;
-			inst.trigger.filter("button").
-				each(function() { this.disabled = false; }).end().
-				filter("img").css({opacity: "1.0", cursor: ""});
-		} else if (nodeName === "div" || nodeName === "span") {
-			inline = $target.children("." + this._inlineClass);
-			inline.children().removeClass("ui-state-disabled");
-			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
-				prop("disabled", false);
-		}
-		this._disabledInputs = $.map(this._disabledInputs,
-			function(value) { return (value === target ? null : value); }); // delete entry
+			inst.trigger.filter( "button" ).
+				each( function() { this.disabled = false; } ).end().
+				filter( "img" ).css( { opacity: "1.0", cursor: "" } );
+		} else if ( nodeName === "div" || nodeName === "span" ) {
+			inline = $target.children( "." + this._inlineClass );
+			inline.children().removeClass( "ui-state-disabled" );
+			inline.find( "select.ui-datepicker-month, select.ui-datepicker-year" ).
+				prop( "disabled", false );
+		}
+		this._disabledInputs = $.map( this._disabledInputs,
+			function( value ) { return ( value === target ? null : value ); } ); // delete entry
 	},
 
 	/* Disable the date picker to a jQuery selection.
 	 * @param  target	element - the target input field or division or span
 	 */
-	_disableDatepicker: function(target) {
+	_disableDatepicker: function( target ) {
 		var nodeName, inline,
-			$target = $(target),
-			inst = $.data(target, "datepicker");
+			$target = $( target ),
+			inst = $.data( target, "datepicker" );
 
-		if (!$target.hasClass(this.markerClassName)) {
+		if ( !$target.hasClass( this.markerClassName ) ) {
 			return;
 		}
 
 		nodeName = target.nodeName.toLowerCase();
-		if (nodeName === "input") {
+		if ( nodeName === "input" ) {
 			target.disabled = true;
-			inst.trigger.filter("button").
-				each(function() { this.disabled = true; }).end().
-				filter("img").css({opacity: "0.5", cursor: "default"});
-		} else if (nodeName === "div" || nodeName === "span") {
-			inline = $target.children("." + this._inlineClass);
-			inline.children().addClass("ui-state-disabled");
-			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
-				prop("disabled", true);
-		}
-		this._disabledInputs = $.map(this._disabledInputs,
-			function(value) { return (value === target ? null : value); }); // delete entry
-		this._disabledInputs[this._disabledInputs.length] = target;
+			inst.trigger.filter( "button" ).
+				each( function() { this.disabled = true; } ).end().
+				filter( "img" ).css( { opacity: "0.5", cursor: "default" } );
+		} else if ( nodeName === "div" || nodeName === "span" ) {
+			inline = $target.children( "." + this._inlineClass );
+			inline.children().addClass( "ui-state-disabled" );
+			inline.find( "select.ui-datepicker-month, select.ui-datepicker-year" ).
+				prop( "disabled", true );
+		}
+		this._disabledInputs = $.map( this._disabledInputs,
+			function( value ) { return ( value === target ? null : value ); } ); // delete entry
+		this._disabledInputs[ this._disabledInputs.length ] = target;
 	},
 
 	/* Is the first field in a jQuery collection disabled as a datepicker?
 	 * @param  target	element - the target input field or division or span
 	 * @return boolean - true if disabled, false if enabled
 	 */
-	_isDisabledDatepicker: function(target) {
-		if (!target) {
+	_isDisabledDatepicker: function( target ) {
+		if ( !target ) {
 			return false;
 		}
-		for (var i = 0; i < this._disabledInputs.length; i++) {
-			if (this._disabledInputs[i] === target) {
+		for ( var i = 0; i < this._disabledInputs.length; i++ ) {
+			if ( this._disabledInputs[ i ] === target ) {
 				return true;
 			}
 		}
@@ -482,11 +487,11 @@ $.extend(Datepicker.prototype, {
 	 * @return  object - the associated instance data
 	 * @throws  error if a jQuery problem getting data
 	 */
-	_getInst: function(target) {
+	_getInst: function( target ) {
 		try {
-			return $.data(target, "datepicker");
+			return $.data( target, "datepicker" );
 		}
-		catch (err) {
+		catch ( err ) {
 			throw "Missing instance data for this datepicker";
 		}
 	},
@@ -500,65 +505,66 @@ $.extend(Datepicker.prototype, {
 	 * @param  value   any - the new value for the setting
 	 *				(omit if above is an object or to retrieve a value)
 	 */
-	_optionDatepicker: function(target, name, value) {
+	_optionDatepicker: function( target, name, value ) {
 		var settings, date, minDate, maxDate,
-			inst = this._getInst(target);
+			inst = this._getInst( target );
 
-		if (arguments.length === 2 && typeof name === "string") {
-			return (name === "defaults" ? $.extend({}, $.datepicker._defaults) :
-				(inst ? (name === "all" ? $.extend({}, inst.settings) :
-				this._get(inst, name)) : null));
+		if ( arguments.length === 2 && typeof name === "string" ) {
+			return ( name === "defaults" ? $.extend( {}, $.datepicker._defaults ) :
+				( inst ? ( name === "all" ? $.extend( {}, inst.settings ) :
+				this._get( inst, name ) ) : null ) );
 		}
 
 		settings = name || {};
-		if (typeof name === "string") {
+		if ( typeof name === "string" ) {
 			settings = {};
-			settings[name] = value;
+			settings[ name ] = value;
 		}
 
-		if (inst) {
-			if (this._curInst === inst) {
+		if ( inst ) {
+			if ( this._curInst === inst ) {
 				this._hideDatepicker();
 			}
 
-			date = this._getDateDatepicker(target, true);
-			minDate = this._getMinMaxDate(inst, "min");
-			maxDate = this._getMinMaxDate(inst, "max");
-			datepicker_extendRemove(inst.settings, settings);
+			date = this._getDateDatepicker( target, true );
+			minDate = this._getMinMaxDate( inst, "min" );
+			maxDate = this._getMinMaxDate( inst, "max" );
+			datepicker_extendRemove( inst.settings, settings );
+
 			// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
-			if (minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined) {
-				inst.settings.minDate = this._formatDate(inst, minDate);
+			if ( minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined ) {
+				inst.settings.minDate = this._formatDate( inst, minDate );
 			}
-			if (maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined) {
-				inst.settings.maxDate = this._formatDate(inst, maxDate);
+			if ( maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined ) {
+				inst.settings.maxDate = this._formatDate( inst, maxDate );
 			}
 			if ( "disabled" in settings ) {
 				if ( settings.disabled ) {
-					this._disableDatepicker(target);
+					this._disableDatepicker( target );
 				} else {
-					this._enableDatepicker(target);
+					this._enableDatepicker( target );
 				}
 			}
-			this._attachments($(target), inst);
-			this._autoSize(inst);
-			this._setDate(inst, date);
-			this._updateAlternate(inst);
-			this._updateDatepicker(inst);
+			this._attachments( $( target ), inst );
+			this._autoSize( inst );
+			this._setDate( inst, date );
+			this._updateAlternate( inst );
+			this._updateDatepicker( inst );
 		}
 	},
 
 	// Change method deprecated
-	_changeDatepicker: function(target, name, value) {
-		this._optionDatepicker(target, name, value);
+	_changeDatepicker: function( target, name, value ) {
+		this._optionDatepicker( target, name, value );
 	},
 
 	/* Redraw the date picker attached to an input field or division.
 	 * @param  target  element - the target input field or division or span
 	 */
-	_refreshDatepicker: function(target) {
-		var inst = this._getInst(target);
-		if (inst) {
-			this._updateDatepicker(inst);
+	_refreshDatepicker: function( target ) {
+		var inst = this._getInst( target );
+		if ( inst ) {
+			this._updateDatepicker( inst );
 		}
 	},
 
@@ -566,12 +572,12 @@ $.extend(Datepicker.prototype, {
 	 * @param  target element - the target input field or division or span
 	 * @param  date	Date - the new date
 	 */
-	_setDateDatepicker: function(target, date) {
-		var inst = this._getInst(target);
-		if (inst) {
-			this._setDate(inst, date);
-			this._updateDatepicker(inst);
-			this._updateAlternate(inst);
+	_setDateDatepicker: function( target, date ) {
+		var inst = this._getInst( target );
+		if ( inst ) {
+			this._setDate( inst, date );
+			this._updateDatepicker( inst );
+			this._updateAlternate( inst );
 		}
 	},
 
@@ -580,39 +586,39 @@ $.extend(Datepicker.prototype, {
 	 * @param  noDefault boolean - true if no default date is to be used
 	 * @return Date - the current date
 	 */
-	_getDateDatepicker: function(target, noDefault) {
-		var inst = this._getInst(target);
-		if (inst && !inst.inline) {
-			this._setDateFromField(inst, noDefault);
+	_getDateDatepicker: function( target, noDefault ) {
+		var inst = this._getInst( target );
+		if ( inst && !inst.inline ) {
+			this._setDateFromField( inst, noDefault );
 		}
-		return (inst ? this._getDate(inst) : null);
+		return ( inst ? this._getDate( inst ) : null );
 	},
 
 	/* Handle keystrokes. */
-	_doKeyDown: function(event) {
+	_doKeyDown: function( event ) {
 		var onSelect, dateStr, sel,
-			inst = $.datepicker._getInst(event.target),
+			inst = $.datepicker._getInst( event.target ),
 			handled = true,
-			isRTL = inst.dpDiv.is(".ui-datepicker-rtl");
+			isRTL = inst.dpDiv.is( ".ui-datepicker-rtl" );
 
 		inst._keyEvent = true;
-		if ($.datepicker._datepickerShowing) {
-			switch (event.keyCode) {
+		if ( $.datepicker._datepickerShowing ) {
+			switch ( event.keyCode ) {
 				case 9: $.datepicker._hideDatepicker();
 						handled = false;
 						break; // hide on tab out
-				case 13: sel = $("td." + $.datepicker._dayOverClass + ":not(." +
-									$.datepicker._currentClass + ")", inst.dpDiv);
-						if (sel[0]) {
-							$.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]);
+				case 13: sel = $( "td." + $.datepicker._dayOverClass + ":not(." +
+									$.datepicker._currentClass + ")", inst.dpDiv );
+						if ( sel[ 0 ] ) {
+							$.datepicker._selectDay( event.target, inst.selectedMonth, inst.selectedYear, sel[ 0 ] );
 						}
 
-						onSelect = $.datepicker._get(inst, "onSelect");
-						if (onSelect) {
-							dateStr = $.datepicker._formatDate(inst);
+						onSelect = $.datepicker._get( inst, "onSelect" );
+						if ( onSelect ) {
+							dateStr = $.datepicker._formatDate( inst );
 
 							// Trigger custom callback
-							onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);
+							onSelect.apply( ( inst.input ? inst.input[ 0 ] : null ), [ dateStr, inst ] );
 						} else {
 							$.datepicker._hideDatepicker();
 						}
@@ -620,102 +626,106 @@ $.extend(Datepicker.prototype, {
 						return false; // don't submit the form
 				case 27: $.datepicker._hideDatepicker();
 						break; // hide on escape
-				case 33: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
-							-$.datepicker._get(inst, "stepBigMonths") :
-							-$.datepicker._get(inst, "stepMonths")), "M");
+				case 33: $.datepicker._adjustDate( event.target, ( event.ctrlKey ?
+							-$.datepicker._get( inst, "stepBigMonths" ) :
+							-$.datepicker._get( inst, "stepMonths" ) ), "M" );
 						break; // previous month/year on page up/+ ctrl
-				case 34: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
-							+$.datepicker._get(inst, "stepBigMonths") :
-							+$.datepicker._get(inst, "stepMonths")), "M");
+				case 34: $.datepicker._adjustDate( event.target, ( event.ctrlKey ?
+							+$.datepicker._get( inst, "stepBigMonths" ) :
+							+$.datepicker._get( inst, "stepMonths" ) ), "M" );
 						break; // next month/year on page down/+ ctrl
-				case 35: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._clearDate(event.target);
+				case 35: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._clearDate( event.target );
 						}
 						handled = event.ctrlKey || event.metaKey;
 						break; // clear on ctrl or command +end
-				case 36: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._gotoToday(event.target);
+				case 36: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._gotoToday( event.target );
 						}
 						handled = event.ctrlKey || event.metaKey;
 						break; // current on ctrl or command +home
-				case 37: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._adjustDate(event.target, (isRTL ? +1 : -1), "D");
+				case 37: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._adjustDate( event.target, ( isRTL ? +1 : -1 ), "D" );
 						}
 						handled = event.ctrlKey || event.metaKey;
+
 						// -1 day on ctrl or command +left
-						if (event.originalEvent.altKey) {
-							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
-								-$.datepicker._get(inst, "stepBigMonths") :
-								-$.datepicker._get(inst, "stepMonths")), "M");
+						if ( event.originalEvent.altKey ) {
+							$.datepicker._adjustDate( event.target, ( event.ctrlKey ?
+								-$.datepicker._get( inst, "stepBigMonths" ) :
+								-$.datepicker._get( inst, "stepMonths" ) ), "M" );
 						}
+
 						// next month/year on alt +left on Mac
 						break;
-				case 38: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._adjustDate(event.target, -7, "D");
+				case 38: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._adjustDate( event.target, -7, "D" );
 						}
 						handled = event.ctrlKey || event.metaKey;
 						break; // -1 week on ctrl or command +up
-				case 39: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._adjustDate(event.target, (isRTL ? -1 : +1), "D");
+				case 39: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._adjustDate( event.target, ( isRTL ? -1 : +1 ), "D" );
 						}
 						handled = event.ctrlKey || event.metaKey;
+
 						// +1 day on ctrl or command +right
-						if (event.originalEvent.altKey) {
-							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
-								+$.datepicker._get(inst, "stepBigMonths") :
-								+$.datepicker._get(inst, "stepMonths")), "M");
+						if ( event.originalEvent.altKey ) {
+							$.datepicker._adjustDate( event.target, ( event.ctrlKey ?
+								+$.datepicker._get( inst, "stepBigMonths" ) :
+								+$.datepicker._get( inst, "stepMonths" ) ), "M" );
 						}
+
 						// next month/year on alt +right
 						break;
-				case 40: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._adjustDate(event.target, +7, "D");
+				case 40: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._adjustDate( event.target, +7, "D" );
 						}
 						handled = event.ctrlKey || event.metaKey;
 						break; // +1 week on ctrl or command +down
 				default: handled = false;
 			}
-		} else if (event.keyCode === 36 && event.ctrlKey) { // display the date picker on ctrl+home
-			$.datepicker._showDatepicker(this);
+		} else if ( event.keyCode === 36 && event.ctrlKey ) { // display the date picker on ctrl+home
+			$.datepicker._showDatepicker( this );
 		} else {
 			handled = false;
 		}
 
-		if (handled) {
+		if ( handled ) {
 			event.preventDefault();
 			event.stopPropagation();
 		}
 	},
 
 	/* Filter entered characters - based on date format. */
-	_doKeyPress: function(event) {
+	_doKeyPress: function( event ) {
 		var chars, chr,
-			inst = $.datepicker._getInst(event.target);
+			inst = $.datepicker._getInst( event.target );
 
-		if ($.datepicker._get(inst, "constrainInput")) {
-			chars = $.datepicker._possibleChars($.datepicker._get(inst, "dateFormat"));
-			chr = String.fromCharCode(event.charCode == null ? event.keyCode : event.charCode);
-			return event.ctrlKey || event.metaKey || (chr < " " || !chars || chars.indexOf(chr) > -1);
+		if ( $.datepicker._get( inst, "constrainInput" ) ) {
+			chars = $.datepicker._possibleChars( $.datepicker._get( inst, "dateFormat" ) );
+			chr = String.fromCharCode( event.charCode == null ? event.keyCode : event.charCode );
+			return event.ctrlKey || event.metaKey || ( chr < " " || !chars || chars.indexOf( chr ) > -1 );
 		}
 	},
 
 	/* Synchronise manual entry and field/alternate field. */
-	_doKeyUp: function(event) {
+	_doKeyUp: function( event ) {
 		var date,
-			inst = $.datepicker._getInst(event.target);
+			inst = $.datepicker._getInst( event.target );
 
-		if (inst.input.val() !== inst.lastVal) {
+		if ( inst.input.val() !== inst.lastVal ) {
 			try {
-				date = $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
-					(inst.input ? inst.input.val() : null),
-					$.datepicker._getFormatConfig(inst));
-
-				if (date) { // only if valid
-					$.datepicker._setDateFromField(inst);
-					$.datepicker._updateAlternate(inst);
-					$.datepicker._updateDatepicker(inst);
+				date = $.datepicker.parseDate( $.datepicker._get( inst, "dateFormat" ),
+					( inst.input ? inst.input.val() : null ),
+					$.datepicker._getFormatConfig( inst ) );
+
+				if ( date ) { // only if valid
+					$.datepicker._setDateFromField( inst );
+					$.datepicker._updateAlternate( inst );
+					$.datepicker._updateDatepicker( inst );
 				}
 			}
-			catch (err) {
+			catch ( err ) {
 			}
 		}
 		return true;
@@ -726,76 +736,79 @@ $.extend(Datepicker.prototype, {
 	 * @param  input  element - the input field attached to the date picker or
 	 *					event - if triggered by focus
 	 */
-	_showDatepicker: function(input) {
+	_showDatepicker: function( input ) {
 		input = input.target || input;
-		if (input.nodeName.toLowerCase() !== "input") { // find from button/image trigger
-			input = $("input", input.parentNode)[0];
+		if ( input.nodeName.toLowerCase() !== "input" ) { // find from button/image trigger
+			input = $( "input", input.parentNode )[ 0 ];
 		}
 
-		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput === input) { // already here
+		if ( $.datepicker._isDisabledDatepicker( input ) || $.datepicker._lastInput === input ) { // already here
 			return;
 		}
 
 		var inst, beforeShow, beforeShowSettings, isFixed,
 			offset, showAnim, duration;
 
-		inst = $.datepicker._getInst(input);
-		if ($.datepicker._curInst && $.datepicker._curInst !== inst) {
-			$.datepicker._curInst.dpDiv.stop(true, true);
+		inst = $.datepicker._getInst( input );
+		if ( $.datepicker._curInst && $.datepicker._curInst !== inst ) {
+			$.datepicker._curInst.dpDiv.stop( true, true );
 			if ( inst && $.datepicker._datepickerShowing ) {
-				$.datepicker._hideDatepicker( $.datepicker._curInst.input[0] );
+				$.datepicker._hideDatepicker( $.datepicker._curInst.input[ 0 ] );
 			}
 		}
 
-		beforeShow = $.datepicker._get(inst, "beforeShow");
-		beforeShowSettings = beforeShow ? beforeShow.apply(input, [input, inst]) : {};
-		if(beforeShowSettings === false){
+		beforeShow = $.datepicker._get( inst, "beforeShow" );
+		beforeShowSettings = beforeShow ? beforeShow.apply( input, [ input, inst ] ) : {};
+		if ( beforeShowSettings === false ) {
 			return;
 		}
-		datepicker_extendRemove(inst.settings, beforeShowSettings);
+		datepicker_extendRemove( inst.settings, beforeShowSettings );
 
 		inst.lastVal = null;
 		$.datepicker._lastInput = input;
-		$.datepicker._setDateFromField(inst);
+		$.datepicker._setDateFromField( inst );
 
-		if ($.datepicker._inDialog) { // hide cursor
+		if ( $.datepicker._inDialog ) { // hide cursor
 			input.value = "";
 		}
-		if (!$.datepicker._pos) { // position below input
-			$.datepicker._pos = $.datepicker._findPos(input);
-			$.datepicker._pos[1] += input.offsetHeight; // add the height
+		if ( !$.datepicker._pos ) { // position below input
+			$.datepicker._pos = $.datepicker._findPos( input );
+			$.datepicker._pos[ 1 ] += input.offsetHeight; // add the height
 		}
 
 		isFixed = false;
-		$(input).parents().each(function() {
-			isFixed |= $(this).css("position") === "fixed";
+		$( input ).parents().each( function() {
+			isFixed |= $( this ).css( "position" ) === "fixed";
 			return !isFixed;
-		});
+		} );
 
-		offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
+		offset = { left: $.datepicker._pos[ 0 ], top: $.datepicker._pos[ 1 ] };
 		$.datepicker._pos = null;
+
 		//to avoid flashes on Firefox
 		inst.dpDiv.empty();
+
 		// determine sizing offscreen
-		inst.dpDiv.css({position: "absolute", display: "block", top: "-1000px"});
-		$.datepicker._updateDatepicker(inst);
+		inst.dpDiv.css( { position: "absolute", display: "block", top: "-1000px" } );
+		$.datepicker._updateDatepicker( inst );
+
 		// fix width for dynamic number of date pickers
 		// and adjust position before showing
-		offset = $.datepicker._checkOffset(inst, offset, isFixed);
-		inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
-			"static" : (isFixed ? "fixed" : "absolute")), display: "none",
-			left: offset.left + "px", top: offset.top + "px"});
-
-		if (!inst.inline) {
-			showAnim = $.datepicker._get(inst, "showAnim");
-			duration = $.datepicker._get(inst, "duration");
+		offset = $.datepicker._checkOffset( inst, offset, isFixed );
+		inst.dpDiv.css( { position: ( $.datepicker._inDialog && $.blockUI ?
+			"static" : ( isFixed ? "fixed" : "absolute" ) ), display: "none",
+			left: offset.left + "px", top: offset.top + "px" } );
+
+		if ( !inst.inline ) {
+			showAnim = $.datepicker._get( inst, "showAnim" );
+			duration = $.datepicker._get( inst, "duration" );
 			inst.dpDiv.css( "z-index", datepicker_getZindex( $( input ) ) + 1 );
 			$.datepicker._datepickerShowing = true;
 
 			if ( $.effects && $.effects.effect[ showAnim ] ) {
-				inst.dpDiv.show(showAnim, $.datepicker._get(inst, "showOptions"), duration);
+				inst.dpDiv.show( showAnim, $.datepicker._get( inst, "showOptions" ), duration );
 			} else {
-				inst.dpDiv[showAnim || "show"](showAnim ? duration : null);
+				inst.dpDiv[ showAnim || "show" ]( showAnim ? duration : null );
 			}
 
 			if ( $.datepicker._shouldFocusInput( inst ) ) {
@@ -807,15 +820,15 @@ $.extend(Datepicker.prototype, {
 	},
 
 	/* Generate the date picker content. */
-	_updateDatepicker: function(inst) {
+	_updateDatepicker: function( inst ) {
 		this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
 		datepicker_instActive = inst; // for delegate hover events
-		inst.dpDiv.empty().append(this._generateHTML(inst));
-		this._attachHandlers(inst);
+		inst.dpDiv.empty().append( this._generateHTML( inst ) );
+		this._attachHandlers( inst );
 
 		var origyearshtml,
-			numMonths = this._getNumberOfMonths(inst),
-			cols = numMonths[1],
+			numMonths = this._getNumberOfMonths( inst ),
+			cols = numMonths[ 1 ],
 			width = 17,
 			activeCell = inst.dpDiv.find( "." + this._dayOverClass + " a" );
 
@@ -823,29 +836,30 @@ $.extend(Datepicker.prototype, {
 			datepicker_handleMouseover.apply( activeCell.get( 0 ) );
 		}
 
-		inst.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");
-		if (cols > 1) {
-			inst.dpDiv.addClass("ui-datepicker-multi-" + cols).css("width", (width * cols) + "em");
+		inst.dpDiv.removeClass( "ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4" ).width( "" );
+		if ( cols > 1 ) {
+			inst.dpDiv.addClass( "ui-datepicker-multi-" + cols ).css( "width", ( width * cols ) + "em" );
 		}
-		inst.dpDiv[(numMonths[0] !== 1 || numMonths[1] !== 1 ? "add" : "remove") +
-			"Class"]("ui-datepicker-multi");
-		inst.dpDiv[(this._get(inst, "isRTL") ? "add" : "remove") +
-			"Class"]("ui-datepicker-rtl");
+		inst.dpDiv[ ( numMonths[ 0 ] !== 1 || numMonths[ 1 ] !== 1 ? "add" : "remove" ) +
+			"Class" ]( "ui-datepicker-multi" );
+		inst.dpDiv[ ( this._get( inst, "isRTL" ) ? "add" : "remove" ) +
+			"Class" ]( "ui-datepicker-rtl" );
 
-		if (inst === $.datepicker._curInst && $.datepicker._datepickerShowing && $.datepicker._shouldFocusInput( inst ) ) {
+		if ( inst === $.datepicker._curInst && $.datepicker._datepickerShowing && $.datepicker._shouldFocusInput( inst ) ) {
 			inst.input.trigger( "focus" );
 		}
 
 		// Deffered render of the years select (to avoid flashes on Firefox)
-		if( inst.yearshtml ){
+		if ( inst.yearshtml ) {
 			origyearshtml = inst.yearshtml;
-			setTimeout(function(){
+			setTimeout( function() {
+
 				//assure that inst.yearshtml didn't change.
-				if( origyearshtml === inst.yearshtml && inst.yearshtml ){
-					inst.dpDiv.find("select.ui-datepicker-year:first").replaceWith(inst.yearshtml);
+				if ( origyearshtml === inst.yearshtml && inst.yearshtml ) {
+					inst.dpDiv.find( "select.ui-datepicker-year:first" ).replaceWith( inst.yearshtml );
 				}
 				origyearshtml = inst.yearshtml = null;
-			}, 0);
+			}, 0 );
 		}
 	},
 
@@ -857,83 +871,83 @@ $.extend(Datepicker.prototype, {
 	},
 
 	/* Check positioning to remain on screen. */
-	_checkOffset: function(inst, offset, isFixed) {
+	_checkOffset: function( inst, offset, isFixed ) {
 		var dpWidth = inst.dpDiv.outerWidth(),
 			dpHeight = inst.dpDiv.outerHeight(),
 			inputWidth = inst.input ? inst.input.outerWidth() : 0,
 			inputHeight = inst.input ? inst.input.outerHeight() : 0,
-			viewWidth = document.documentElement.clientWidth + (isFixed ? 0 : $(document).scrollLeft()),
-			viewHeight = document.documentElement.clientHeight + (isFixed ? 0 : $(document).scrollTop());
+			viewWidth = document.documentElement.clientWidth + ( isFixed ? 0 : $( document ).scrollLeft() ),
+			viewHeight = document.documentElement.clientHeight + ( isFixed ? 0 : $( document ).scrollTop() );
 
-		offset.left -= (this._get(inst, "isRTL") ? (dpWidth - inputWidth) : 0);
-		offset.left -= (isFixed && offset.left === inst.input.offset().left) ? $(document).scrollLeft() : 0;
-		offset.top -= (isFixed && offset.top === (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
+		offset.left -= ( this._get( inst, "isRTL" ) ? ( dpWidth - inputWidth ) : 0 );
+		offset.left -= ( isFixed && offset.left === inst.input.offset().left ) ? $( document ).scrollLeft() : 0;
+		offset.top -= ( isFixed && offset.top === ( inst.input.offset().top + inputHeight ) ) ? $( document ).scrollTop() : 0;
 
 		// Now check if datepicker is showing outside window viewport - move to a better place if so.
-		offset.left -= Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ?
-			Math.abs(offset.left + dpWidth - viewWidth) : 0);
-		offset.top -= Math.min(offset.top, (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
-			Math.abs(dpHeight + inputHeight) : 0);
+		offset.left -= Math.min( offset.left, ( offset.left + dpWidth > viewWidth && viewWidth > dpWidth ) ?
+			Math.abs( offset.left + dpWidth - viewWidth ) : 0 );
+		offset.top -= Math.min( offset.top, ( offset.top + dpHeight > viewHeight && viewHeight > dpHeight ) ?
+			Math.abs( dpHeight + inputHeight ) : 0 );
 
 		return offset;
 	},
 
 	/* Find an object's position on the screen. */
-	_findPos: function(obj) {
+	_findPos: function( obj ) {
 		var position,
-			inst = this._getInst(obj),
-			isRTL = this._get(inst, "isRTL");
+			inst = this._getInst( obj ),
+			isRTL = this._get( inst, "isRTL" );
 
-		while (obj && (obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden(obj))) {
-			obj = obj[isRTL ? "previousSibling" : "nextSibling"];
+		while ( obj && ( obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden( obj ) ) ) {
+			obj = obj[ isRTL ? "previousSibling" : "nextSibling" ];
 		}
 
-		position = $(obj).offset();
-		return [position.left, position.top];
+		position = $( obj ).offset();
+		return [ position.left, position.top ];
 	},
 
 	/* Hide the date picker from view.
 	 * @param  input  element - the input field attached to the date picker
 	 */
-	_hideDatepicker: function(input) {
+	_hideDatepicker: function( input ) {
 		var showAnim, duration, postProcess, onClose,
 			inst = this._curInst;
 
-		if (!inst || (input && inst !== $.data(input, "datepicker"))) {
+		if ( !inst || ( input && inst !== $.data( input, "datepicker" ) ) ) {
 			return;
 		}
 
-		if (this._datepickerShowing) {
-			showAnim = this._get(inst, "showAnim");
-			duration = this._get(inst, "duration");
+		if ( this._datepickerShowing ) {
+			showAnim = this._get( inst, "showAnim" );
+			duration = this._get( inst, "duration" );
 			postProcess = function() {
-				$.datepicker._tidyDialog(inst);
+				$.datepicker._tidyDialog( inst );
 			};
 
 			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
 			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
-				inst.dpDiv.hide(showAnim, $.datepicker._get(inst, "showOptions"), duration, postProcess);
+				inst.dpDiv.hide( showAnim, $.datepicker._get( inst, "showOptions" ), duration, postProcess );
 			} else {
-				inst.dpDiv[(showAnim === "slideDown" ? "slideUp" :
-					(showAnim === "fadeIn" ? "fadeOut" : "hide"))]((showAnim ? duration : null), postProcess);
+				inst.dpDiv[ ( showAnim === "slideDown" ? "slideUp" :
+					( showAnim === "fadeIn" ? "fadeOut" : "hide" ) ) ]( ( showAnim ? duration : null ), postProcess );
 			}
 
-			if (!showAnim) {
+			if ( !showAnim ) {
 				postProcess();
 			}
 			this._datepickerShowing = false;
 
-			onClose = this._get(inst, "onClose");
-			if (onClose) {
-				onClose.apply((inst.input ? inst.input[0] : null), [(inst.input ? inst.input.val() : ""), inst]);
+			onClose = this._get( inst, "onClose" );
+			if ( onClose ) {
+				onClose.apply( ( inst.input ? inst.input[ 0 ] : null ), [ ( inst.input ? inst.input.val() : "" ), inst ] );
 			}
 
 			this._lastInput = null;
-			if (this._inDialog) {
-				this._dialogInput.css({ position: "absolute", left: "0", top: "-100px" });
-				if ($.blockUI) {
+			if ( this._inDialog ) {
+				this._dialogInput.css( { position: "absolute", left: "0", top: "-100px" } );
+				if ( $.blockUI ) {
 					$.unblockUI();
-					$("body").append(this.dpDiv);
+					$( "body" ).append( this.dpDiv );
 				}
 			}
 			this._inDialog = false;
@@ -941,50 +955,50 @@ $.extend(Datepicker.prototype, {
 	},
 
 	/* Tidy up after a dialog display. */
-	_tidyDialog: function(inst) {
-		inst.dpDiv.removeClass(this._dialogClass).off(".ui-datepicker-calendar");
+	_tidyDialog: function( inst ) {
+		inst.dpDiv.removeClass( this._dialogClass ).off( ".ui-datepicker-calendar" );
 	},
 
 	/* Close date picker if clicked elsewhere. */
-	_checkExternalClick: function(event) {
-		if (!$.datepicker._curInst) {
+	_checkExternalClick: function( event ) {
+		if ( !$.datepicker._curInst ) {
 			return;
 		}
 
-		var $target = $(event.target),
-			inst = $.datepicker._getInst($target[0]);
+		var $target = $( event.target ),
+			inst = $.datepicker._getInst( $target[ 0 ] );
 
-		if ( ( ( $target[0].id !== $.datepicker._mainDivId &&
-				$target.parents("#" + $.datepicker._mainDivId).length === 0 &&
-				!$target.hasClass($.datepicker.markerClassName) &&
-				!$target.closest("." + $.datepicker._triggerClass).length &&
-				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI) ) ) ||
-			( $target.hasClass($.datepicker.markerClassName) && $.datepicker._curInst !== inst ) ) {
+		if ( ( ( $target[ 0 ].id !== $.datepicker._mainDivId &&
+				$target.parents( "#" + $.datepicker._mainDivId ).length === 0 &&
+				!$target.hasClass( $.datepicker.markerClassName ) &&
+				!$target.closest( "." + $.datepicker._triggerClass ).length &&
+				$.datepicker._datepickerShowing && !( $.datepicker._inDialog && $.blockUI ) ) ) ||
+			( $target.hasClass( $.datepicker.markerClassName ) && $.datepicker._curInst !== inst ) ) {
 				$.datepicker._hideDatepicker();
 		}
 	},
 
 	/* Adjust one of the date sub-fields. */
-	_adjustDate: function(id, offset, period) {
-		var target = $(id),
-			inst = this._getInst(target[0]);
+	_adjustDate: function( id, offset, period ) {
+		var target = $( id ),
+			inst = this._getInst( target[ 0 ] );
 
-		if (this._isDisabledDatepicker(target[0])) {
+		if ( this._isDisabledDatepicker( target[ 0 ] ) ) {
 			return;
 		}
-		this._adjustInstDate(inst, offset +
-			(period === "M" ? this._get(inst, "showCurrentAtPos") : 0), // undo positioning
-			period);
-		this._updateDatepicker(inst);
+		this._adjustInstDate( inst, offset +
+			( period === "M" ? this._get( inst, "showCurrentAtPos" ) : 0 ), // undo positioning
+			period );
+		this._updateDatepicker( inst );
 	},
 
 	/* Action for current link. */
-	_gotoToday: function(id) {
+	_gotoToday: function( id ) {
 		var date,
-			target = $(id),
-			inst = this._getInst(target[0]);
+			target = $( id ),
+			inst = this._getInst( target[ 0 ] );
 
-		if (this._get(inst, "gotoCurrent") && inst.currentDay) {
+		if ( this._get( inst, "gotoCurrent" ) && inst.currentDay ) {
 			inst.selectedDay = inst.currentDay;
 			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
 			inst.drawYear = inst.selectedYear = inst.currentYear;
@@ -994,71 +1008,71 @@ $.extend(Datepicker.prototype, {
 			inst.drawMonth = inst.selectedMonth = date.getMonth();
 			inst.drawYear = inst.selectedYear = date.getFullYear();
 		}
-		this._notifyChange(inst);
-		this._adjustDate(target);
+		this._notifyChange( inst );
+		this._adjustDate( target );
 	},
 
 	/* Action for selecting a new month/year. */
-	_selectMonthYear: function(id, select, period) {
-		var target = $(id),
-			inst = this._getInst(target[0]);
+	_selectMonthYear: function( id, select, period ) {
+		var target = $( id ),
+			inst = this._getInst( target[ 0 ] );
 
-		inst["selected" + (period === "M" ? "Month" : "Year")] =
-		inst["draw" + (period === "M" ? "Month" : "Year")] =
-			parseInt(select.options[select.selectedIndex].value,10);
+		inst[ "selected" + ( period === "M" ? "Month" : "Year" ) ] =
+		inst[ "draw" + ( period === "M" ? "Month" : "Year" ) ] =
+			parseInt( select.options[ select.selectedIndex ].value, 10 );
 
-		this._notifyChange(inst);
-		this._adjustDate(target);
+		this._notifyChange( inst );
+		this._adjustDate( target );
 	},
 
 	/* Action for selecting a day. */
-	_selectDay: function(id, month, year, td) {
+	_selectDay: function( id, month, year, td ) {
 		var inst,
-			target = $(id);
+			target = $( id );
 
-		if ($(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(target[0])) {
+		if ( $( td ).hasClass( this._unselectableClass ) || this._isDisabledDatepicker( target[ 0 ] ) ) {
 			return;
 		}
 
-		inst = this._getInst(target[0]);
-		inst.selectedDay = inst.currentDay = $("a", td).html();
+		inst = this._getInst( target[ 0 ] );
+		inst.selectedDay = inst.currentDay = $( "a", td ).html();
 		inst.selectedMonth = inst.currentMonth = month;
 		inst.selectedYear = inst.currentYear = year;
-		this._selectDate(id, this._formatDate(inst,
-			inst.currentDay, inst.currentMonth, inst.currentYear));
+		this._selectDate( id, this._formatDate( inst,
+			inst.currentDay, inst.currentMonth, inst.currentYear ) );
 	},
 
 	/* Erase the input field and hide the date picker. */
-	_clearDate: function(id) {
-		var target = $(id);
-		this._selectDate(target, "");
+	_clearDate: function( id ) {
+		var target = $( id );
+		this._selectDate( target, "" );
 	},
 
 	/* Update the input field with the selected date. */
-	_selectDate: function(id, dateStr) {
+	_selectDate: function( id, dateStr ) {
 		var onSelect,
-			target = $(id),
-			inst = this._getInst(target[0]);
+			target = $( id ),
+			inst = this._getInst( target[ 0 ] );
 
-		dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
-		if (inst.input) {
-			inst.input.val(dateStr);
+		dateStr = ( dateStr != null ? dateStr : this._formatDate( inst ) );
+		if ( inst.input ) {
+			inst.input.val( dateStr );
 		}
-		this._updateAlternate(inst);
+		this._updateAlternate( inst );
 
-		onSelect = this._get(inst, "onSelect");
-		if (onSelect) {
-			onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);  // trigger custom callback
-		} else if (inst.input) {
-			inst.input.trigger("change"); // fire the change event
+		onSelect = this._get( inst, "onSelect" );
+		if ( onSelect ) {
+			onSelect.apply( ( inst.input ? inst.input[ 0 ] : null ), [ dateStr, inst ] );  // trigger custom callback
+		} else if ( inst.input ) {
+			inst.input.trigger( "change" ); // fire the change event
 		}
 
-		if (inst.inline){
-			this._updateDatepicker(inst);
+		if ( inst.inline ) {
+			this._updateDatepicker( inst );
 		} else {
 			this._hideDatepicker();
-			this._lastInput = inst.input[0];
-			if (typeof(inst.input[0]) !== "object") {
+			this._lastInput = inst.input[ 0 ];
+			if ( typeof( inst.input[ 0 ] ) !== "object" ) {
 				inst.input.trigger( "focus" ); // restore focus
 			}
 			this._lastInput = null;
@@ -1066,15 +1080,15 @@ $.extend(Datepicker.prototype, {
 	},
 
 	/* Update any alternate field to synchronise with the main field. */
-	_updateAlternate: function(inst) {
+	_updateAlternate: function( inst ) {
 		var altFormat, date, dateStr,
-			altField = this._get(inst, "altField");
+			altField = this._get( inst, "altField" );
 
-		if (altField) { // update alternate field too
-			altFormat = this._get(inst, "altFormat") || this._get(inst, "dateFormat");
-			date = this._getDate(inst);
-			dateStr = this.formatDate(altFormat, date, this._getFormatConfig(inst));
-			$(altField).each(function() { $(this).val(dateStr); });
+		if ( altField ) { // update alternate field too
+			altFormat = this._get( inst, "altFormat" ) || this._get( inst, "dateFormat" );
+			date = this._getDate( inst );
+			dateStr = this.formatDate( altFormat, date, this._getFormatConfig( inst ) );
+			$( altField ).each( function() { $( this ).val( dateStr ); } );
 		}
 	},
 
@@ -1082,26 +1096,26 @@ $.extend(Datepicker.prototype, {
 	 * @param  date  Date - the date to customise
 	 * @return [boolean, string] - is this date selectable?, what is its CSS class?
 	 */
-	noWeekends: function(date) {
+	noWeekends: function( date ) {
 		var day = date.getDay();
-		return [(day > 0 && day < 6), ""];
+		return [ ( day > 0 && day < 6 ), "" ];
 	},
 
 	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
 	 * @param  date  Date - the date to get the week for
 	 * @return  number - the number of the week within the year that contains this date
 	 */
-	iso8601Week: function(date) {
+	iso8601Week: function( date ) {
 		var time,
-			checkDate = new Date(date.getTime());
+			checkDate = new Date( date.getTime() );
 
 		// Find Thursday of this week starting on Monday
-		checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
+		checkDate.setDate( checkDate.getDate() + 4 - ( checkDate.getDay() || 7 ) );
 
 		time = checkDate.getTime();
-		checkDate.setMonth(0); // Compare with Jan 1
-		checkDate.setDate(1);
-		return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+		checkDate.setMonth( 0 ); // Compare with Jan 1
+		checkDate.setDate( 1 );
+		return Math.floor( Math.round( ( time - checkDate ) / 86400000 ) / 7 ) + 1;
 	},
 
 	/* Parse a string value into a date object.
@@ -1117,125 +1131,129 @@ $.extend(Datepicker.prototype, {
 	 *					monthNames		string[12] - names of the months (optional)
 	 * @return  Date - the extracted date value or null if value is blank
 	 */
-	parseDate: function (format, value, settings) {
-		if (format == null || value == null) {
+	parseDate: function( format, value, settings ) {
+		if ( format == null || value == null ) {
 			throw "Invalid arguments";
 		}
 
-		value = (typeof value === "object" ? value.toString() : value + "");
-		if (value === "") {
+		value = ( typeof value === "object" ? value.toString() : value + "" );
+		if ( value === "" ) {
 			return null;
 		}
 
 		var iFormat, dim, extra,
 			iValue = 0,
-			shortYearCutoffTemp = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff,
-			shortYearCutoff = (typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
-				new Date().getFullYear() % 100 + parseInt(shortYearCutoffTemp, 10)),
-			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
-			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
-			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
-			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
+			shortYearCutoffTemp = ( settings ? settings.shortYearCutoff : null ) || this._defaults.shortYearCutoff,
+			shortYearCutoff = ( typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
+				new Date().getFullYear() % 100 + parseInt( shortYearCutoffTemp, 10 ) ),
+			dayNamesShort = ( settings ? settings.dayNamesShort : null ) || this._defaults.dayNamesShort,
+			dayNames = ( settings ? settings.dayNames : null ) || this._defaults.dayNames,
+			monthNamesShort = ( settings ? settings.monthNamesShort : null ) || this._defaults.monthNamesShort,
+			monthNames = ( settings ? settings.monthNames : null ) || this._defaults.monthNames,
 			year = -1,
 			month = -1,
 			day = -1,
 			doy = -1,
 			literal = false,
 			date,
+
 			// Check whether a format character is doubled
-			lookAhead = function(match) {
-				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
-				if (matches) {
+			lookAhead = function( match ) {
+				var matches = ( iFormat + 1 < format.length && format.charAt( iFormat + 1 ) === match );
+				if ( matches ) {
 					iFormat++;
 				}
 				return matches;
 			},
+
 			// Extract a number from the string value
-			getNumber = function(match) {
-				var isDoubled = lookAhead(match),
-					size = (match === "@" ? 14 : (match === "!" ? 20 :
-					(match === "y" && isDoubled ? 4 : (match === "o" ? 3 : 2)))),
-					minSize = (match === "y" ? size : 1),
-					digits = new RegExp("^\\d{" + minSize + "," + size + "}"),
-					num = value.substring(iValue).match(digits);
-				if (!num) {
+			getNumber = function( match ) {
+				var isDoubled = lookAhead( match ),
+					size = ( match === "@" ? 14 : ( match === "!" ? 20 :
+					( match === "y" && isDoubled ? 4 : ( match === "o" ? 3 : 2 ) ) ) ),
+					minSize = ( match === "y" ? size : 1 ),
+					digits = new RegExp( "^\\d{" + minSize + "," + size + "}" ),
+					num = value.substring( iValue ).match( digits );
+				if ( !num ) {
 					throw "Missing number at position " + iValue;
 				}
-				iValue += num[0].length;
-				return parseInt(num[0], 10);
+				iValue += num[ 0 ].length;
+				return parseInt( num[ 0 ], 10 );
 			},
+
 			// Extract a name from the string value and convert to an index
-			getName = function(match, shortNames, longNames) {
+			getName = function( match, shortNames, longNames ) {
 				var index = -1,
-					names = $.map(lookAhead(match) ? longNames : shortNames, function (v, k) {
-						return [ [k, v] ];
-					}).sort(function (a, b) {
-						return -(a[1].length - b[1].length);
-					});
-
-				$.each(names, function (i, pair) {
-					var name = pair[1];
-					if (value.substr(iValue, name.length).toLowerCase() === name.toLowerCase()) {
-						index = pair[0];
+					names = $.map( lookAhead( match ) ? longNames : shortNames, function( v, k ) {
+						return [ [ k, v ] ];
+					} ).sort( function( a, b ) {
+						return -( a[ 1 ].length - b[ 1 ].length );
+					} );
+
+				$.each( names, function( i, pair ) {
+					var name = pair[ 1 ];
+					if ( value.substr( iValue, name.length ).toLowerCase() === name.toLowerCase() ) {
+						index = pair[ 0 ];
 						iValue += name.length;
 						return false;
 					}
-				});
-				if (index !== -1) {
+				} );
+				if ( index !== -1 ) {
 					return index + 1;
 				} else {
 					throw "Unknown name at position " + iValue;
 				}
 			},
+
 			// Confirm that a literal character matches the string value
 			checkLiteral = function() {
-				if (value.charAt(iValue) !== format.charAt(iFormat)) {
+				if ( value.charAt( iValue ) !== format.charAt( iFormat ) ) {
 					throw "Unexpected literal at position " + iValue;
 				}
 				iValue++;
 			};
 
-		for (iFormat = 0; iFormat < format.length; iFormat++) {
-			if (literal) {
-				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+		for ( iFormat = 0; iFormat < format.length; iFormat++ ) {
+			if ( literal ) {
+				if ( format.charAt( iFormat ) === "'" && !lookAhead( "'" ) ) {
 					literal = false;
 				} else {
 					checkLiteral();
 				}
 			} else {
-				switch (format.charAt(iFormat)) {
+				switch ( format.charAt( iFormat ) ) {
 					case "d":
-						day = getNumber("d");
+						day = getNumber( "d" );
 						break;
 					case "D":
-						getName("D", dayNamesShort, dayNames);
+						getName( "D", dayNamesShort, dayNames );
 						break;
 					case "o":
-						doy = getNumber("o");
+						doy = getNumber( "o" );
 						break;
 					case "m":
-						month = getNumber("m");
+						month = getNumber( "m" );
 						break;
 					case "M":
-						month = getName("M", monthNamesShort, monthNames);
+						month = getName( "M", monthNamesShort, monthNames );
 						break;
 					case "y":
-						year = getNumber("y");
+						year = getNumber( "y" );
 						break;
 					case "@":
-						date = new Date(getNumber("@"));
+						date = new Date( getNumber( "@" ) );
 						year = date.getFullYear();
 						month = date.getMonth() + 1;
 						day = date.getDate();
 						break;
 					case "!":
-						date = new Date((getNumber("!") - this._ticksTo1970) / 10000);
+						date = new Date( ( getNumber( "!" ) - this._ticksTo1970 ) / 10000 );
 						year = date.getFullYear();
 						month = date.getMonth() + 1;
 						day = date.getDate();
 						break;
 					case "'":
-						if (lookAhead("'")){
+						if ( lookAhead( "'" ) ) {
 							checkLiteral();
 						} else {
 							literal = true;
@@ -1247,35 +1265,35 @@ $.extend(Datepicker.prototype, {
 			}
 		}
 
-		if (iValue < value.length){
-			extra = value.substr(iValue);
-			if (!/^\s+/.test(extra)) {
+		if ( iValue < value.length ) {
+			extra = value.substr( iValue );
+			if ( !/^\s+/.test( extra ) ) {
 				throw "Extra/unparsed characters found in date: " + extra;
 			}
 		}
 
-		if (year === -1) {
+		if ( year === -1 ) {
 			year = new Date().getFullYear();
-		} else if (year < 100) {
+		} else if ( year < 100 ) {
 			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
-				(year <= shortYearCutoff ? 0 : -100);
+				( year <= shortYearCutoff ? 0 : -100 );
 		}
 
-		if (doy > -1) {
+		if ( doy > -1 ) {
 			month = 1;
 			day = doy;
 			do {
-				dim = this._getDaysInMonth(year, month - 1);
-				if (day <= dim) {
+				dim = this._getDaysInMonth( year, month - 1 );
+				if ( day <= dim ) {
 					break;
 				}
 				month++;
 				day -= dim;
-			} while (true);
+			} while ( true );
 		}
 
-		date = this._daylightSavingAdjust(new Date(year, month - 1, day));
-		if (date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day) {
+		date = this._daylightSavingAdjust( new Date( year, month - 1, day ) );
+		if ( date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day ) {
 			throw "Invalid date"; // E.g. 31/02/00
 		}
 		return date;
@@ -1295,8 +1313,8 @@ $.extend(Datepicker.prototype, {
 	TIMESTAMP: "@",
 	W3C: "yy-mm-dd", // ISO 8601
 
-	_ticksTo1970: (((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) +
-		Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000),
+	_ticksTo1970: ( ( ( 1970 - 1 ) * 365 + Math.floor( 1970 / 4 ) - Math.floor( 1970 / 100 ) +
+		Math.floor( 1970 / 400 ) ) * 24 * 60 * 60 * 10000000 ),
 
 	/* Format a date object into a string value.
 	 * The format can be combinations of the following:
@@ -1326,70 +1344,73 @@ $.extend(Datepicker.prototype, {
 	 *					monthNames		string[12] - names of the months (optional)
 	 * @return  string - the date in the above format
 	 */
-	formatDate: function (format, date, settings) {
-		if (!date) {
+	formatDate: function( format, date, settings ) {
+		if ( !date ) {
 			return "";
 		}
 
 		var iFormat,
-			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
-			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
-			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
-			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
+			dayNamesShort = ( settings ? settings.dayNamesShort : null ) || this._defaults.dayNamesShort,
+			dayNames = ( settings ? settings.dayNames : null ) || this._defaults.dayNames,
+			monthNamesShort = ( settings ? settings.monthNamesShort : null ) || this._defaults.monthNamesShort,
+			monthNames = ( settings ? settings.monthNames : null ) || this._defaults.monthNames,
+
 			// Check whether a format character is doubled
-			lookAhead = function(match) {
-				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
-				if (matches) {
+			lookAhead = function( match ) {
+				var matches = ( iFormat + 1 < format.length && format.charAt( iFormat + 1 ) === match );
+				if ( matches ) {
 					iFormat++;
 				}
 				return matches;
 			},
+
 			// Format a number, with leading zero if necessary
-			formatNumber = function(match, value, len) {
+			formatNumber = function( match, value, len ) {
 				var num = "" + value;
-				if (lookAhead(match)) {
-					while (num.length < len) {
+				if ( lookAhead( match ) ) {
+					while ( num.length < len ) {
 						num = "0" + num;
 					}
 				}
 				return num;
 			},
+
 			// Format a name, short or long as requested
-			formatName = function(match, value, shortNames, longNames) {
-				return (lookAhead(match) ? longNames[value] : shortNames[value]);
+			formatName = function( match, value, shortNames, longNames ) {
+				return ( lookAhead( match ) ? longNames[ value ] : shortNames[ value ] );
 			},
 			output = "",
 			literal = false;
 
-		if (date) {
-			for (iFormat = 0; iFormat < format.length; iFormat++) {
-				if (literal) {
-					if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+		if ( date ) {
+			for ( iFormat = 0; iFormat < format.length; iFormat++ ) {
+				if ( literal ) {
+					if ( format.charAt( iFormat ) === "'" && !lookAhead( "'" ) ) {
 						literal = false;
 					} else {
-						output += format.charAt(iFormat);
+						output += format.charAt( iFormat );
 					}
 				} else {
-					switch (format.charAt(iFormat)) {
+					switch ( format.charAt( iFormat ) ) {
 						case "d":
-							output += formatNumber("d", date.getDate(), 2);
+							output += formatNumber( "d", date.getDate(), 2 );
 							break;
 						case "D":
-							output += formatName("D", date.getDay(), dayNamesShort, dayNames);
+							output += formatName( "D", date.getDay(), dayNamesShort, dayNames );
 							break;
 						case "o":
-							output += formatNumber("o",
-								Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
+							output += formatNumber( "o",
+								Math.round( ( new Date( date.getFullYear(), date.getMonth(), date.getDate() ).getTime() - new Date( date.getFullYear(), 0, 0 ).getTime() ) / 86400000 ), 3 );
 							break;
 						case "m":
-							output += formatNumber("m", date.getMonth() + 1, 2);
+							output += formatNumber( "m", date.getMonth() + 1, 2 );
 							break;
 						case "M":
-							output += formatName("M", date.getMonth(), monthNamesShort, monthNames);
+							output += formatName( "M", date.getMonth(), monthNamesShort, monthNames );
 							break;
 						case "y":
-							output += (lookAhead("y") ? date.getFullYear() :
-								(date.getYear() % 100 < 10 ? "0" : "") + date.getYear() % 100);
+							output += ( lookAhead( "y" ) ? date.getFullYear() :
+								( date.getYear() % 100 < 10 ? "0" : "" ) + date.getYear() % 100 );
 							break;
 						case "@":
 							output += date.getTime();
@@ -1398,14 +1419,14 @@ $.extend(Datepicker.prototype, {
 							output += date.getTime() * 10000 + this._ticksTo1970;
 							break;
 						case "'":
-							if (lookAhead("'")) {
+							if ( lookAhead( "'" ) ) {
 								output += "'";
 							} else {
 								literal = true;
 							}
 							break;
 						default:
-							output += format.charAt(iFormat);
+							output += format.charAt( iFormat );
 					}
 				}
 			}
@@ -1414,42 +1435,43 @@ $.extend(Datepicker.prototype, {
 	},
 
 	/* Extract all possible characters from the date format. */
-	_possibleChars: function (format) {
+	_possibleChars: function( format ) {
 		var iFormat,
 			chars = "",
 			literal = false,
+
 			// Check whether a format character is doubled
-			lookAhead = function(match) {
-				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
-				if (matches) {
+			lookAhead = function( match ) {
+				var matches = ( iFormat + 1 < format.length && format.charAt( iFormat + 1 ) === match );
+				if ( matches ) {
 					iFormat++;
 				}
 				return matches;
 			};
 
-		for (iFormat = 0; iFormat < format.length; iFormat++) {
-			if (literal) {
-				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+		for ( iFormat = 0; iFormat < format.length; iFormat++ ) {
+			if ( literal ) {
+				if ( format.charAt( iFormat ) === "'" && !lookAhead( "'" ) ) {
 					literal = false;
 				} else {
-					chars += format.charAt(iFormat);
+					chars += format.charAt( iFormat );
 				}
 			} else {
-				switch (format.charAt(iFormat)) {
+				switch ( format.charAt( iFormat ) ) {
 					case "d": case "m": case "y": case "@":
 						chars += "0123456789";
 						break;
 					case "D": case "M":
 						return null; // Accept anything
 					case "'":
-						if (lookAhead("'")) {
+						if ( lookAhead( "'" ) ) {
 							chars += "'";
 						} else {
 							literal = true;
 						}
 						break;
 					default:
-						chars += format.charAt(iFormat);
+						chars += format.charAt( iFormat );
 				}
 			}
 		}
@@ -1457,97 +1479,98 @@ $.extend(Datepicker.prototype, {
 	},
 
 	/* Get a setting value, defaulting if necessary. */
-	_get: function(inst, name) {
-		return inst.settings[name] !== undefined ?
-			inst.settings[name] : this._defaults[name];
+	_get: function( inst, name ) {
+		return inst.settings[ name ] !== undefined ?
+			inst.settings[ name ] : this._defaults[ name ];
 	},
 
 	/* Parse existing date and initialise date picker. */
-	_setDateFromField: function(inst, noDefault) {
-		if (inst.input.val() === inst.lastVal) {
+	_setDateFromField: function( inst, noDefault ) {
+		if ( inst.input.val() === inst.lastVal ) {
 			return;
 		}
 
-		var dateFormat = this._get(inst, "dateFormat"),
+		var dateFormat = this._get( inst, "dateFormat" ),
 			dates = inst.lastVal = inst.input ? inst.input.val() : null,
-			defaultDate = this._getDefaultDate(inst),
+			defaultDate = this._getDefaultDate( inst ),
 			date = defaultDate,
-			settings = this._getFormatConfig(inst);
+			settings = this._getFormatConfig( inst );
 
 		try {
-			date = this.parseDate(dateFormat, dates, settings) || defaultDate;
-		} catch (event) {
-			dates = (noDefault ? "" : dates);
+			date = this.parseDate( dateFormat, dates, settings ) || defaultDate;
+		} catch ( event ) {
+			dates = ( noDefault ? "" : dates );
 		}
 		inst.selectedDay = date.getDate();
 		inst.drawMonth = inst.selectedMonth = date.getMonth();
 		inst.drawYear = inst.selectedYear = date.getFullYear();
-		inst.currentDay = (dates ? date.getDate() : 0);
-		inst.currentMonth = (dates ? date.getMonth() : 0);
-		inst.currentYear = (dates ? date.getFullYear() : 0);
-		this._adjustInstDate(inst);
+		inst.currentDay = ( dates ? date.getDate() : 0 );
+		inst.currentMonth = ( dates ? date.getMonth() : 0 );
+		inst.currentYear = ( dates ? date.getFullYear() : 0 );
+		this._adjustInstDate( inst );
 	},
 
 	/* Retrieve the default date shown on opening. */
-	_getDefaultDate: function(inst) {
-		return this._restrictMinMax(inst,
-			this._determineDate(inst, this._get(inst, "defaultDate"), new Date()));
+	_getDefaultDate: function( inst ) {
+		return this._restrictMinMax( inst,
+			this._determineDate( inst, this._get( inst, "defaultDate" ), new Date() ) );
 	},
 
 	/* A date may be specified as an exact value or a relative one. */
-	_determineDate: function(inst, date, defaultDate) {
-		var offsetNumeric = function(offset) {
+	_determineDate: function( inst, date, defaultDate ) {
+		var offsetNumeric = function( offset ) {
 				var date = new Date();
-				date.setDate(date.getDate() + offset);
+				date.setDate( date.getDate() + offset );
 				return date;
 			},
-			offsetString = function(offset) {
+			offsetString = function( offset ) {
 				try {
-					return $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
-						offset, $.datepicker._getFormatConfig(inst));
+					return $.datepicker.parseDate( $.datepicker._get( inst, "dateFormat" ),
+						offset, $.datepicker._getFormatConfig( inst ) );
 				}
-				catch (e) {
+				catch ( e ) {
+
 					// Ignore
 				}
 
-				var date = (offset.toLowerCase().match(/^c/) ?
-					$.datepicker._getDate(inst) : null) || new Date(),
+				var date = ( offset.toLowerCase().match( /^c/ ) ?
+					$.datepicker._getDate( inst ) : null ) || new Date(),
 					year = date.getFullYear(),
 					month = date.getMonth(),
 					day = date.getDate(),
 					pattern = /([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,
-					matches = pattern.exec(offset);
+					matches = pattern.exec( offset );
 
-				while (matches) {
-					switch (matches[2] || "d") {
+				while ( matches ) {
+					switch ( matches[ 2 ] || "d" ) {
 						case "d" : case "D" :
-							day += parseInt(matches[1],10); break;
+							day += parseInt( matches[ 1 ], 10 ); break;
 						case "w" : case "W" :
-							day += parseInt(matches[1],10) * 7; break;
+							day += parseInt( matches[ 1 ], 10 ) * 7; break;
 						case "m" : case "M" :
-							month += parseInt(matches[1],10);
-							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+							month += parseInt( matches[ 1 ], 10 );
+							day = Math.min( day, $.datepicker._getDaysInMonth( year, month ) );
 							break;
 						case "y": case "Y" :
-							year += parseInt(matches[1],10);
-							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+							year += parseInt( matches[ 1 ], 10 );
+							day = Math.min( day, $.datepicker._getDaysInMonth( year, month ) );
 							break;
 					}
-					matches = pattern.exec(offset);
+					matches = pattern.exec( offset );
 				}
-				return new Date(year, month, day);
+				return new Date( year, month, day );
 			},
-			newDate = (date == null || date === "" ? defaultDate : (typeof date === "string" ? offsetString(date) :
-				(typeof date === "number" ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
+			newDate = ( date == null || date === "" ? defaultDate : ( typeof date === "string" ? offsetString( date ) :
+				( typeof date === "number" ? ( isNaN( date ) ? defaultDate : offsetNumeric( date ) ) : new Date( date.getTime() ) ) ) );
 
-		newDate = (newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate);
-		if (newDate) {
-			newDate.setHours(0);
-			newDate.setMinutes(0);
-			newDate.setSeconds(0);
-			newDate.setMilliseconds(0);
+		newDate = ( newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate );
+		if ( newDate ) {
+			newDate.setHours( 0 );
+			newDate.setMinutes( 0 );
+			newDate.setSeconds( 0 );
+			newDate.setMilliseconds( 0 );
 		}
-		return this._daylightSavingAdjust(newDate);
+		return this._daylightSavingAdjust( newDate );
 	},
 
 	/* Handle switch to/from daylight saving.
@@ -1557,80 +1580,80 @@ $.extend(Datepicker.prototype, {
 	 * @param  date  (Date) the date to check
 	 * @return  (Date) the corrected date
 	 */
-	_daylightSavingAdjust: function(date) {
-		if (!date) {
+	_daylightSavingAdjust: function( date ) {
+		if ( !date ) {
 			return null;
 		}
-		date.setHours(date.getHours() > 12 ? date.getHours() + 2 : 0);
+		date.setHours( date.getHours() > 12 ? date.getHours() + 2 : 0 );
 		return date;
 	},
 
 	/* Set the date(s) directly. */
-	_setDate: function(inst, date, noChange) {
+	_setDate: function( inst, date, noChange ) {
 		var clear = !date,
 			origMonth = inst.selectedMonth,
 			origYear = inst.selectedYear,
-			newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
+			newDate = this._restrictMinMax( inst, this._determineDate( inst, date, new Date() ) );
 
 		inst.selectedDay = inst.currentDay = newDate.getDate();
 		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
 		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
-		if ((origMonth !== inst.selectedMonth || origYear !== inst.selectedYear) && !noChange) {
-			this._notifyChange(inst);
+		if ( ( origMonth !== inst.selectedMonth || origYear !== inst.selectedYear ) && !noChange ) {
+			this._notifyChange( inst );
 		}
-		this._adjustInstDate(inst);
-		if (inst.input) {
-			inst.input.val(clear ? "" : this._formatDate(inst));
+		this._adjustInstDate( inst );
+		if ( inst.input ) {
+			inst.input.val( clear ? "" : this._formatDate( inst ) );
 		}
 	},
 
 	/* Retrieve the date(s) directly. */
-	_getDate: function(inst) {
-		var startDate = (!inst.currentYear || (inst.input && inst.input.val() === "") ? null :
-			this._daylightSavingAdjust(new Date(
-			inst.currentYear, inst.currentMonth, inst.currentDay)));
+	_getDate: function( inst ) {
+		var startDate = ( !inst.currentYear || ( inst.input && inst.input.val() === "" ) ? null :
+			this._daylightSavingAdjust( new Date(
+			inst.currentYear, inst.currentMonth, inst.currentDay ) ) );
 			return startDate;
 	},
 
 	/* Attach the onxxx handlers.  These are declared statically so
 	 * they work with static code transformers like Caja.
 	 */
-	_attachHandlers: function(inst) {
-		var stepMonths = this._get(inst, "stepMonths"),
+	_attachHandlers: function( inst ) {
+		var stepMonths = this._get( inst, "stepMonths" ),
 			id = "#" + inst.id.replace( /\\\\/g, "\\" );
-		inst.dpDiv.find("[data-handler]").map(function () {
+		inst.dpDiv.find( "[data-handler]" ).map( function() {
 			var handler = {
-				prev: function () {
-					$.datepicker._adjustDate(id, -stepMonths, "M");
+				prev: function() {
+					$.datepicker._adjustDate( id, -stepMonths, "M" );
 				},
-				next: function () {
-					$.datepicker._adjustDate(id, +stepMonths, "M");
+				next: function() {
+					$.datepicker._adjustDate( id, +stepMonths, "M" );
 				},
-				hide: function () {
+				hide: function() {
 					$.datepicker._hideDatepicker();
 				},
-				today: function () {
-					$.datepicker._gotoToday(id);
+				today: function() {
+					$.datepicker._gotoToday( id );
 				},
-				selectDay: function () {
-					$.datepicker._selectDay(id, +this.getAttribute("data-month"), +this.getAttribute("data-year"), this);
+				selectDay: function() {
+					$.datepicker._selectDay( id, +this.getAttribute( "data-month" ), +this.getAttribute( "data-year" ), this );
 					return false;
 				},
-				selectMonth: function () {
-					$.datepicker._selectMonthYear(id, this, "M");
+				selectMonth: function() {
+					$.datepicker._selectMonthYear( id, this, "M" );
 					return false;
 				},
-				selectYear: function () {
-					$.datepicker._selectMonthYear(id, this, "Y");
+				selectYear: function() {
+					$.datepicker._selectMonthYear( id, this, "Y" );
 					return false;
 				}
 			};
-			$(this).on(this.getAttribute("data-event"), handler[this.getAttribute("data-handler")]);
-		});
+			$( this ).on( this.getAttribute( "data-event" ), handler[ this.getAttribute( "data-handler" ) ] );
+		} );
 	},
 
 	/* Generate the HTML for the current state of the date picker. */
-	_generateHTML: function(inst) {
+	_generateHTML: function( inst ) {
 		var maxDraw, prevText, prev, nextText, next, currentText, gotoDate,
 			controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin,
 			monthNames, monthNamesShort, beforeShowDay, showOtherMonths,
@@ -1639,33 +1662,33 @@ $.extend(Datepicker.prototype, {
 			printDate, dRow, tbody, daySettings, otherMonth, unselectable,
 			tempDate = new Date(),
 			today = this._daylightSavingAdjust(
-				new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate())), // clear time
-			isRTL = this._get(inst, "isRTL"),
-			showButtonPanel = this._get(inst, "showButtonPanel"),
-			hideIfNoPrevNext = this._get(inst, "hideIfNoPrevNext"),
-			navigationAsDateFormat = this._get(inst, "navigationAsDateFormat"),
-			numMonths = this._getNumberOfMonths(inst),
-			showCurrentAtPos = this._get(inst, "showCurrentAtPos"),
-			stepMonths = this._get(inst, "stepMonths"),
-			isMultiMonth = (numMonths[0] !== 1 || numMonths[1] !== 1),
-			currentDate = this._daylightSavingAdjust((!inst.currentDay ? new Date(9999, 9, 9) :
-				new Date(inst.currentYear, inst.currentMonth, inst.currentDay))),
-			minDate = this._getMinMaxDate(inst, "min"),
-			maxDate = this._getMinMaxDate(inst, "max"),
+				new Date( tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate() ) ), // clear time
+			isRTL = this._get( inst, "isRTL" ),
+			showButtonPanel = this._get( inst, "showButtonPanel" ),
+			hideIfNoPrevNext = this._get( inst, "hideIfNoPrevNext" ),
+			navigationAsDateFormat = this._get( inst, "navigationAsDateFormat" ),
+			numMonths = this._getNumberOfMonths( inst ),
+			showCurrentAtPos = this._get( inst, "showCurrentAtPos" ),
+			stepMonths = this._get( inst, "stepMonths" ),
+			isMultiMonth = ( numMonths[ 0 ] !== 1 || numMonths[ 1 ] !== 1 ),
+			currentDate = this._daylightSavingAdjust( ( !inst.currentDay ? new Date( 9999, 9, 9 ) :
+				new Date( inst.currentYear, inst.currentMonth, inst.currentDay ) ) ),
+			minDate = this._getMinMaxDate( inst, "min" ),
+			maxDate = this._getMinMaxDate( inst, "max" ),
 			drawMonth = inst.drawMonth - showCurrentAtPos,
 			drawYear = inst.drawYear;
 
-		if (drawMonth < 0) {
+		if ( drawMonth < 0 ) {
 			drawMonth += 12;
 			drawYear--;
 		}
-		if (maxDate) {
-			maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
-				maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate()));
-			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
-			while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
+		if ( maxDate ) {
+			maxDraw = this._daylightSavingAdjust( new Date( maxDate.getFullYear(),
+				maxDate.getMonth() - ( numMonths[ 0 ] * numMonths[ 1 ] ) + 1, maxDate.getDate() ) );
+			maxDraw = ( minDate && maxDraw < minDate ? minDate : maxDraw );
+			while ( this._daylightSavingAdjust( new Date( drawYear, drawMonth, 1 ) ) > maxDraw ) {
 				drawMonth--;
-				if (drawMonth < 0) {
+				if ( drawMonth < 0 ) {
 					drawMonth = 11;
 					drawYear--;
 				}
@@ -1674,136 +1697,137 @@ $.extend(Datepicker.prototype, {
 		inst.drawMonth = drawMonth;
 		inst.drawYear = drawYear;
 
-		prevText = this._get(inst, "prevText");
-		prevText = (!navigationAsDateFormat ? prevText : this.formatDate(prevText,
-			this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
-			this._getFormatConfig(inst)));
+		prevText = this._get( inst, "prevText" );
+		prevText = ( !navigationAsDateFormat ? prevText : this.formatDate( prevText,
+			this._daylightSavingAdjust( new Date( drawYear, drawMonth - stepMonths, 1 ) ),
+			this._getFormatConfig( inst ) ) );
 
-		prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
+		prev = ( this._canAdjustMonth( inst, -1, drawYear, drawMonth ) ?
 			"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click'" +
-			" title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>" :
-			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+ prevText +"'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>"));
+			" title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w" ) + "'>" + prevText + "</span></a>" :
+			( hideIfNoPrevNext ? "" : "<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w" ) + "'>" + prevText + "</span></a>" ) );
 
-		nextText = this._get(inst, "nextText");
-		nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText,
-			this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
-			this._getFormatConfig(inst)));
+		nextText = this._get( inst, "nextText" );
+		nextText = ( !navigationAsDateFormat ? nextText : this.formatDate( nextText,
+			this._daylightSavingAdjust( new Date( drawYear, drawMonth + stepMonths, 1 ) ),
+			this._getFormatConfig( inst ) ) );
 
-		next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
+		next = ( this._canAdjustMonth( inst, +1, drawYear, drawMonth ) ?
 			"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click'" +
-			" title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>" :
-			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+ nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>"));
-
-		currentText = this._get(inst, "currentText");
-		gotoDate = (this._get(inst, "gotoCurrent") && inst.currentDay ? currentDate : today);
-		currentText = (!navigationAsDateFormat ? currentText :
-			this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
-
-		controls = (!inst.inline ? "<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>" +
-			this._get(inst, "closeText") + "</button>" : "");
-
-		buttonPanel = (showButtonPanel) ? "<div class='ui-datepicker-buttonpane ui-widget-content'>" + (isRTL ? controls : "") +
-			(this._isInRange(inst, gotoDate) ? "<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'" +
-			">" + currentText + "</button>" : "") + (isRTL ? "" : controls) + "</div>" : "";
-
-		firstDay = parseInt(this._get(inst, "firstDay"),10);
-		firstDay = (isNaN(firstDay) ? 0 : firstDay);
-
-		showWeek = this._get(inst, "showWeek");
-		dayNames = this._get(inst, "dayNames");
-		dayNamesMin = this._get(inst, "dayNamesMin");
-		monthNames = this._get(inst, "monthNames");
-		monthNamesShort = this._get(inst, "monthNamesShort");
-		beforeShowDay = this._get(inst, "beforeShowDay");
-		showOtherMonths = this._get(inst, "showOtherMonths");
-		selectOtherMonths = this._get(inst, "selectOtherMonths");
-		defaultDate = this._getDefaultDate(inst);
+			" title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e" ) + "'>" + nextText + "</span></a>" :
+			( hideIfNoPrevNext ? "" : "<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e" ) + "'>" + nextText + "</span></a>" ) );
+
+		currentText = this._get( inst, "currentText" );
+		gotoDate = ( this._get( inst, "gotoCurrent" ) && inst.currentDay ? currentDate : today );
+		currentText = ( !navigationAsDateFormat ? currentText :
+			this.formatDate( currentText, gotoDate, this._getFormatConfig( inst ) ) );
+
+		controls = ( !inst.inline ? "<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>" +
+			this._get( inst, "closeText" ) + "</button>" : "" );
+
+		buttonPanel = ( showButtonPanel ) ? "<div class='ui-datepicker-buttonpane ui-widget-content'>" + ( isRTL ? controls : "" ) +
+			( this._isInRange( inst, gotoDate ) ? "<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'" +
+			">" + currentText + "</button>" : "" ) + ( isRTL ? "" : controls ) + "</div>" : "";
+
+		firstDay = parseInt( this._get( inst, "firstDay" ), 10 );
+		firstDay = ( isNaN( firstDay ) ? 0 : firstDay );
+
+		showWeek = this._get( inst, "showWeek" );
+		dayNames = this._get( inst, "dayNames" );
+		dayNamesMin = this._get( inst, "dayNamesMin" );
+		monthNames = this._get( inst, "monthNames" );
+		monthNamesShort = this._get( inst, "monthNamesShort" );
+		beforeShowDay = this._get( inst, "beforeShowDay" );
+		showOtherMonths = this._get( inst, "showOtherMonths" );
+		selectOtherMonths = this._get( inst, "selectOtherMonths" );
+		defaultDate = this._getDefaultDate( inst );
 		html = "";
 		dow;
-		for (row = 0; row < numMonths[0]; row++) {
+		for ( row = 0; row < numMonths[ 0 ]; row++ ) {
 			group = "";
 			this.maxRows = 4;
-			for (col = 0; col < numMonths[1]; col++) {
-				selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
+			for ( col = 0; col < numMonths[ 1 ]; col++ ) {
+				selectedDate = this._daylightSavingAdjust( new Date( drawYear, drawMonth, inst.selectedDay ) );
 				cornerClass = " ui-corner-all";
 				calender = "";
-				if (isMultiMonth) {
+				if ( isMultiMonth ) {
 					calender += "<div class='ui-datepicker-group";
-					if (numMonths[1] > 1) {
-						switch (col) {
+					if ( numMonths[ 1 ] > 1 ) {
+						switch ( col ) {
 							case 0: calender += " ui-datepicker-group-first";
-								cornerClass = " ui-corner-" + (isRTL ? "right" : "left"); break;
-							case numMonths[1]-1: calender += " ui-datepicker-group-last";
-								cornerClass = " ui-corner-" + (isRTL ? "left" : "right"); break;
+								cornerClass = " ui-corner-" + ( isRTL ? "right" : "left" ); break;
+							case numMonths[ 1 ] - 1: calender += " ui-datepicker-group-last";
+								cornerClass = " ui-corner-" + ( isRTL ? "left" : "right" ); break;
 							default: calender += " ui-datepicker-group-middle"; cornerClass = ""; break;
 						}
 					}
 					calender += "'>";
 				}
 				calender += "<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix" + cornerClass + "'>" +
-					(/all|left/.test(cornerClass) && row === 0 ? (isRTL ? next : prev) : "") +
-					(/all|right/.test(cornerClass) && row === 0 ? (isRTL ? prev : next) : "") +
-					this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
-					row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
+					( /all|left/.test( cornerClass ) && row === 0 ? ( isRTL ? next : prev ) : "" ) +
+					( /all|right/.test( cornerClass ) && row === 0 ? ( isRTL ? prev : next ) : "" ) +
+					this._generateMonthYearHeader( inst, drawMonth, drawYear, minDate, maxDate,
+					row > 0 || col > 0, monthNames, monthNamesShort ) + // draw month headers
 					"</div><table class='ui-datepicker-calendar'><thead>" +
 					"<tr>";
-				thead = (showWeek ? "<th class='ui-datepicker-week-col'>" + this._get(inst, "weekHeader") + "</th>" : "");
-				for (dow = 0; dow < 7; dow++) { // days of the week
-					day = (dow + firstDay) % 7;
-					thead += "<th scope='col'" + ((dow + firstDay + 6) % 7 >= 5 ? " class='ui-datepicker-week-end'" : "") + ">" +
-						"<span title='" + dayNames[day] + "'>" + dayNamesMin[day] + "</span></th>";
+				thead = ( showWeek ? "<th class='ui-datepicker-week-col'>" + this._get( inst, "weekHeader" ) + "</th>" : "" );
+				for ( dow = 0; dow < 7; dow++ ) { // days of the week
+					day = ( dow + firstDay ) % 7;
+					thead += "<th scope='col'" + ( ( dow + firstDay + 6 ) % 7 >= 5 ? " class='ui-datepicker-week-end'" : "" ) + ">" +
+						"<span title='" + dayNames[ day ] + "'>" + dayNamesMin[ day ] + "</span></th>";
 				}
 				calender += thead + "</tr></thead><tbody>";
-				daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
-				if (drawYear === inst.selectedYear && drawMonth === inst.selectedMonth) {
-					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
+				daysInMonth = this._getDaysInMonth( drawYear, drawMonth );
+				if ( drawYear === inst.selectedYear && drawMonth === inst.selectedMonth ) {
+					inst.selectedDay = Math.min( inst.selectedDay, daysInMonth );
 				}
-				leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
-				curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
-				numRows = (isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows); //If multiple months, use the higher number of rows (see #7043)
+				leadDays = ( this._getFirstDayOfMonth( drawYear, drawMonth ) - firstDay + 7 ) % 7;
+				curRows = Math.ceil( ( leadDays + daysInMonth ) / 7 ); // calculate the number of rows to generate
+				numRows = ( isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows ); //If multiple months, use the higher number of rows (see #7043)
 				this.maxRows = numRows;
-				printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
-				for (dRow = 0; dRow < numRows; dRow++) { // create date picker rows
+				printDate = this._daylightSavingAdjust( new Date( drawYear, drawMonth, 1 - leadDays ) );
+				for ( dRow = 0; dRow < numRows; dRow++ ) { // create date picker rows
 					calender += "<tr>";
-					tbody = (!showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
-						this._get(inst, "calculateWeek")(printDate) + "</td>");
-					for (dow = 0; dow < 7; dow++) { // create date picker days
-						daySettings = (beforeShowDay ?
-							beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, ""]);
-						otherMonth = (printDate.getMonth() !== drawMonth);
-						unselectable = (otherMonth && !selectOtherMonths) || !daySettings[0] ||
-							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
+					tbody = ( !showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
+						this._get( inst, "calculateWeek" )( printDate ) + "</td>" );
+					for ( dow = 0; dow < 7; dow++ ) { // create date picker days
+						daySettings = ( beforeShowDay ?
+							beforeShowDay.apply( ( inst.input ? inst.input[ 0 ] : null ), [ printDate ] ) : [ true, "" ] );
+						otherMonth = ( printDate.getMonth() !== drawMonth );
+						unselectable = ( otherMonth && !selectOtherMonths ) || !daySettings[ 0 ] ||
+							( minDate && printDate < minDate ) || ( maxDate && printDate > maxDate );
 						tbody += "<td class='" +
-							((dow + firstDay + 6) % 7 >= 5 ? " ui-datepicker-week-end" : "") + // highlight weekends
-							(otherMonth ? " ui-datepicker-other-month" : "") + // highlight days from other months
-							((printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent) || // user pressed key
-							(defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime()) ?
+							( ( dow + firstDay + 6 ) % 7 >= 5 ? " ui-datepicker-week-end" : "" ) + // highlight weekends
+							( otherMonth ? " ui-datepicker-other-month" : "" ) + // highlight days from other months
+							( ( printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent ) || // user pressed key
+							( defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime() ) ?
+
 							// or defaultDate is current printedDate and defaultDate is selectedDate
-							" " + this._dayOverClass : "") + // highlight selected day
-							(unselectable ? " " + this._unselectableClass + " ui-state-disabled": "") +  // highlight unselectable days
-							(otherMonth && !showOtherMonths ? "" : " " + daySettings[1] + // highlight custom dates
-							(printDate.getTime() === currentDate.getTime() ? " " + this._currentClass : "") + // highlight selected day
-							(printDate.getTime() === today.getTime() ? " ui-datepicker-today" : "")) + "'" + // highlight today (if different)
-							((!otherMonth || showOtherMonths) && daySettings[2] ? " title='" + daySettings[2].replace(/'/g, "&#39;") + "'" : "") + // cell title
-							(unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'") + ">" + // actions
-							(otherMonth && !showOtherMonths ? "&#xa0;" : // display for other months
-							(unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +
-							(printDate.getTime() === today.getTime() ? " ui-state-highlight" : "") +
-							(printDate.getTime() === currentDate.getTime() ? " ui-state-active" : "") + // highlight selected day
-							(otherMonth ? " ui-priority-secondary" : "") + // distinguish dates from other months
-							"' href='#'>" + printDate.getDate() + "</a>")) + "</td>"; // display selectable date
-						printDate.setDate(printDate.getDate() + 1);
-						printDate = this._daylightSavingAdjust(printDate);
+							" " + this._dayOverClass : "" ) + // highlight selected day
+							( unselectable ? " " + this._unselectableClass + " ui-state-disabled" : "" ) +  // highlight unselectable days
+							( otherMonth && !showOtherMonths ? "" : " " + daySettings[ 1 ] + // highlight custom dates
+							( printDate.getTime() === currentDate.getTime() ? " " + this._currentClass : "" ) + // highlight selected day
+							( printDate.getTime() === today.getTime() ? " ui-datepicker-today" : "" ) ) + "'" + // highlight today (if different)
+							( ( !otherMonth || showOtherMonths ) && daySettings[ 2 ] ? " title='" + daySettings[ 2 ].replace( /'/g, "&#39;" ) + "'" : "" ) + // cell title
+							( unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'" ) + ">" + // actions
+							( otherMonth && !showOtherMonths ? "&#xa0;" : // display for other months
+							( unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +
+							( printDate.getTime() === today.getTime() ? " ui-state-highlight" : "" ) +
+							( printDate.getTime() === currentDate.getTime() ? " ui-state-active" : "" ) + // highlight selected day
+							( otherMonth ? " ui-priority-secondary" : "" ) + // distinguish dates from other months
+							"' href='#'>" + printDate.getDate() + "</a>" ) ) + "</td>"; // display selectable date
+						printDate.setDate( printDate.getDate() + 1 );
+						printDate = this._daylightSavingAdjust( printDate );
 					}
 					calender += tbody + "</tr>";
 				}
 				drawMonth++;
-				if (drawMonth > 11) {
+				if ( drawMonth > 11 ) {
 					drawMonth = 0;
 					drawYear++;
 				}
-				calender += "</tbody></table>" + (isMultiMonth ? "</div>" +
-							((numMonths[0] > 0 && col === numMonths[1]-1) ? "<div class='ui-datepicker-row-break'></div>" : "") : "");
+				calender += "</tbody></table>" + ( isMultiMonth ? "</div>" +
+							( ( numMonths[ 0 ] > 0 && col === numMonths[ 1 ] - 1 ) ? "<div class='ui-datepicker-row-break'></div>" : "" ) : "" );
 				group += calender;
 			}
 			html += group;
@@ -1814,60 +1838,61 @@ $.extend(Datepicker.prototype, {
 	},
 
 	/* Generate the month and year header. */
-	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
-			secondary, monthNames, monthNamesShort) {
+	_generateMonthYearHeader: function( inst, drawMonth, drawYear, minDate, maxDate,
+			secondary, monthNames, monthNamesShort ) {
 
 		var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear,
-			changeMonth = this._get(inst, "changeMonth"),
-			changeYear = this._get(inst, "changeYear"),
-			showMonthAfterYear = this._get(inst, "showMonthAfterYear"),
+			changeMonth = this._get( inst, "changeMonth" ),
+			changeYear = this._get( inst, "changeYear" ),
+			showMonthAfterYear = this._get( inst, "showMonthAfterYear" ),
 			html = "<div class='ui-datepicker-title'>",
 			monthHtml = "";
 
 		// Month selection
-		if (secondary || !changeMonth) {
-			monthHtml += "<span class='ui-datepicker-month'>" + monthNames[drawMonth] + "</span>";
+		if ( secondary || !changeMonth ) {
+			monthHtml += "<span class='ui-datepicker-month'>" + monthNames[ drawMonth ] + "</span>";
 		} else {
-			inMinYear = (minDate && minDate.getFullYear() === drawYear);
-			inMaxYear = (maxDate && maxDate.getFullYear() === drawYear);
+			inMinYear = ( minDate && minDate.getFullYear() === drawYear );
+			inMaxYear = ( maxDate && maxDate.getFullYear() === drawYear );
 			monthHtml += "<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>";
-			for ( month = 0; month < 12; month++) {
-				if ((!inMinYear || month >= minDate.getMonth()) && (!inMaxYear || month <= maxDate.getMonth())) {
+			for ( month = 0; month < 12; month++ ) {
+				if ( ( !inMinYear || month >= minDate.getMonth() ) && ( !inMaxYear || month <= maxDate.getMonth() ) ) {
 					monthHtml += "<option value='" + month + "'" +
-						(month === drawMonth ? " selected='selected'" : "") +
-						">" + monthNamesShort[month] + "</option>";
+						( month === drawMonth ? " selected='selected'" : "" ) +
+						">" + monthNamesShort[ month ] + "</option>";
 				}
 			}
 			monthHtml += "</select>";
 		}
 
-		if (!showMonthAfterYear) {
-			html += monthHtml + (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "");
+		if ( !showMonthAfterYear ) {
+			html += monthHtml + ( secondary || !( changeMonth && changeYear ) ? "&#xa0;" : "" );
 		}
 
 		// Year selection
 		if ( !inst.yearshtml ) {
 			inst.yearshtml = "";
-			if (secondary || !changeYear) {
+			if ( secondary || !changeYear ) {
 				html += "<span class='ui-datepicker-year'>" + drawYear + "</span>";
 			} else {
+
 				// determine range of years to display
-				years = this._get(inst, "yearRange").split(":");
+				years = this._get( inst, "yearRange" ).split( ":" );
 				thisYear = new Date().getFullYear();
-				determineYear = function(value) {
-					var year = (value.match(/c[+\-].*/) ? drawYear + parseInt(value.substring(1), 10) :
-						(value.match(/[+\-].*/) ? thisYear + parseInt(value, 10) :
-						parseInt(value, 10)));
-					return (isNaN(year) ? thisYear : year);
+				determineYear = function( value ) {
+					var year = ( value.match( /c[+\-].*/ ) ? drawYear + parseInt( value.substring( 1 ), 10 ) :
+						( value.match( /[+\-].*/ ) ? thisYear + parseInt( value, 10 ) :
+						parseInt( value, 10 ) ) );
+					return ( isNaN( year ) ? thisYear : year );
 				};
-				year = determineYear(years[0]);
-				endYear = Math.max(year, determineYear(years[1] || ""));
-				year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
-				endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
+				year = determineYear( years[ 0 ] );
+				endYear = Math.max( year, determineYear( years[ 1 ] || "" ) );
+				year = ( minDate ? Math.max( year, minDate.getFullYear() ) : year );
+				endYear = ( maxDate ? Math.min( endYear, maxDate.getFullYear() ) : endYear );
 				inst.yearshtml += "<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";
-				for (; year <= endYear; year++) {
+				for ( ; year <= endYear; year++ ) {
 					inst.yearshtml += "<option value='" + year + "'" +
-						(year === drawYear ? " selected='selected'" : "") +
+						( year === drawYear ? " selected='selected'" : "" ) +
 						">" + year + "</option>";
 				}
 				inst.yearshtml += "</select>";
@@ -1877,168 +1902,168 @@ $.extend(Datepicker.prototype, {
 			}
 		}
 
-		html += this._get(inst, "yearSuffix");
-		if (showMonthAfterYear) {
-			html += (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "") + monthHtml;
+		html += this._get( inst, "yearSuffix" );
+		if ( showMonthAfterYear ) {
+			html += ( secondary || !( changeMonth && changeYear ) ? "&#xa0;" : "" ) + monthHtml;
 		}
 		html += "</div>"; // Close datepicker_header
 		return html;
 	},
 
 	/* Adjust one of the date sub-fields. */
-	_adjustInstDate: function(inst, offset, period) {
-		var year = inst.drawYear + (period === "Y" ? offset : 0),
-			month = inst.drawMonth + (period === "M" ? offset : 0),
-			day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) + (period === "D" ? offset : 0),
-			date = this._restrictMinMax(inst, this._daylightSavingAdjust(new Date(year, month, day)));
+	_adjustInstDate: function( inst, offset, period ) {
+		var year = inst.drawYear + ( period === "Y" ? offset : 0 ),
+			month = inst.drawMonth + ( period === "M" ? offset : 0 ),
+			day = Math.min( inst.selectedDay, this._getDaysInMonth( year, month ) ) + ( period === "D" ? offset : 0 ),
+			date = this._restrictMinMax( inst, this._daylightSavingAdjust( new Date( year, month, day ) ) );
 
 		inst.selectedDay = date.getDate();
 		inst.drawMonth = inst.selectedMonth = date.getMonth();
 		inst.drawYear = inst.selectedYear = date.getFullYear();
-		if (period === "M" || period === "Y") {
-			this._notifyChange(inst);
+		if ( period === "M" || period === "Y" ) {
+			this._notifyChange( inst );
 		}
 	},
 
 	/* Ensure a date is within any min/max bounds. */
-	_restrictMinMax: function(inst, date) {
-		var minDate = this._getMinMaxDate(inst, "min"),
-			maxDate = this._getMinMaxDate(inst, "max"),
-			newDate = (minDate && date < minDate ? minDate : date);
-		return (maxDate && newDate > maxDate ? maxDate : newDate);
+	_restrictMinMax: function( inst, date ) {
+		var minDate = this._getMinMaxDate( inst, "min" ),
+			maxDate = this._getMinMaxDate( inst, "max" ),
+			newDate = ( minDate && date < minDate ? minDate : date );
+		return ( maxDate && newDate > maxDate ? maxDate : newDate );
 	},
 
 	/* Notify change of month/year. */
-	_notifyChange: function(inst) {
-		var onChange = this._get(inst, "onChangeMonthYear");
-		if (onChange) {
-			onChange.apply((inst.input ? inst.input[0] : null),
-				[inst.selectedYear, inst.selectedMonth + 1, inst]);
+	_notifyChange: function( inst ) {
+		var onChange = this._get( inst, "onChangeMonthYear" );
+		if ( onChange ) {
+			onChange.apply( ( inst.input ? inst.input[ 0 ] : null ),
+				[ inst.selectedYear, inst.selectedMonth + 1, inst ] );
 		}
 	},
 
 	/* Determine the number of months to show. */
-	_getNumberOfMonths: function(inst) {
-		var numMonths = this._get(inst, "numberOfMonths");
-		return (numMonths == null ? [1, 1] : (typeof numMonths === "number" ? [1, numMonths] : numMonths));
+	_getNumberOfMonths: function( inst ) {
+		var numMonths = this._get( inst, "numberOfMonths" );
+		return ( numMonths == null ? [ 1, 1 ] : ( typeof numMonths === "number" ? [ 1, numMonths ] : numMonths ) );
 	},
 
 	/* Determine the current maximum date - ensure no time components are set. */
-	_getMinMaxDate: function(inst, minMax) {
-		return this._determineDate(inst, this._get(inst, minMax + "Date"), null);
+	_getMinMaxDate: function( inst, minMax ) {
+		return this._determineDate( inst, this._get( inst, minMax + "Date" ), null );
 	},
 
 	/* Find the number of days in a given month. */
-	_getDaysInMonth: function(year, month) {
-		return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
+	_getDaysInMonth: function( year, month ) {
+		return 32 - this._daylightSavingAdjust( new Date( year, month, 32 ) ).getDate();
 	},
 
 	/* Find the day of the week of the first of a month. */
-	_getFirstDayOfMonth: function(year, month) {
-		return new Date(year, month, 1).getDay();
+	_getFirstDayOfMonth: function( year, month ) {
+		return new Date( year, month, 1 ).getDay();
 	},
 
 	/* Determines if we should allow a "next/prev" month display change. */
-	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
-		var numMonths = this._getNumberOfMonths(inst),
-			date = this._daylightSavingAdjust(new Date(curYear,
-			curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1));
+	_canAdjustMonth: function( inst, offset, curYear, curMonth ) {
+		var numMonths = this._getNumberOfMonths( inst ),
+			date = this._daylightSavingAdjust( new Date( curYear,
+			curMonth + ( offset < 0 ? offset : numMonths[ 0 ] * numMonths[ 1 ] ), 1 ) );
 
-		if (offset < 0) {
-			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
+		if ( offset < 0 ) {
+			date.setDate( this._getDaysInMonth( date.getFullYear(), date.getMonth() ) );
 		}
-		return this._isInRange(inst, date);
+		return this._isInRange( inst, date );
 	},
 
 	/* Is the given date in the accepted range? */
-	_isInRange: function(inst, date) {
+	_isInRange: function( inst, date ) {
 		var yearSplit, currentYear,
-			minDate = this._getMinMaxDate(inst, "min"),
-			maxDate = this._getMinMaxDate(inst, "max"),
+			minDate = this._getMinMaxDate( inst, "min" ),
+			maxDate = this._getMinMaxDate( inst, "max" ),
 			minYear = null,
 			maxYear = null,
-			years = this._get(inst, "yearRange");
-			if (years){
-				yearSplit = years.split(":");
+			years = this._get( inst, "yearRange" );
+			if ( years ) {
+				yearSplit = years.split( ":" );
 				currentYear = new Date().getFullYear();
-				minYear = parseInt(yearSplit[0], 10);
-				maxYear = parseInt(yearSplit[1], 10);
-				if ( yearSplit[0].match(/[+\-].*/) ) {
+				minYear = parseInt( yearSplit[ 0 ], 10 );
+				maxYear = parseInt( yearSplit[ 1 ], 10 );
+				if ( yearSplit[ 0 ].match( /[+\-].*/ ) ) {
 					minYear += currentYear;
 				}
-				if ( yearSplit[1].match(/[+\-].*/) ) {
+				if ( yearSplit[ 1 ].match( /[+\-].*/ ) ) {
 					maxYear += currentYear;
 				}
 			}
 
-		return ((!minDate || date.getTime() >= minDate.getTime()) &&
-			(!maxDate || date.getTime() <= maxDate.getTime()) &&
-			(!minYear || date.getFullYear() >= minYear) &&
-			(!maxYear || date.getFullYear() <= maxYear));
+		return ( ( !minDate || date.getTime() >= minDate.getTime() ) &&
+			( !maxDate || date.getTime() <= maxDate.getTime() ) &&
+			( !minYear || date.getFullYear() >= minYear ) &&
+			( !maxYear || date.getFullYear() <= maxYear ) );
 	},
 
 	/* Provide the configuration settings for formatting/parsing. */
-	_getFormatConfig: function(inst) {
-		var shortYearCutoff = this._get(inst, "shortYearCutoff");
-		shortYearCutoff = (typeof shortYearCutoff !== "string" ? shortYearCutoff :
-			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
-		return {shortYearCutoff: shortYearCutoff,
-			dayNamesShort: this._get(inst, "dayNamesShort"), dayNames: this._get(inst, "dayNames"),
-			monthNamesShort: this._get(inst, "monthNamesShort"), monthNames: this._get(inst, "monthNames")};
+	_getFormatConfig: function( inst ) {
+		var shortYearCutoff = this._get( inst, "shortYearCutoff" );
+		shortYearCutoff = ( typeof shortYearCutoff !== "string" ? shortYearCutoff :
+			new Date().getFullYear() % 100 + parseInt( shortYearCutoff, 10 ) );
+		return { shortYearCutoff: shortYearCutoff,
+			dayNamesShort: this._get( inst, "dayNamesShort" ), dayNames: this._get( inst, "dayNames" ),
+			monthNamesShort: this._get( inst, "monthNamesShort" ), monthNames: this._get( inst, "monthNames" ) };
 	},
 
 	/* Format the given date for display. */
-	_formatDate: function(inst, day, month, year) {
-		if (!day) {
+	_formatDate: function( inst, day, month, year ) {
+		if ( !day ) {
 			inst.currentDay = inst.selectedDay;
 			inst.currentMonth = inst.selectedMonth;
 			inst.currentYear = inst.selectedYear;
 		}
-		var date = (day ? (typeof day === "object" ? day :
-			this._daylightSavingAdjust(new Date(year, month, day))) :
-			this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
-		return this.formatDate(this._get(inst, "dateFormat"), date, this._getFormatConfig(inst));
+		var date = ( day ? ( typeof day === "object" ? day :
+			this._daylightSavingAdjust( new Date( year, month, day ) ) ) :
+			this._daylightSavingAdjust( new Date( inst.currentYear, inst.currentMonth, inst.currentDay ) ) );
+		return this.formatDate( this._get( inst, "dateFormat" ), date, this._getFormatConfig( inst ) );
 	}
-});
+} );
 
 /*
  * Bind hover events for datepicker elements.
  * Done via delegate so the binding only occurs once in the lifetime of the parent div.
  * Global datepicker_instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
  */
-function datepicker_bindHover(dpDiv) {
+function datepicker_bindHover( dpDiv ) {
 	var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";
 	return dpDiv.on( "mouseout", selector, function() {
-			$(this).removeClass("ui-state-hover");
-			if (this.className.indexOf("ui-datepicker-prev") !== -1) {
-				$(this).removeClass("ui-datepicker-prev-hover");
+			$( this ).removeClass( "ui-state-hover" );
+			if ( this.className.indexOf( "ui-datepicker-prev" ) !== -1 ) {
+				$( this ).removeClass( "ui-datepicker-prev-hover" );
 			}
-			if (this.className.indexOf("ui-datepicker-next") !== -1) {
-				$(this).removeClass("ui-datepicker-next-hover");
+			if ( this.className.indexOf( "ui-datepicker-next" ) !== -1 ) {
+				$( this ).removeClass( "ui-datepicker-next-hover" );
 			}
-		})
+		} )
 		.on( "mouseover", selector, datepicker_handleMouseover );
 }
 
 function datepicker_handleMouseover() {
-	if (!$.datepicker._isDisabledDatepicker( datepicker_instActive.inline? datepicker_instActive.dpDiv.parent()[0] : datepicker_instActive.input[0])) {
-		$(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
-		$(this).addClass("ui-state-hover");
-		if (this.className.indexOf("ui-datepicker-prev") !== -1) {
-			$(this).addClass("ui-datepicker-prev-hover");
+	if ( !$.datepicker._isDisabledDatepicker( datepicker_instActive.inline ? datepicker_instActive.dpDiv.parent()[ 0 ] : datepicker_instActive.input[ 0 ] ) ) {
+		$( this ).parents( ".ui-datepicker-calendar" ).find( "a" ).removeClass( "ui-state-hover" );
+		$( this ).addClass( "ui-state-hover" );
+		if ( this.className.indexOf( "ui-datepicker-prev" ) !== -1 ) {
+			$( this ).addClass( "ui-datepicker-prev-hover" );
 		}
-		if (this.className.indexOf("ui-datepicker-next") !== -1) {
-			$(this).addClass("ui-datepicker-next-hover");
+		if ( this.className.indexOf( "ui-datepicker-next" ) !== -1 ) {
+			$( this ).addClass( "ui-datepicker-next-hover" );
 		}
 	}
 }
 
 /* jQuery extend now ignores nulls! */
-function datepicker_extendRemove(target, props) {
-	$.extend(target, props);
-	for (var name in props) {
-		if (props[name] == null) {
-			target[name] = props[name];
+function datepicker_extendRemove( target, props ) {
+	$.extend( target, props );
+	for ( var name in props ) {
+		if ( props[ name ] == null ) {
+			target[ name ] = props[ name ];
 		}
 	}
 	return target;
@@ -2048,7 +2073,7 @@ function datepicker_extendRemove(target, props) {
    @param  options  string - a command, optionally followed by additional parameters or
 					Object - settings for attaching new datepicker functionality
    @return  jQuery object */
-$.fn.datepicker = function(options){
+$.fn.datepicker = function( options ) {
 
 	/* Verify an empty collection wasn't passed - Fixes #6976 */
 	if ( !this.length ) {
@@ -2056,31 +2081,31 @@ $.fn.datepicker = function(options){
 	}
 
 	/* Initialise the date picker. */
-	if (!$.datepicker.initialized) {
-		$(document).on( "mousedown", $.datepicker._checkExternalClick );
+	if ( !$.datepicker.initialized ) {
+		$( document ).on( "mousedown", $.datepicker._checkExternalClick );
 		$.datepicker.initialized = true;
 	}
 
 	/* Append datepicker main container to body if not exist. */
-	if ($("#"+$.datepicker._mainDivId).length === 0) {
-		$("body").append($.datepicker.dpDiv);
+	if ( $( "#" + $.datepicker._mainDivId ).length === 0 ) {
+		$( "body" ).append( $.datepicker.dpDiv );
 	}
 
-	var otherArgs = Array.prototype.slice.call(arguments, 1);
-	if (typeof options === "string" && (options === "isDisabled" || options === "getDate" || options === "widget")) {
-		return $.datepicker["_" + options + "Datepicker"].
-			apply($.datepicker, [this[0]].concat(otherArgs));
+	var otherArgs = Array.prototype.slice.call( arguments, 1 );
+	if ( typeof options === "string" && ( options === "isDisabled" || options === "getDate" || options === "widget" ) ) {
+		return $.datepicker[ "_" + options + "Datepicker" ].
+			apply( $.datepicker, [ this[ 0 ] ].concat( otherArgs ) );
 	}
-	if (options === "option" && arguments.length === 2 && typeof arguments[1] === "string") {
-		return $.datepicker["_" + options + "Datepicker"].
-			apply($.datepicker, [this[0]].concat(otherArgs));
+	if ( options === "option" && arguments.length === 2 && typeof arguments[ 1 ] === "string" ) {
+		return $.datepicker[ "_" + options + "Datepicker" ].
+			apply( $.datepicker, [ this[ 0 ] ].concat( otherArgs ) );
 	}
-	return this.each(function() {
+	return this.each( function() {
 		typeof options === "string" ?
-			$.datepicker["_" + options + "Datepicker"].
-				apply($.datepicker, [this].concat(otherArgs)) :
-			$.datepicker._attachDatepicker(this, options);
-	});
+			$.datepicker[ "_" + options + "Datepicker" ].
+				apply( $.datepicker, [ this ].concat( otherArgs ) ) :
+			$.datepicker._attachDatepicker( this, options );
+	} );
 };
 
 $.datepicker = new Datepicker(); // singleton instance
@@ -2090,4 +2115,4 @@ $.datepicker.version = "@VERSION";
 
 return $.datepicker;
 
-}));
+} ) );

From 4cbb6b24955efdce9250d9072d6a218ae2272e1b Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 09:00:22 -0400
Subject: [PATCH 16/27] Button: Style updates

Ref #14246
---
 ui/widgets/button.js | 86 +++++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/ui/widgets/button.js b/ui/widgets/button.js
index f5509b520ba..94fc753317a 100644
--- a/ui/widgets/button.js
+++ b/ui/widgets/button.js
@@ -16,11 +16,11 @@
 //>>css.structure: ../themes/base/button.css
 //>>css.theme: ../themes/base/theme.css
 
-(function( factory ) {
+( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([
+		define( [
 			"jquery",
 			"../data",
 			"../keycode",
@@ -33,14 +33,14 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}(function( $ ) {
+}( function( $ ) {
 
 var lastActive,
 	baseClasses = "ui-button ui-widget ui-state-default ui-corner-all",
 	typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",
 	formResetHandler = function() {
 		var form = $( this );
-		setTimeout(function() {
+		setTimeout( function() {
 			form.find( ":ui-button" ).button( "refresh" );
 		}, 1 );
 	},
@@ -54,9 +54,9 @@ var lastActive,
 				radios = $( form ).find( "[name='" + name + "'][type=radio]" );
 			} else {
 				radios = $( "[name='" + name + "'][type=radio]", radio.ownerDocument )
-					.filter(function() {
+					.filter( function() {
 						return !this.form;
-					});
+					} );
 			}
 		}
 		return radios;
@@ -94,7 +94,7 @@ $.widget( "ui.button", {
 			activeClass = !toggleButton ? "ui-state-active" : "";
 
 		if ( options.label === null ) {
-			options.label = (this.type === "input" ? this.buttonElement.val() : this.buttonElement.html());
+			options.label = ( this.type === "input" ? this.buttonElement.val() : this.buttonElement.html() );
 		}
 
 		this._hoverable( this.buttonElement );
@@ -109,35 +109,35 @@ $.widget( "ui.button", {
 				if ( this === lastActive ) {
 					$( this ).addClass( "ui-state-active" );
 				}
-			})
+			} )
 			.on( "mouseleave" + this.eventNamespace, function() {
 				if ( options.disabled ) {
 					return;
 				}
 				$( this ).removeClass( activeClass );
-			})
+			} )
 			.on( "click" + this.eventNamespace, function( event ) {
 				if ( options.disabled ) {
 					event.preventDefault();
 					event.stopImmediatePropagation();
 				}
-			});
+			} );
 
 		// Can't use _focusable() because the element that receives focus
 		// and the element that gets the ui-state-focus class are different
-		this._on({
+		this._on( {
 			focus: function() {
 				this.buttonElement.addClass( "ui-state-focus" );
 			},
 			blur: function() {
 				this.buttonElement.removeClass( "ui-state-focus" );
 			}
-		});
+		} );
 
 		if ( toggleButton ) {
 			this.element.on( "change" + this.eventNamespace, function() {
 				that.refresh();
-			});
+			} );
 		}
 
 		if ( this.type === "checkbox" ) {
@@ -145,7 +145,7 @@ $.widget( "ui.button", {
 				if ( options.disabled ) {
 					return false;
 				}
-			});
+			} );
 		} else if ( this.type === "radio" ) {
 			this.buttonElement.on( "click" + this.eventNamespace, function() {
 				if ( options.disabled ) {
@@ -157,12 +157,12 @@ $.widget( "ui.button", {
 				var radio = that.element[ 0 ];
 				radioGroup( radio )
 					.not( radio )
-					.map(function() {
+					.map( function() {
 						return $( this ).button( "widget" )[ 0 ];
-					})
+					} )
 					.removeClass( "ui-state-active" )
 					.attr( "aria-pressed", "false" );
-			});
+			} );
 		} else {
 			this.buttonElement
 				.on( "mousedown" + this.eventNamespace, function() {
@@ -173,35 +173,37 @@ $.widget( "ui.button", {
 					lastActive = this;
 					that.document.one( "mouseup", function() {
 						lastActive = null;
-					});
-				})
+					} );
+				} )
 				.on( "mouseup" + this.eventNamespace, function() {
 					if ( options.disabled ) {
 						return false;
 					}
 					$( this ).removeClass( "ui-state-active" );
-				})
-				.on( "keydown" + this.eventNamespace, function(event) {
+				} )
+				.on( "keydown" + this.eventNamespace, function( event ) {
 					if ( options.disabled ) {
 						return false;
 					}
 					if ( event.keyCode === $.ui.keyCode.SPACE || event.keyCode === $.ui.keyCode.ENTER ) {
 						$( this ).addClass( "ui-state-active" );
 					}
-				})
+				} )
+
 				// see #8559, we bind to blur here in case the button element loses
 				// focus between keydown and keyup, it would be left in an "active" state
 				.on( "keyup" + this.eventNamespace + " blur" + this.eventNamespace, function() {
 					$( this ).removeClass( "ui-state-active" );
-				});
+				} );
 
-			if ( this.buttonElement.is("a") ) {
-				this.buttonElement.on( "keyup", function(event) {
+			if ( this.buttonElement.is( "a" ) ) {
+				this.buttonElement.on( "keyup", function( event ) {
 					if ( event.keyCode === $.ui.keyCode.SPACE ) {
+
 						// TODO pass through original event correctly (just as 2nd argument doesn't work)
 						$( this ).trigger( "click" );
 					}
-				});
+				} );
 			}
 		}
 
@@ -212,21 +214,22 @@ $.widget( "ui.button", {
 	_determineButtonType: function() {
 		var ancestor, labelSelector, checked;
 
-		if ( this.element.is("[type=checkbox]") ) {
+		if ( this.element.is( "[type=checkbox]" ) ) {
 			this.type = "checkbox";
-		} else if ( this.element.is("[type=radio]") ) {
+		} else if ( this.element.is( "[type=radio]" ) ) {
 			this.type = "radio";
-		} else if ( this.element.is("input") ) {
+		} else if ( this.element.is( "input" ) ) {
 			this.type = "input";
 		} else {
 			this.type = "button";
 		}
 
 		if ( this.type === "checkbox" || this.type === "radio" ) {
+
 			// we don't search against the document in case the element
 			// is disconnected from the DOM
 			ancestor = this.element.parents().last();
-			labelSelector = "label[for='" + this.element.attr("id") + "']";
+			labelSelector = "label[for='" + this.element.attr( "id" ) + "']";
 			this.buttonElement = ancestor.find( labelSelector );
 			if ( !this.buttonElement.length ) {
 				ancestor = ancestor.length ? ancestor.siblings() : this.element.siblings();
@@ -257,7 +260,7 @@ $.widget( "ui.button", {
 		this.buttonElement
 			.removeClass( baseClasses + " ui-state-active " + typeClasses )
 			.removeAttr( "role aria-pressed" )
-			.html( this.buttonElement.find(".ui-button-text").html() );
+			.html( this.buttonElement.find( ".ui-button-text" ).html() );
 
 		if ( !this.hasTitle ) {
 			this.buttonElement.removeAttr( "title" );
@@ -282,6 +285,7 @@ $.widget( "ui.button", {
 	},
 
 	refresh: function() {
+
 		//See #8237 & #8828
 		var isDisabled = this.element.is( "input, button" ) ? this.element.is( ":disabled" ) : this.element.hasClass( "ui-button-disabled" );
 
@@ -289,7 +293,7 @@ $.widget( "ui.button", {
 			this._setOption( "disabled", isDisabled );
 		}
 		if ( this.type === "radio" ) {
-			radioGroup( this.element[0] ).each(function() {
+			radioGroup( this.element[ 0 ] ).each( function() {
 				if ( $( this ).is( ":checked" ) ) {
 					$( this ).button( "widget" )
 						.addClass( "ui-state-active" )
@@ -299,7 +303,7 @@ $.widget( "ui.button", {
 						.removeClass( "ui-state-active" )
 						.attr( "aria-pressed", "false" );
 				}
-			});
+			} );
 		} else if ( this.type === "checkbox" ) {
 			if ( this.element.is( ":checked" ) ) {
 				this.buttonElement
@@ -321,7 +325,7 @@ $.widget( "ui.button", {
 			return;
 		}
 		var buttonElement = this.buttonElement.removeClass( typeClasses ),
-			buttonText = $( "<span></span>", this.document[0] )
+			buttonText = $( "<span></span>", this.document[ 0 ] )
 				.addClass( "ui-button-text" )
 				.html( this.options.label )
 				.appendTo( buttonElement.empty() )
@@ -355,7 +359,7 @@ $.widget( "ui.button", {
 		}
 		buttonElement.addClass( buttonClasses.join( " " ) );
 	}
-});
+} );
 
 $.widget( "ui.buttonset", {
 	version: "@VERSION",
@@ -391,9 +395,9 @@ $.widget( "ui.buttonset", {
 		existingButtons.button( "refresh" );
 
 		this.buttons = allButtons
-			.map(function() {
+			.map( function() {
 				return $( this ).button( "widget" )[ 0 ];
-			})
+			} )
 				.removeClass( "ui-corner-all ui-corner-left ui-corner-right" )
 				.filter( ":first" )
 					.addClass( rtl ? "ui-corner-right" : "ui-corner-left" )
@@ -407,15 +411,15 @@ $.widget( "ui.buttonset", {
 	_destroy: function() {
 		this.element.removeClass( "ui-buttonset" );
 		this.buttons
-			.map(function() {
+			.map( function() {
 				return $( this ).button( "widget" )[ 0 ];
-			})
+			} )
 				.removeClass( "ui-corner-left ui-corner-right" )
 			.end()
 			.button( "destroy" );
 	}
-});
+} );
 
 return $.ui.button;
 
-}));
+} ) );

From d9b38e51a1e3b9f68692db2a38c623acd943da27 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 09:04:59 -0400
Subject: [PATCH 17/27] Autocomplete: Style updates

Ref #14246
---
 ui/widgets/autocomplete.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ui/widgets/autocomplete.js b/ui/widgets/autocomplete.js
index 954258e23ca..1ebd6ed7ad1 100644
--- a/ui/widgets/autocomplete.js
+++ b/ui/widgets/autocomplete.js
@@ -65,6 +65,7 @@ $.widget( "ui.autocomplete", {
 	pending: 0,
 
 	_create: function() {
+
 		// Some browsers only repeat keydown events, not keypress events,
 		// so we use the suppressKeyPress flag to determine if we've already
 		// handled the keydown event. #7269
@@ -120,8 +121,10 @@ $.widget( "ui.autocomplete", {
 					this._keyEvent( "next", event );
 					break;
 				case keyCode.ENTER:
+
 					// when menu is open and has focus
 					if ( this.menu.active ) {
+
 						// #6055 - Opera still allows the keypress to occur
 						// which causes forms to submit
 						suppressKeyPress = true;
@@ -140,6 +143,7 @@ $.widget( "ui.autocomplete", {
 							this._value( this.term );
 						}
 						this.close( event );
+
 						// Different browsers have different default behavior for escape
 						// Single press can mean undo or clear
 						// Double press in IE means clear the whole form
@@ -148,6 +152,7 @@ $.widget( "ui.autocomplete", {
 					break;
 				default:
 					suppressKeyPressRepeat = true;
+
 					// search timeout should be triggered before the input value is changed
 					this._searchTimeout( event );
 					break;
@@ -210,6 +215,7 @@ $.widget( "ui.autocomplete", {
 		this.menu = $( "<ul>" )
 			.appendTo( this._appendTo() )
 			.menu( {
+
 				// disable ARIA support, the live region takes care of that
 				role: null
 			} )
@@ -219,6 +225,7 @@ $.widget( "ui.autocomplete", {
 		this._addClass( this.menu.element, "ui-autocomplete", "ui-front" );
 		this._on( this.menu.element, {
 			mousedown: function( event ) {
+
 				// prevent moving focus out of the text field
 				event.preventDefault();
 
@@ -259,6 +266,7 @@ $.widget( "ui.autocomplete", {
 			},
 			menufocus: function( event, ui ) {
 				var label, item;
+
 				// support: Firefox
 				// Prevent accidental activation of menu items in Firefox (#7024 #9118)
 				if ( this.isNewMenu ) {
@@ -276,6 +284,7 @@ $.widget( "ui.autocomplete", {
 
 				item = ui.item.data( "ui-autocomplete-item" );
 				if ( false !== this._trigger( "focus", event, { item: item } ) ) {
+
 					// use value to match what will end up in the input, if it was a key event
 					if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) {
 						this._value( item.value );
@@ -297,6 +306,7 @@ $.widget( "ui.autocomplete", {
 				if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
 					this.element.trigger( "focus" );
 					this.previous = previous;
+
 					// #6109 - IE triggers two focus events and the second
 					// is asynchronous, so we need to reset the previous
 					// term synchronously and asynchronously :-(
@@ -309,6 +319,7 @@ $.widget( "ui.autocomplete", {
 				if ( false !== this._trigger( "select", event, { item: item } ) ) {
 					this._value( item.value );
 				}
+
 				// reset the term after the select event
 				// this allows custom select handling to work properly
 				this.term = this._value();
@@ -473,6 +484,7 @@ $.widget( "ui.autocomplete", {
 			this._suggest( content );
 			this._trigger( "open" );
 		} else {
+
 			// use ._close() instead of .close() so we don't cancel future searches
 			this._close();
 		}
@@ -499,6 +511,7 @@ $.widget( "ui.autocomplete", {
 	},
 
 	_normalize: function( items ) {
+
 		// assume all items have the right format when the first item is complete
 		if ( items.length && items[ 0 ].label && items[ 0 ].value ) {
 			return items;
@@ -538,6 +551,7 @@ $.widget( "ui.autocomplete", {
 	_resizeMenu: function() {
 		var ul = this.menu.element;
 		ul.outerWidth( Math.max(
+
 			// Firefox wraps long text (possibly a rounding bug)
 			// so we add 1px to avoid the wrapping (#7513)
 			ul.width( "" ).outerWidth() + 1,

From c23444afae67ab8f055b4ebb747221db2b5cd524 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 09:32:13 -0400
Subject: [PATCH 18/27] Widget: Style updates

Ref #14246
---
 tests/unit/widget/animation.js | 144 +++++------
 tests/unit/widget/classes.js   |  16 +-
 tests/unit/widget/core.js      | 421 +++++++++++++++++----------------
 tests/unit/widget/extend.js    |  22 +-
 ui/widgets/accordion.js        |  12 +
 5 files changed, 317 insertions(+), 298 deletions(-)

diff --git a/tests/unit/widget/animation.js b/tests/unit/widget/animation.js
index 4e9d93ccfde..9f9f9271074 100644
--- a/tests/unit/widget/animation.js
+++ b/tests/unit/widget/animation.js
@@ -3,7 +3,7 @@ define( [
 	"ui/widget"
 ], function( $ ) {
 
-module( "widget animation", (function() {
+module( "widget animation", ( function() {
 	var show = $.fn.show,
 		fadeIn = $.fn.fadeIn,
 		slideDown = $.fn.slideDown;
@@ -16,7 +16,7 @@ module( "widget animation", (function() {
 				show: function( fn ) {
 					this._show( this.element, this.options.show, fn );
 				}
-			});
+			} );
 			$.effects = { effect: { testEffect: $.noop } };
 		},
 		teardown: function() {
@@ -27,7 +27,7 @@ module( "widget animation", (function() {
 			$.fn.slideDown = slideDown;
 		}
 	};
-}()));
+}() ) );
 
 asyncTest( "show: null", function() {
 	expect( 4 );
@@ -41,223 +41,223 @@ asyncTest( "show: null", function() {
 
 	element
 		.delay( 50 )
-		.queue(function( next ) {
+		.queue( function( next ) {
 			ok( !hasRun, "queue before show" );
 			next();
-		})
+		} )
 		.testWidget( "show", function() {
 			hasRun = true;
-		})
-		.queue(function( next ) {
+		} )
+		.queue( function( next ) {
 			ok( hasRun, "queue after show" );
 			start();
 			next();
-		});
-});
+		} );
+} );
 
 asyncTest( "show: true", function() {
 	expect( 4 );
 
-	var element = $( "#widget" ).testWidget({
+	var element = $( "#widget" ).testWidget( {
 			show: true
-		}),
+		} ),
 		hasRun = false;
 	$.fn.fadeIn = function( duration, easing, complete ) {
-		return this.queue(function( next ) {
+		return this.queue( function( next ) {
 			strictEqual( duration, undefined, "duration" );
 			strictEqual( easing, undefined, "easing" );
 			complete();
 			next();
-		});
+		} );
 	};
 
 	element
 		.delay( 50 )
-		.queue(function( next ) {
+		.queue( function( next ) {
 			ok( !hasRun, "queue before show" );
 			next();
-		})
+		} )
 		.testWidget( "show", function() {
 			hasRun = true;
-		})
-		.queue(function( next ) {
+		} )
+		.queue( function( next ) {
 			ok( hasRun, "queue after show" );
 			start();
 			next();
-		});
-});
+		} );
+} );
 
 asyncTest( "show: number", function() {
 	expect( 4 );
 
-	var element = $( "#widget" ).testWidget({
+	var element = $( "#widget" ).testWidget( {
 		show: 123
-	}),
+	} ),
 	hasRun = false;
 	$.fn.fadeIn = function( duration, easing, complete ) {
-		return this.queue(function( next ) {
+		return this.queue( function( next ) {
 			strictEqual( duration, 123, "duration" );
 			strictEqual( easing, undefined, "easing" );
 			complete();
 			next();
-		});
+		} );
 	};
 
 	element
 		.delay( 50 )
-		.queue(function( next ) {
+		.queue( function( next ) {
 			ok( !hasRun, "queue before show" );
 			next();
-		})
+		} )
 		.testWidget( "show", function() {
 			hasRun = true;
-		})
-		.queue(function( next ) {
+		} )
+		.queue( function( next ) {
 			ok( hasRun, "queue after show" );
 			start();
 			next();
-		});
-});
+		} );
+} );
 
 asyncTest( "show: core animation", function() {
 	expect( 4 );
 
-	var element = $( "#widget" ).testWidget({
+	var element = $( "#widget" ).testWidget( {
 		show: "slideDown"
-	}),
+	} ),
 	hasRun = false;
 	$.fn.slideDown = function( duration, easing, complete ) {
-		return this.queue(function( next ) {
+		return this.queue( function( next ) {
 			strictEqual( duration, undefined, "duration" );
 			strictEqual( easing, undefined, "easing" );
 			complete();
 			next();
-		});
+		} );
 	};
 
 	element
 		.delay( 50 )
-		.queue(function( next ) {
+		.queue( function( next ) {
 			ok( !hasRun, "queue before show" );
 			next();
-		})
+		} )
 		.testWidget( "show", function() {
 			hasRun = true;
-		})
-		.queue(function( next ) {
+		} )
+		.queue( function( next ) {
 			ok( hasRun, "queue after show" );
 			start();
 			next();
-		});
-});
+		} );
+} );
 
 asyncTest( "show: effect", function() {
 	expect( 5 );
 
-	var element = $( "#widget" ).testWidget({
+	var element = $( "#widget" ).testWidget( {
 		show: "testEffect"
-	}),
+	} ),
 	hasRun = false;
 	$.fn.show = function( options ) {
-		return this.queue(function( next ) {
+		return this.queue( function( next ) {
 			equal( options.effect, "testEffect", "effect" );
-			ok( !("duration" in options), "duration" );
-			ok( !("easing" in options), "easing" );
+			ok( !( "duration" in options ), "duration" );
+			ok( !( "easing" in options ), "easing" );
 			options.complete();
 			next();
-		});
+		} );
 	};
 
 	element
 		.delay( 50 )
-		.queue(function( next ) {
+		.queue( function( next ) {
 			ok( !hasRun, "queue before show" );
 			next();
-		})
+		} )
 		.testWidget( "show", function() {
 			hasRun = true;
-		})
-		.queue(function( next ) {
+		} )
+		.queue( function( next ) {
 			ok( hasRun, "queue after show" );
 			start();
 			next();
-		});
-});
+		} );
+} );
 
 asyncTest( "show: object(core animation)", function() {
 	expect( 4 );
 
-	var element = $( "#widget" ).testWidget({
+	var element = $( "#widget" ).testWidget( {
 		show: {
 			effect: "slideDown",
 			duration: 123,
 			easing: "testEasing"
 		}
-	}),
+	} ),
 	hasRun = false;
 	$.fn.slideDown = function( duration, easing, complete ) {
-		return this.queue(function( next ) {
+		return this.queue( function( next ) {
 			equal( duration, 123, "duration" );
 			equal( easing, "testEasing", "easing" );
 			complete();
 			next();
-		});
+		} );
 	};
 
 	element
 		.delay( 50 )
-		.queue(function( next ) {
+		.queue( function( next ) {
 			ok( !hasRun, "queue before show" );
 			next();
-		})
+		} )
 		.testWidget( "show", function() {
 			hasRun = true;
-		})
-		.queue(function( next ) {
+		} )
+		.queue( function( next ) {
 			ok( hasRun, "queue after show" );
 			start();
 			next();
-		});
-});
+		} );
+} );
 
 asyncTest( "show: object(effect)", function() {
 	expect( 3 );
 
-	var element = $( "#widget" ).testWidget({
+	var element = $( "#widget" ).testWidget( {
 		show: {
 			effect: "testEffect",
 			duration: 123,
 			easing: "testEasing"
 		}
-	}),
+	} ),
 	hasRun = false;
 	$.fn.show = function( options ) {
-		return this.queue(function( next ) {
+		return this.queue( function( next ) {
 			deepEqual( options, {
 				effect: "testEffect",
 				duration: 123,
 				easing: "testEasing",
 				complete: options.complete
-			});
+			} );
 			options.complete();
 			next();
-		});
+		} );
 	};
 
 	element
 		.delay( 50 )
-		.queue(function( next ) {
+		.queue( function( next ) {
 			ok( !hasRun, "queue before show" );
 			next();
-		})
+		} )
 		.testWidget( "show", function() {
 			hasRun = true;
-		})
-		.queue(function( next ) {
+		} )
+		.queue( function( next ) {
 			ok( hasRun, "queue after show" );
 			start();
 			next();
-		});
-});
+		} );
+} );
 
 } );
diff --git a/tests/unit/widget/classes.js b/tests/unit/widget/classes.js
index 1b4a4512030..b837aac34fb 100644
--- a/tests/unit/widget/classes.js
+++ b/tests/unit/widget/classes.js
@@ -48,13 +48,13 @@ module( "widget factory classes", {
 				this.span.remove();
 				this.element.unwrap();
 			}
-		});
+		} );
 	},
 	teardown: function() {
 		delete $.ui.classesWidget;
 		delete $.fn.classesWidget;
 	}
-});
+} );
 
 function elementHasClasses( widget, method, assert ) {
 	var toggle = method === "toggle" ? ( ", true" ) : "";
@@ -96,13 +96,13 @@ test( ".option() - classes setter", function( assert ) {
 
 	elementHasClasses( testWidget.element, "add", assert );
 
-	testWidget.option({
+	testWidget.option( {
 		classes: {
 			"ui-classes-span": "custom-theme-span",
 			"ui-classes-widget": "ui-theme-widget custom-theme-widget",
 			"ui-classes-element": "ui-theme-element-2"
 		}
-	});
+	} );
 
 	assert.lacksClasses( testWidget.element, "ui-theme-element",
 		"Removing a class from the value removes the class" );
@@ -116,15 +116,15 @@ test( ".option() - classes setter", function( assert ) {
 		"Adding a class to an empty value works as expected" );
 	assert.hasClasses( testWidget.wrapper, "ui-classes-widget custom-theme-widget",
 		"Appending a class to the current value works as expected" );
-});
+} );
 
 test( ".destroy() - class removal", function( assert ) {
 	expect( 1 );
 
 	assert.domEqual( "#widget", function() {
 		$( "#widget" ).classesWidget().classesWidget( "destroy" );
-	});
-});
+	} );
+} );
 
 test( "._add/_remove/_toggleClass()", function( assert ) {
 	expect( 24 );
@@ -141,6 +141,6 @@ test( "._add/_remove/_toggleClass()", function( assert ) {
 
 	widget.classesWidget( "removeClasses" );
 	elementLacksClasses( widget, "remove", assert );
-});
+} );
 
 } );
diff --git a/tests/unit/widget/core.js b/tests/unit/widget/core.js
index 235bc6bb682..f6202410806 100644
--- a/tests/unit/widget/core.js
+++ b/tests/unit/widget/core.js
@@ -11,7 +11,7 @@ module( "widget factory", {
 			delete $.fn.testWidget;
 		}
 	}
-});
+} );
 
 common.testJshint( "widget" );
 
@@ -36,7 +36,7 @@ test( "widget creation", function() {
 	$.ui.testWidget.prototype.creationTest();
 	equal( $.ui.testWidget.prototype.option, $.Widget.prototype.option,
 		"option method copied over from base widget" );
-});
+} );
 
 test( "element normalization", function() {
 	expect( 11 );
@@ -44,6 +44,7 @@ test( "element normalization", function() {
 	$.widget( "ui.testWidget", {} );
 
 	$.ui.testWidget.prototype._create = function() {
+
 		// workaround for core ticket #8381
 		this.element.appendTo( "#qunit-fixture" );
 		ok( this.element.is( "div" ), "generated div" );
@@ -82,20 +83,21 @@ test( "element normalization", function() {
 
 	$.ui.testWidget.prototype.defaultElement = null;
 	$.ui.testWidget.prototype._create = function() {
+
 		// using strictEqual throws an error (Maximum call stack size exceeded)
 		ok( this.element[ 0 ] === this, "instance as element" );
 	};
 	$.ui.testWidget();
-});
+} );
 
 test( "custom selector expression", function() {
 	expect( 1 );
 	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" );
-});
+} );
 
 test( "jQuery usage", function() {
 	expect( 14 );
@@ -127,19 +129,19 @@ test( "jQuery usage", function() {
 		jQueryObject: function() {
 			return $( "body" );
 		}
-	});
+	} );
 
 	shouldCreate = true;
 	elem = $( "<div>" )
 		.on( "testwidgetcreate", function() {
 			ok( shouldCreate, "create event triggered on instantiation" );
-		})
+		} )
 		.testWidget();
 	shouldCreate = false;
 
 	instance = elem.testWidget( "instance" );
 	equal( typeof instance, "object", "instance stored in .data(pluginName)" );
-	equal( instance.element[0], elem[0], "element stored on widget" );
+	equal( instance.element[ 0 ], elem[ 0 ], "element stored on widget" );
 	ret = elem.testWidget( "methodWithParams", "value1", "value2" );
 	equal( ret, elem, "jQuery object returned from method call" );
 
@@ -154,7 +156,7 @@ test( "jQuery usage", function() {
 
 	elem.testWidget( "destroy" );
 	equal( elem.testWidget( "instance" ), null );
-});
+} );
 
 test( "direct usage", function() {
 	expect( 9 );
@@ -181,7 +183,7 @@ test( "direct usage", function() {
 				return this.getterSetterVal;
 			}
 		}
-	});
+	} );
 
 	elem = $( "<div>" )[ 0 ];
 
@@ -200,14 +202,14 @@ test( "direct usage", function() {
 	equal( ret, 5, "getter/setter can act as getter" );
 	instance.getterSetterMethod( 30 );
 	equal( instance.getterSetterVal, 30, "getter/setter can act as setter" );
-});
+} );
 
 test( "error handling", function() {
 	expect( 3 );
 	var error = $.error;
 	$.widget( "ui.testWidget", {
-		_privateMethod: function () {}
-	});
+		_privateMethod: function() {}
+	} );
 	$.error = function( msg ) {
 		equal( msg, "cannot call methods on testWidget prior to initialization; " +
 			"attempted to call method 'missing'", "method call before init" );
@@ -218,13 +220,13 @@ test( "error handling", function() {
 			"invalid method call on widget instance" );
 	};
 	$( "<div>" ).testWidget().testWidget( "missing" );
-	$.error = function ( msg ) {
+	$.error = function( msg ) {
 		equal( msg, "no such method '_privateMethod' for testWidget widget instance",
 			"invalid method call on widget instance" );
 	};
 	$( "<div>" ).testWidget().testWidget( "_privateMethod" );
 	$.error = error;
-});
+} );
 
 test( "merge multiple option arguments", function() {
 	expect( 1 );
@@ -241,10 +243,10 @@ test( "merge multiple option arguments", function() {
 					option4a: "valuea",
 					option4b: "valueb"
 				}
-			});
+			} );
 		}
-	});
-	$( "<div>" ).testWidget({
+	} );
+	$( "<div>" ).testWidget( {
 		option1: "valuex",
 		option2: "valuex",
 		option3: "value3",
@@ -261,8 +263,8 @@ test( "merge multiple option arguments", function() {
 		option4: {
 			option4a: "valuea"
 		}
-	});
-});
+	} );
+} );
 
 test( "._getCreateOptions()", function() {
 	expect( 3 );
@@ -292,11 +294,11 @@ test( "._getCreateOptions()", function() {
 				option1: "override1",
 				option2: "value2",
 				option3: "value3"
-			});
+			} );
 		}
-	});
-	$( "<div>" ).testWidget({ option2: "value2" });
-});
+	} );
+	$( "<div>" ).testWidget( { option2: "value2" } );
+} );
 
 test( "._getCreateEventData()", function() {
 	expect( 1 );
@@ -305,13 +307,13 @@ test( "._getCreateEventData()", function() {
 		_getCreateEventData: function() {
 			return data;
 		}
-	});
-	$( "<div>" ).testWidget({
+	} );
+	$( "<div>" ).testWidget( {
 		create: function( event, ui ) {
 			strictEqual( ui, data, "event data" );
 		}
-	});
-});
+	} );
+} );
 
 test( "re-init", function() {
 	expect( 3 );
@@ -328,10 +330,10 @@ test( "re-init", function() {
 		_setOption: function( key ) {
 			actions.push( "option" + key );
 		}
-	});
+	} );
 
 	actions = [];
-	div.testWidget({ foo: "bar" });
+	div.testWidget( { foo: "bar" } );
 	deepEqual( actions, [ "create", "init" ], "correct methods called on init" );
 
 	actions = [];
@@ -339,9 +341,9 @@ test( "re-init", function() {
 	deepEqual( actions, [ "init" ], "correct methods call on re-init" );
 
 	actions = [];
-	div.testWidget({ foo: "bar" });
+	div.testWidget( { foo: "bar" } );
 	deepEqual( actions, [ "optionfoo", "init" ], "correct methods called on re-init with options" );
-});
+} );
 
 test( "redeclare", function() {
 	expect( 2 );
@@ -351,10 +353,11 @@ test( "redeclare", function() {
 
 	$.widget( "ui.testWidget", {} );
 	equal( $.ui.testWidget.prototype.widgetEventPrefix, "testWidget" );
-});
+} );
 
 test( "inheritance", function() {
 	expect( 6 );
+
 	// #5830 - Widget: Using inheritance overwrites the base classes options
 	$.widget( "ui.testWidgetBase", {
 		options: {
@@ -364,7 +367,7 @@ test( "inheritance", function() {
 			},
 			arr: [ "testing" ]
 		}
-	});
+	} );
 
 	$.widget( "ui.testWidgetExtension", $.ui.testWidgetBase, {
 		options: {
@@ -373,31 +376,31 @@ test( "inheritance", function() {
 			},
 			arr: [ "alpha", "beta" ]
 		}
-	});
+	} );
 
 	equal( $.ui.testWidgetBase.prototype.widgetEventPrefix, "testWidgetBase",
 		"base class event prefix" );
 	deepEqual( $.ui.testWidgetBase.prototype.options.obj, {
 		key1: "foo",
 		key2: "bar"
-	}, "base class option object not overridden");
+	}, "base class option object not overridden" );
 	deepEqual( $.ui.testWidgetBase.prototype.options.arr, [ "testing" ],
-		"base class option array not overridden");
+		"base class option array not overridden" );
 
 	equal( $.ui.testWidgetExtension.prototype.widgetEventPrefix, "testWidgetExtension",
 		"extension class event prefix" );
 	deepEqual( $.ui.testWidgetExtension.prototype.options.obj, {
 		key1: "baz",
 		key2: "bar"
-	}, "extension class option object extends base");
+	}, "extension class option object extends base" );
 	deepEqual( $.ui.testWidgetExtension.prototype.options.arr, [ "alpha", "beta" ],
-		"extension class option array overwrites base");
+		"extension class option array overwrites base" );
 
 	delete $.ui.testWidgetBase;
 	delete $.fn.testWidgetBase;
 	delete $.ui.testWidgetExtension;
 	delete $.fn.testWidgetExtension;
-});
+} );
 
 test( "._super()", function() {
 	expect( 9 );
@@ -409,25 +412,25 @@ test( "._super()", function() {
 			deepEqual( b, 20, "second parameter passed to testWidget" );
 			return a + b;
 		}
-	});
+	} );
 
 	$.widget( "ui.testWidget2", $.ui.testWidget, {
 		method: function( a, b ) {
 			deepEqual( this, instance, "this is correct in testWidget2" );
 			deepEqual( a, 5, "parameter passed to testWidget2" );
 			deepEqual( b, 10, "parameter passed to testWidget2" );
-			return this._super( a, b*2 );
+			return this._super( a, b * 2 );
 		}
-	});
+	} );
 
 	$.widget( "ui.testWidget3", $.ui.testWidget2, {
 		method: function( a ) {
 			deepEqual( this, instance, "this is correct in testWidget3" );
 			deepEqual( a, 5, "parameter passed to testWidget3" );
-			var ret = this._super( a, a*2 );
+			var ret = this._super( a, a * 2 );
 			deepEqual( ret, 25, "super returned value" );
 		}
-	});
+	} );
 
 	instance = $( "<div>" ).testWidget3().testWidget3( "instance" );
 	instance.method( 5 );
@@ -435,7 +438,7 @@ test( "._super()", function() {
 	delete $.fn.testWidget3;
 	delete $.ui.testWidget2;
 	delete $.fn.testWidget2;
-});
+} );
 
 test( "._superApply()", function() {
 	expect( 10 );
@@ -447,7 +450,7 @@ test( "._superApply()", function() {
 			deepEqual( b, 10, "second parameter passed to testWidget" );
 			return a + b;
 		}
-	});
+	} );
 
 	$.widget( "ui.testWidget2", $.ui.testWidget, {
 		method: function( a, b ) {
@@ -456,7 +459,7 @@ test( "._superApply()", function() {
 			deepEqual( b, 10, "second parameter passed to testWidget2" );
 			return this._superApply( arguments );
 		}
-	});
+	} );
 
 	$.widget( "ui.testWidget3", $.ui.testWidget2, {
 		method: function( a, b ) {
@@ -466,7 +469,7 @@ test( "._superApply()", function() {
 			var ret = this._superApply( arguments );
 			deepEqual( ret, 15, "super returned value" );
 		}
-	});
+	} );
 
 	instance = $( "<div>" ).testWidget3().testWidget3( "instance" );
 	instance.method( 5, 10 );
@@ -474,7 +477,7 @@ test( "._superApply()", function() {
 	delete $.fn.testWidget3;
 	delete $.ui.testWidget2;
 	delete $.fn.testWidget2;
-});
+} );
 
 test( "mixins", function() {
 	expect( 5 );
@@ -513,7 +516,7 @@ test( "mixins", function() {
 
 	$.ui.testWidget.prototype.bar = function() {};
 	strictEqual( mixin2.bar, existingBar, "Changes to a prototype don't change the mixin" );
-});
+} );
 
 test( "mixins with inheritance", function() {
 	expect( 4 );
@@ -553,25 +556,25 @@ test( "mixins with inheritance", function() {
 
 	delete $.ui.testWidget2;
 	delete $.fn.testWidget2;
-});
+} );
 
 test( ".option() - getter", function() {
 	expect( 6 );
 	$.widget( "ui.testWidget", {
 		_create: function() {}
-	});
+	} );
 
 	var options,
-		div = $( "<div>" ).testWidget({
+		div = $( "<div>" ).testWidget( {
 			foo: "bar",
 			baz: 5,
 			qux: [ "quux", "quuux" ]
-		});
+		} );
 
 	deepEqual( div.testWidget( "option", "x" ), null, "non-existent option" );
-	deepEqual( div.testWidget( "option", "foo"), "bar", "single option - string" );
-	deepEqual( div.testWidget( "option", "baz"), 5, "single option - number" );
-	deepEqual( div.testWidget( "option", "qux"), [ "quux", "quuux" ],
+	deepEqual( div.testWidget( "option", "foo" ), "bar", "single option - string" );
+	deepEqual( div.testWidget( "option", "baz" ), 5, "single option - number" );
+	deepEqual( div.testWidget( "option", "qux" ), [ "quux", "quuux" ],
 		"single option - array" );
 
 	options = div.testWidget( "option" );
@@ -584,28 +587,28 @@ test( ".option() - getter", function() {
 		qux: [ "quux", "quuux" ]
 	}, "full options hash returned" );
 	options.foo = "notbar";
-	deepEqual( div.testWidget( "option", "foo"), "bar",
+	deepEqual( div.testWidget( "option", "foo" ), "bar",
 		"modifying returned options hash does not modify plugin instance" );
-});
+} );
 
 test( ".option() - deep option getter", function() {
 	expect( 5 );
 	$.widget( "ui.testWidget", {} );
-	var div = $( "<div>" ).testWidget({
+	var div = $( "<div>" ).testWidget( {
 		foo: {
 			bar: "baz",
 			qux: {
 				quux: "xyzzy"
 			}
 		}
-	});
+	} );
 	equal( div.testWidget( "option", "foo.bar" ), "baz", "one level deep - string" );
 	deepEqual( div.testWidget( "option", "foo.qux" ), { quux: "xyzzy" },
 		"one level deep - object" );
 	equal( div.testWidget( "option", "foo.qux.quux" ), "xyzzy", "two levels deep - string" );
 	equal( div.testWidget( "option", "x.y" ), null, "top level non-existent" );
 	equal( div.testWidget( "option", "foo.x.y" ), null, "one level deep - non-existent" );
-});
+} );
 
 test( ".option() - delegate to ._setOptions()", function() {
 	expect( 2 );
@@ -616,21 +619,21 @@ test( ".option() - delegate to ._setOptions()", function() {
 		_setOptions: function( options ) {
 			calls.push( options );
 		}
-	});
+	} );
 	div = $( "<div>" ).testWidget();
 
 	calls = [];
 	div.testWidget( "option", "foo", "bar" );
-	deepEqual( calls, [{ foo: "bar" }], "_setOptions called for single option" );
+	deepEqual( calls, [ { foo: "bar" } ], "_setOptions called for single option" );
 
 	calls = [];
 	div.testWidget( "option", {
 		bar: "qux",
 		quux: "quuux"
-	});
-	deepEqual( calls, [{ bar: "qux", quux: "quuux" }],
+	} );
+	deepEqual( calls, [ { bar: "qux", quux: "quuux" } ],
 		"_setOptions called with multiple options" );
-});
+} );
 
 test( ".option() - delegate to ._setOption()", function() {
 	expect( 3 );
@@ -639,34 +642,34 @@ test( ".option() - delegate to ._setOption()", function() {
 	$.widget( "ui.testWidget", {
 		_create: function() {},
 		_setOption: function( key, val ) {
-			calls.push({
+			calls.push( {
 				key: key,
 				val: val
-			});
+			} );
 		}
-	});
+	} );
 	div = $( "<div>" ).testWidget();
 
 	calls = [];
 	div.testWidget( "option", "foo", "bar" );
-	deepEqual( calls, [{ key: "foo", val: "bar" }],
+	deepEqual( calls, [ { key: "foo", val: "bar" } ],
 		"_setOption called for single option" );
 
 	calls = [];
 	div.testWidget( "option", "foo", undefined );
-	deepEqual( calls, [{ key: "foo", val: undefined }],
+	deepEqual( calls, [ { key: "foo", val: undefined } ],
 		"_setOption called for single option where value is undefined" );
 
 	calls = [];
 	div.testWidget( "option", {
 		bar: "qux",
 		quux: "quuux"
-	});
+	} );
 	deepEqual( calls, [
 		{ key: "bar", val: "qux" },
 		{ key: "quux", val: "quuux" }
 	], "_setOption called with multiple options" );
-});
+} );
 
 test( ".option() - deep option setter", function() {
 	expect( 9 );
@@ -697,7 +700,7 @@ test( ".option() - deep option setter", function() {
 		{ bar: "baz", qux: { quux: "quuux", newOpt: "newVal" } },
 		"add property" );
 	div.testWidget( "option", "foo.qux.newOpt", "newVal" );
-});
+} );
 
 test( ".enable()", function() {
 	expect( 2 );
@@ -707,9 +710,9 @@ test( ".enable()", function() {
 			deepEqual( key, "disabled", "_setOption called with disabled option" );
 			deepEqual( val, false, "disabled set to false" );
 		}
-	});
+	} );
 	$( "<div>" ).testWidget().testWidget( "enable" );
-});
+} );
 
 test( ".disable()", function() {
 	expect( 2 );
@@ -719,19 +722,19 @@ test( ".disable()", function() {
 			deepEqual( key, "disabled", "_setOption called with disabled option" );
 			deepEqual( val, true, "disabled set to true" );
 		}
-	});
+	} );
 	$( "<div>" ).testWidget().testWidget( "disable" );
-});
+} );
 
 test( ".widget() - base", function() {
 	expect( 2 );
 	var constructor = $.widget( "ui.testWidget", {
 			_create: function() {}
-		}),
+		} ),
 		div = $( "<div>" ).testWidget();
-	deepEqual( div[0], div.testWidget( "widget" )[0]);
+	deepEqual( div[ 0 ], div.testWidget( "widget" )[ 0 ] );
 	deepEqual( constructor, $.ui.testWidget, "$.widget returns the constructor" );
-});
+} );
 
 test( ".widget() - overriden", function() {
 	expect( 1 );
@@ -741,9 +744,9 @@ test( ".widget() - overriden", function() {
 		widget: function() {
 			return wrapper;
 		}
-	});
-	deepEqual( wrapper[0], $( "<div>" ).testWidget().testWidget( "widget" )[0] );
-});
+	} );
+	deepEqual( wrapper[ 0 ], $( "<div>" ).testWidget().testWidget( "widget" )[ 0 ] );
+} );
 
 test( ".instance()", function() {
 	expect( 2 );
@@ -751,13 +754,13 @@ test( ".instance()", function() {
 
 	$.widget( "ui.testWidget", {
 		_create: function() {}
-	});
+	} );
 
 	div = $( "<div>" );
 	equal( div.testWidget( "instance" ), undefined );
 	div.testWidget();
 	equal( div.testWidget( "instance" ), div.testWidget( "instance" ) );
-});
+} );
 
 test( "._on() to element (default)", function() {
 	expect( 12 );
@@ -765,22 +768,22 @@ test( "._on() to element (default)", function() {
 	$.widget( "ui.testWidget", {
 		_create: function() {
 			that = this;
-			this._on({
+			this._on( {
 				keyup: this.keyup,
 				keydown: "keydown"
-			});
+			} );
 		},
 		keyup: function( event ) {
 			equal( that, this );
-			equal( that.element[0], event.currentTarget );
+			equal( that.element[ 0 ], event.currentTarget );
 			equal( "keyup", event.type );
 		},
 		keydown: function( event ) {
 			equal( that, this );
-			equal( that.element[0], event.currentTarget );
+			equal( that.element[ 0 ], event.currentTarget );
 			equal( "keydown", event.type );
 		}
-	});
+	} );
 	widget = $( "<div></div>" )
 		.testWidget()
 		.trigger( "keyup" )
@@ -797,7 +800,7 @@ test( "._on() to element (default)", function() {
 		.testWidget( "destroy" )
 		.trigger( "keyup" )
 		.trigger( "keydown" );
-});
+} );
 
 test( "._on() to element with suppressDisabledCheck", function() {
 	expect( 18 );
@@ -808,19 +811,19 @@ test( "._on() to element with suppressDisabledCheck", function() {
 			this._on( true, {
 				keyup: this.keyup,
 				keydown: "keydown"
-			});
+			} );
 		},
 		keyup: function( event ) {
 			equal( that, this );
-			equal( that.element[0], event.currentTarget );
+			equal( that.element[ 0 ], event.currentTarget );
 			equal( "keyup", event.type );
 		},
 		keydown: function( event ) {
 			equal( that, this );
-			equal( that.element[0], event.currentTarget );
+			equal( that.element[ 0 ], event.currentTarget );
 			equal( "keydown", event.type );
 		}
-	});
+	} );
 	widget = $( "<div></div>" )
 		.testWidget()
 		.trigger( "keyup" )
@@ -837,7 +840,7 @@ test( "._on() to element with suppressDisabledCheck", function() {
 		.testWidget( "destroy" )
 		.trigger( "keyup" )
 		.trigger( "keydown" );
-});
+} );
 
 test( "._on() to descendent", function() {
 	expect( 12 );
@@ -848,19 +851,20 @@ test( "._on() to descendent", function() {
 			this._on( this.element.find( "strong" ), {
 				keyup: this.keyup,
 				keydown: "keydown"
-			});
+			} );
 		},
 		keyup: function( event ) {
 			equal( that, this );
-			equal( that.element.find( "strong" )[0], event.currentTarget );
+			equal( that.element.find( "strong" )[ 0 ], event.currentTarget );
 			equal( "keyup", event.type );
 		},
-		keydown: function(event) {
+		keydown: function( event ) {
 			equal( that, this );
-			equal( that.element.find( "strong" )[0], event.currentTarget );
+			equal( that.element.find( "strong" )[ 0 ], event.currentTarget );
 			equal( "keydown", event.type );
 		}
-	});
+	} );
+
 	// trigger events on both widget and descendent to ensure that only descendent receives them
 	widget = $( "<div><p><strong>hello</strong> world</p></div>" )
 		.testWidget()
@@ -894,7 +898,7 @@ test( "._on() to descendent", function() {
 	descendant
 		.trigger( "keyup" )
 		.trigger( "keydown" );
-});
+} );
 
 test( "_on() with delegate", function() {
 	expect( 8 );
@@ -904,7 +908,7 @@ test( "_on() with delegate", function() {
 			this.element = {
 				on: function( event, handler ) {
 					equal( event, "click.testWidget" + uuid );
-					ok( $.isFunction(handler) );
+					ok( $.isFunction( handler ) );
 				},
 				trigger: $.noop
 			};
@@ -913,30 +917,30 @@ test( "_on() with delegate", function() {
 					on: function( event, selector, handler ) {
 						equal( selector, "a" );
 						equal( event, "click.testWidget" + uuid );
-						ok( $.isFunction(handler) );
+						ok( $.isFunction( handler ) );
 					}
 				};
 			};
-			this._on({
+			this._on( {
 				"click": "handler",
 				"click a": "handler"
-			});
+			} );
 			this.widget = function() {
 				return {
 					on: function( event, selector, handler ) {
 						equal( selector, "form fieldset > input" );
 						equal( event, "change.testWidget" + uuid );
-						ok( $.isFunction(handler) );
+						ok( $.isFunction( handler ) );
 					}
 				};
 			};
-			this._on({
+			this._on( {
 				"change form fieldset > input": "handler"
-			});
+			} );
 		}
-	});
+	} );
 	$.ui.testWidget();
-});
+} );
 
 test( "_on() with delegate to descendent", function() {
 	expect( 4 );
@@ -947,7 +951,7 @@ test( "_on() with delegate to descendent", function() {
 			this._on( this.target, {
 				"keyup": "handlerDirect",
 				"keyup strong": "handlerDelegated"
-			});
+			} );
 			this.child.trigger( "keyup" );
 		},
 		handlerDirect: function( event ) {
@@ -958,9 +962,9 @@ test( "_on() with delegate to descendent", function() {
 			deepEqual( event.currentTarget, this.child[ 0 ] );
 			deepEqual( event.target, this.child[ 0 ] );
 		}
-	});
+	} );
 	$.ui.testWidget();
-});
+} );
 
 test( "_on() to common element", function() {
 	expect( 4 );
@@ -971,7 +975,7 @@ test( "_on() to common element", function() {
 				"with:colons": "_colonHandler",
 				"with-dashes": "_dashHandler",
 				"with-dashes:and-colons": "_commbinedHandler"
-			});
+			} );
 		},
 		_handler: function() {
 			ok( true, "handler triggered" );
@@ -985,7 +989,7 @@ test( "_on() to common element", function() {
 		_commbinedHandler: function() {
 			ok( true, "combined handler triggered" );
 		}
-	});
+	} );
 	var widget = $( "#widget" ).testWidget().testWidget( "instance" );
 	$( "#widget-wrapper" ).testWidget();
 	widget.destroy();
@@ -993,7 +997,7 @@ test( "_on() to common element", function() {
 	$( document ).trigger( "with:colons" );
 	$( document ).trigger( "with-dashes" );
 	$( document ).trigger( "with-dashes:and-colons" );
-});
+} );
 
 test( "_off() - single event", function() {
 	expect( 3 );
@@ -1004,17 +1008,17 @@ test( "_off() - single event", function() {
 		widget = element.testWidget().testWidget( "instance" );
 	widget._on( element, { foo: function() {
 		ok( shouldTriggerWidget, "foo called from _on" );
-	}});
+	} } );
 	element.on( "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 );
@@ -1030,10 +1034,10 @@ test( "_off() - multiple events", function() {
 		bar: function() {
 			ok( shouldTriggerWidget, "bar called from _on" );
 		}
-	});
+	} );
 	element.on( "foo bar", function( event ) {
 		ok( shouldTriggerOther, event.type + " called from bind" );
-	});
+	} );
 	shouldTriggerWidget = true;
 	shouldTriggerOther = true;
 	element.trigger( "foo" );
@@ -1042,7 +1046,7 @@ test( "_off() - multiple events", function() {
 	widget._off( element, "foo bar" );
 	element.trigger( "foo" );
 	element.trigger( "bar" );
-});
+} );
 
 test( "_off() - all events", function() {
 	expect( 6 );
@@ -1058,10 +1062,10 @@ test( "_off() - all events", function() {
 		bar: function() {
 			ok( shouldTriggerWidget, "bar called from _on" );
 		}
-	});
+	} );
 	element.on( "foo bar", function( event ) {
 		ok( shouldTriggerOther, event.type + " called from bind" );
-	});
+	} );
 	shouldTriggerWidget = true;
 	shouldTriggerOther = true;
 	element.trigger( "foo" );
@@ -1070,7 +1074,7 @@ test( "_off() - all events", function() {
 	widget._off( element );
 	element.trigger( "foo" );
 	element.trigger( "bar" );
-});
+} );
 
 test( "._hoverable()", function( assert ) {
 	expect( 10 );
@@ -1078,7 +1082,7 @@ test( "._hoverable()", function( assert ) {
 		_create: function() {
 			this._hoverable( this.element.children() );
 		}
-	});
+	} );
 
 	var div = $( "#widget" ).testWidget().children();
 	assert.lacksClasses( div, "ui-state-hover", "not hovered on init" );
@@ -1102,7 +1106,7 @@ test( "._hoverable()", function( assert ) {
 	assert.lacksClasses( div, "ui-state-hover", "not hovered after destroy" );
 	div.trigger( "mouseenter" );
 	assert.lacksClasses( div, "ui-state-hover", "event handler removed on destroy" );
-});
+} );
 
 test( "._focusable()", function( assert ) {
 	expect( 10 );
@@ -1110,7 +1114,7 @@ test( "._focusable()", function( assert ) {
 		_create: function() {
 			this._focusable( this.element.children() );
 		}
-	});
+	} );
 
 	var div = $( "#widget" ).testWidget().children();
 	assert.lacksClasses( div, "ui-state-focus", "not focused on init" );
@@ -1134,7 +1138,7 @@ test( "._focusable()", function( assert ) {
 	assert.lacksClasses( div, "ui-state-focus", "not focused after destroy" );
 	div.trigger( "focusin" );
 	assert.lacksClasses( div, "ui-state-focus", "event handler removed on destroy" );
-});
+} );
 
 test( "._trigger() - no event, no ui", function() {
 	expect( 7 );
@@ -1142,20 +1146,20 @@ test( "._trigger() - no event, no ui", function() {
 
 	$.widget( "ui.testWidget", {
 		_create: function() {}
-	});
+	} );
 
-	$( "#widget" ).testWidget({
+	$( "#widget" ).testWidget( {
 		foo: function( event, ui ) {
 			deepEqual( event.type, "testwidgetfoo", "correct event type in callback" );
 			deepEqual( ui, {}, "empty ui hash passed" );
 			handlers.push( "callback" );
 		}
-	});
+	} );
 	$( document ).add( "#widget-wrapper" ).add( "#widget" )
 		.on( "testwidgetfoo", function( event, ui ) {
 			deepEqual( ui, {}, "empty ui hash passed" );
 			handlers.push( this );
-		});
+		} );
 	deepEqual( $( "#widget" ).testWidget( "instance" )._trigger( "foo" ), true,
 		"_trigger returns true when event is not cancelled" );
 	deepEqual( handlers, [
@@ -1166,42 +1170,42 @@ test( "._trigger() - no event, no ui", function() {
 	], "event bubbles and then invokes callback" );
 
 	$( document ).off( "testwidgetfoo" );
-});
+} );
 
 test( "._trigger() - cancelled event", function() {
 	expect( 3 );
 
 	$.widget( "ui.testWidget", {
 		_create: function() {}
-	});
+	} );
 
-	$( "#widget" ).testWidget({
+	$( "#widget" ).testWidget( {
 		foo: function() {
 			ok( true, "callback invoked even if event is cancelled" );
 		}
-	})
+	} )
 	.on( "testwidgetfoo", function() {
 		ok( true, "event was triggered" );
 		return false;
-	});
+	} );
 	deepEqual( $( "#widget" ).testWidget( "instance" )._trigger( "foo" ), false,
 		"_trigger returns false when event is cancelled" );
-});
+} );
 
 test( "._trigger() - cancelled callback", function() {
 	expect( 1 );
 	$.widget( "ui.testWidget", {
 		_create: function() {}
-	});
+	} );
 
-	$( "#widget" ).testWidget({
+	$( "#widget" ).testWidget( {
 		foo: function() {
 			return false;
 		}
-	});
+	} );
 	deepEqual( $( "#widget" ).testWidget( "instance" )._trigger( "foo" ), false,
 		"_trigger returns false when callback returns false" );
-});
+} );
 
 test( "._trigger() - provide event and ui", function() {
 	expect( 7 );
@@ -1226,7 +1230,7 @@ test( "._trigger() - provide event and ui", function() {
 				}
 			}, "ui object modified" );
 		}
-	});
+	} );
 	$( "#widget" ).on( "testwidgetfoo", function( event, ui ) {
 		equal( event.originalEvent, originalEvent, "original event object passed" );
 		deepEqual( ui, {
@@ -1237,7 +1241,7 @@ test( "._trigger() - provide event and ui", function() {
 			}
 		}, "ui hash passed" );
 		ui.foo = "notbar";
-	});
+	} );
 	$( "#widget-wrapper" ).on( "testwidgetfoo", function( event, ui ) {
 		equal( event.originalEvent, originalEvent, "original event object passed" );
 		deepEqual( ui, {
@@ -1248,8 +1252,8 @@ test( "._trigger() - provide event and ui", function() {
 			}
 		}, "modified ui hash passed" );
 		ui.baz.qux = 10;
-	});
-	$( "#widget" ).testWidget({
+	} );
+	$( "#widget" ).testWidget( {
 		foo: function( event, ui ) {
 			equal( event.originalEvent, originalEvent, "original event object passed" );
 			deepEqual( ui, {
@@ -1261,11 +1265,12 @@ test( "._trigger() - provide event and ui", function() {
 			}, "modified ui hash passed" );
 			ui.baz.quux = "jQuery";
 		}
-	})
+	} )
 	.testWidget( "testEvent" );
-});
+} );
 
 test( "._trigger() - array as ui", function() {
+
 	// #6795 - Widget: handle array arguments to _trigger consistently
 	expect( 4 );
 
@@ -1284,7 +1289,7 @@ test( "._trigger() - array as ui", function() {
 				};
 			this._trigger( "foo", null, [ ui, extra ] );
 		}
-	});
+	} );
 	$( "#widget" ).on( "testwidgetfoo", function( event, ui, extra ) {
 		deepEqual( ui, {
 			foo: "bar",
@@ -1296,8 +1301,8 @@ test( "._trigger() - array as ui", function() {
 		deepEqual( extra, {
 			bar: 5
 		}, "event: extra argument passed" );
-	});
-	$( "#widget" ).testWidget({
+	} );
+	$( "#widget" ).testWidget( {
 		foo: function( event, ui, extra ) {
 			deepEqual( ui, {
 				foo: "bar",
@@ -1310,9 +1315,9 @@ test( "._trigger() - array as ui", function() {
 				bar: 5
 			}, "callback: extra argument passed" );
 		}
-	})
+	} )
 	.testWidget( "testEvent" );
-});
+} );
 
 test( "._trigger() - instance as element", function() {
 	expect( 4 );
@@ -1321,21 +1326,21 @@ test( "._trigger() - instance as element", function() {
 		testEvent: function() {
 			this._trigger( "foo", null, { foo: "bar" } );
 		}
-	});
-	var instance = $.ui.testWidget({
+	} );
+	var instance = $.ui.testWidget( {
 		foo: function( event, ui ) {
 			equal( event.type, "testwidgetfoo", "event object passed to callback" );
 			deepEqual( ui, { foo: "bar" }, "ui object passed to callback" );
 		}
-	});
+	} );
 	$( instance ).on( "testwidgetfoo", function( event, ui ) {
 		equal( event.type, "testwidgetfoo", "event object passed to event handler" );
 		deepEqual( ui, { foo: "bar" }, "ui object passed to event handler" );
-	});
+	} );
 	instance.testEvent();
-});
+} );
 
-(function() {
+( function() {
 	function shouldDestroy( expected, callback ) {
 		expect( 1 );
 		var destroyed = false;
@@ -1344,7 +1349,7 @@ test( "._trigger() - instance as element", function() {
 			destroy: function() {
 				destroyed = true;
 			}
-		});
+		} );
 		callback();
 		equal( destroyed, expected );
 	}
@@ -1352,52 +1357,52 @@ test( "._trigger() - instance as element", function() {
 	test( "auto-destroy - .remove()", function() {
 		shouldDestroy( true, function() {
 			$( "#widget" ).testWidget().remove();
-		});
-	});
+		} );
+	} );
 
 	test( "auto-destroy - .remove() when disabled", function() {
 		shouldDestroy( true, function() {
-			$( "#widget" ).testWidget({ disabled: true }).remove();
-		});
-	});
+			$( "#widget" ).testWidget( { disabled: true } ).remove();
+		} );
+	} );
 
 	test( "auto-destroy - .remove() on parent", function() {
 		shouldDestroy( true, function() {
 			$( "#widget" ).testWidget().parent().remove();
-		});
-	});
+		} );
+	} );
 
 	test( "auto-destroy - .remove() on child", function() {
 		shouldDestroy( false, function() {
 			$( "#widget" ).testWidget().children().remove();
-		});
-	});
+		} );
+	} );
 
 	test( "auto-destroy - .empty()", function() {
 		shouldDestroy( false, function() {
 			$( "#widget" ).testWidget().empty();
-		});
-	});
+		} );
+	} );
 
 	test( "auto-destroy - .empty() on parent", function() {
 		shouldDestroy( true, function() {
 			$( "#widget" ).testWidget().parent().empty();
-		});
-	});
+		} );
+	} );
 
 	test( "auto-destroy - .detach()", function() {
 		shouldDestroy( false, function() {
 			$( "#widget" ).testWidget().detach();
-		});
-	});
+		} );
+	} );
 
 	test( "destroy - remove event bubbling", function() {
 		shouldDestroy( false, function() {
 			$( "<div>child</div>" ).appendTo( $( "#widget" ).testWidget() )
 				.trigger( "remove" );
-		});
-	});
-}());
+		} );
+	} );
+}() );
 
 test( "redefine", function() {
 	expect( 4 );
@@ -1406,19 +1411,19 @@ test( "redefine", function() {
 			strictEqual( this, instance, "original invoked with correct this" );
 			equal( str, "bar", "original invoked with correct parameter" );
 		}
-	});
+	} );
 	$.ui.testWidget.foo = "bar";
 	$.widget( "ui.testWidget", $.ui.testWidget, {
 		method: function( str ) {
 			equal( str, "foo", "new invoked with correct parameter" );
 			this._super( "bar" );
 		}
-	});
+	} );
 
-	var instance = new $.ui.testWidget({});
+	var instance = new $.ui.testWidget( {} );
 	instance.method( "foo" );
 	equal( $.ui.testWidget.foo, "bar", "static properties remain" );
-});
+} );
 
 test( "redefine deep prototype chain", function() {
 	expect( 8 );
@@ -1427,21 +1432,22 @@ test( "redefine deep prototype chain", function() {
 			strictEqual( this, instance, "original invoked with correct this" );
 			equal( str, "level 4", "original invoked with correct parameter" );
 		}
-	});
+	} );
 	$.widget( "ui.testWidget2", $.ui.testWidget, {
 		method: function( str ) {
 			strictEqual( this, instance, "testWidget2 invoked with correct this" );
 			equal( str, "level 2", "testWidget2 invoked with correct parameter" );
 			this._super( "level 3" );
 		}
-	});
+	} );
 	$.widget( "ui.testWidget3", $.ui.testWidget2, {
 		method: function( str ) {
 			strictEqual( this, instance, "testWidget3 invoked with correct this" );
 			equal( str, "level 1", "testWidget3 invoked with correct parameter" );
 			this._super( "level 2" );
 		}
-	});
+	} );
+
 	// redefine testWidget after other widgets have inherited from it
 	// this tests whether the inheriting widgets get updated prototype chains
 	$.widget( "ui.testWidget", $.ui.testWidget, {
@@ -1450,27 +1456,28 @@ test( "redefine deep prototype chain", function() {
 			equal( str, "level 3", "new invoked with correct parameter" );
 			this._super( "level 4" );
 		}
-	});
+	} );
+
 	// redefine testWidget3 after it has been automatically redefined
 	// this tests whether we properly handle _super() when the topmost prototype
 	// doesn't have the method defined
 	$.widget( "ui.testWidget3", $.ui.testWidget3, {} );
 
-	var instance = new $.ui.testWidget3({});
+	var instance = new $.ui.testWidget3( {} );
 	instance.method( "level 1" );
 
 	delete $.ui.testWidget3;
 	delete $.fn.testWidget3;
 	delete $.ui.testWidget2;
 	delete $.fn.testWidget2;
-});
+} );
 
 test( "redefine - widgetEventPrefix", function() {
 	expect( 2 );
 
 	$.widget( "ui.testWidget", {
 		widgetEventPrefix: "test"
-	});
+	} );
 	equal( $.ui.testWidget.prototype.widgetEventPrefix, "test",
 		"cusotm prefix in original" );
 
@@ -1478,7 +1485,7 @@ test( "redefine - widgetEventPrefix", function() {
 	equal( $.ui.testWidget.prototype.widgetEventPrefix, "test",
 		"cusotm prefix in extension" );
 
-});
+} );
 
 test( "mixins", function() {
 	expect( 2 );
@@ -1493,12 +1500,12 @@ test( "mixins", function() {
 		method: function() {
 			return "testWidget1";
 		}
-	});
+	} );
 	$.widget( "ui.testWidget2", {
 		method: function() {
 			return "testWidget2";
 		}
-	});
+	} );
 	$.widget( "ui.testWidget1", $.ui.testWidget1, mixin );
 	$.widget( "ui.testWidget2", $.ui.testWidget2, mixin );
 
@@ -1506,7 +1513,7 @@ test( "mixins", function() {
 		"mixed testWidget1", "testWidget1 mixin successful" );
 	equal( $( "<div>" ).testWidget2().testWidget2( "method" ),
 		"mixed testWidget2", "testWidget2 mixin successful" );
-});
+} );
 
 asyncTest( "_delay", function() {
 	expect( 6 );
@@ -1516,13 +1523,13 @@ asyncTest( "_delay", function() {
 		defaultElement: null,
 		_create: function() {
 			that = this;
-			var timer = this._delay(function() {
+			var timer = this._delay( function() {
 				strictEqual( this, that );
 				equal( order, 1 );
 				start();
-			}, 500);
+			}, 500 );
 			ok( timer !== undefined );
-			timer = this._delay("callback");
+			timer = this._delay( "callback" );
 			ok( timer !== undefined );
 		},
 		callback: function() {
@@ -1530,9 +1537,9 @@ asyncTest( "_delay", function() {
 			equal( order, 0 );
 			order += 1;
 		}
-	});
+	} );
 	$( "#widget" ).testWidget();
-});
+} );
 
 test( "$.widget.bridge()", function() {
 	expect( 14 );
@@ -1557,13 +1564,13 @@ test( "$.widget.bridge()", function() {
 		option: function( options ) {
 			deepEqual( options, {} );
 		}
-	});
+	} );
 
 	$.widget.bridge( "testWidget", TestWidget );
 
 	ok( $.isFunction( $.fn.testWidget ), "jQuery plugin was created" );
 
-	strictEqual( elem.testWidget({ foo: "bar" }), elem, "plugin returns original jQuery object" );
+	strictEqual( elem.testWidget( { foo: "bar" } ), elem, "plugin returns original jQuery object" );
 	instance = elem.data( "testWidget" );
 	equal( typeof instance, "object", "instance stored in .data(pluginName)" );
 	equal( typeof elem.testWidget( "instance" ), "object", "also retrievable via instance method" );
@@ -1581,7 +1588,7 @@ test( "$.widget.bridge()", function() {
 		ok( "_init", "_init now exists, so its called" );
 	};
 	elem.testWidget();
-});
+} );
 
 test( "$.widget.bridge() - widgetFullName", function() {
 	expect( 1 );
@@ -1596,6 +1603,6 @@ test( "$.widget.bridge() - widgetFullName", function() {
 	elem.testWidget();
 	instance = elem.data( "custom-widget" );
 	equal( typeof instance, "object", "instance stored in .data(widgetFullName)" );
-});
+} );
 
 } );
diff --git a/tests/unit/widget/extend.js b/tests/unit/widget/extend.js
index a5a8cccaa81..93afd731ae1 100644
--- a/tests/unit/widget/extend.js
+++ b/tests/unit/widget/extend.js
@@ -16,7 +16,7 @@ test( "$.widget.extend()", function() {
 		deep2 = { foo: { baz: true }, foo2: document },
 		deep2copy = { foo: { baz: true }, foo2: document },
 		deepmerged = { foo: { bar: true, baz: true }, foo2: document },
-		arr = [1, 2, 3],
+		arr = [ 1, 2, 3 ],
 		nestedarray = { arr: arr },
 		defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
@@ -35,8 +35,8 @@ test( "$.widget.extend()", function() {
 	deepEqual( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );
 	equal( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );
 
-	strictEqual( $.widget.extend({}, nestedarray).arr, arr, "Don't clone arrays" );
-	ok( $.isPlainObject( $.widget.extend({ arr: arr }, { arr: {} }).arr ), "Cloned object heve to be an plain object" );
+	strictEqual( $.widget.extend( {}, nestedarray ).arr, arr, "Don't clone arrays" );
+	ok( $.isPlainObject( $.widget.extend( { arr: arr }, { arr: {} } ).arr ), "Cloned object heve to be an plain object" );
 
 	empty = {};
 	optionsWithLength = { foo: { length: -1 } };
@@ -56,29 +56,29 @@ test( "$.widget.extend()", function() {
 	strictEqual( empty.foo.date, customObject, "Custom objects copy correctly (no methods)" );
 
 	// Makes the class a little more realistic
-	myKlass.prototype = { someMethod: function(){} };
+	myKlass.prototype = { someMethod: function() {} };
 	empty = {};
 	$.widget.extend( empty, optionsWithCustomObject );
 	strictEqual( empty.foo.date, customObject, "Custom objects copy correctly" );
 
-	ret = $.widget.extend({ foo: 4 }, { foo: Number(5) } );
+	ret = $.widget.extend( { foo: 4 }, { foo: Number( 5 ) } );
 	equal( ret.foo, 5, "Wrapped numbers copy correctly" );
 
 	nullUndef = $.widget.extend( {}, options, { xnumber2: null } );
-	strictEqual( nullUndef.xnumber2, null, "Check to make sure null values are copied");
+	strictEqual( nullUndef.xnumber2, null, "Check to make sure null values are copied" );
 
 	nullUndef = $.widget.extend( {}, options, { xnumber2: undefined } );
-	strictEqual( nullUndef.xnumber2, options.xnumber2, "Check to make sure undefined values are not copied");
+	strictEqual( nullUndef.xnumber2, options.xnumber2, "Check to make sure undefined values are not copied" );
 
 	nullUndef = $.widget.extend( {}, options, { xnumber0: null } );
-	strictEqual( nullUndef.xnumber0, null, "Check to make sure null values are inserted");
+	strictEqual( nullUndef.xnumber0, null, "Check to make sure null values are inserted" );
 
 	target = {};
 	recursive = { foo:target, bar:5 };
 	$.widget.extend( target, recursive );
 	deepEqual( target, { foo: {}, bar: 5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" );
 
-	ret = $.widget.extend( { foo: [] }, { foo: [0] } ); // 1907
+	ret = $.widget.extend( { foo: [] }, { foo: [ 0 ] } ); // 1907
 	equal( ret.foo.length, 1, "Check to make sure a value with coersion 'false' copies over when necessary to fix #1907" );
 
 	ret = $.widget.extend( { foo: "1,2,3" }, { foo: [ 1, 2, 3 ] } );
@@ -105,8 +105,8 @@ test( "$.widget.extend()", function() {
 	};
 	output = $.widget.extend( {}, input );
 	deepEqual( input, output, "don't clone arrays" );
-	input.key[0] = 10;
+	input.key[ 0 ] = 10;
 	deepEqual( input, output, "don't clone arrays" );
-});
+} );
 
 } );
diff --git a/ui/widgets/accordion.js b/ui/widgets/accordion.js
index 8c16df38f6d..78fea52b1fe 100644
--- a/ui/widgets/accordion.js
+++ b/ui/widgets/accordion.js
@@ -87,6 +87,7 @@ return $.widget( "ui.accordion", {
 		}
 
 		this._processPanels();
+
 		// handle negative values
 		if ( options.active < 0 ) {
 			options.active += this.headers.length;
@@ -147,6 +148,7 @@ return $.widget( "ui.accordion", {
 
 	_setOption: function( key, value ) {
 		if ( key === "active" ) {
+
 			// _activate() will handle invalid values and update this.options
 			this._activate( value );
 			return;
@@ -238,21 +240,27 @@ return $.widget( "ui.accordion", {
 		if ( ( options.active === false && options.collapsible === true ) || !this.headers.length ) {
 			options.active = false;
 			this.active = $();
+
 		// active false only when collapsible is true
 		} else if ( options.active === false ) {
 			this._activate( 0 );
+
 		// was active, but active panel is gone
 		} else if ( this.active.length && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
+
 			// all remaining panel are disabled
 			if ( this.headers.length === this.headers.find( ".ui-state-disabled" ).length ) {
 				options.active = false;
 				this.active = $();
+
 			// activate previous panel
 			} else {
 				this._activate( Math.max( 0, options.active - 1 ) );
 			}
+
 		// was active, active panel still exists
 		} else {
+
 			// make sure active index is correct
 			options.active = this.headers.index( this.active );
 		}
@@ -427,8 +435,10 @@ return $.widget( "ui.accordion", {
 		event.preventDefault();
 
 		if (
+
 				// click on active header, but not collapsible
 				( clickedIsActive && !options.collapsible ) ||
+
 				// allow canceling activation
 				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
 			return;
@@ -487,6 +497,7 @@ return $.widget( "ui.accordion", {
 			"aria-selected": "false",
 			"aria-expanded": "false"
 		} );
+
 		// if we're switching panels, remove the old header from the tab order
 		// if we're opening from collapsed state, remove the previous header from the tab order
 		// if we're collapsing, then keep the collapsing header in the tab order
@@ -531,6 +542,7 @@ return $.widget( "ui.accordion", {
 		if ( typeof options === "string" ) {
 			easing = options;
 		}
+
 		// fall back from options to animation in case of partial down settings
 		easing = easing || options.easing || animate.easing;
 		duration = duration || options.duration || animate.duration;

From e41ee1021a095ad17fe0f4d83bf23d8af8e05205 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 09:32:42 -0400
Subject: [PATCH 19/27] Effects: Style updates

Ref #14246
---
 tests/unit/effects/core.js      | 132 ++++++++++++++++----------------
 tests/unit/effects/scale.js     |  10 +--
 tests/visual/effects/effects.js |  35 +++++----
 3 files changed, 89 insertions(+), 88 deletions(-)

diff --git a/tests/unit/effects/core.js b/tests/unit/effects/core.js
index 5f634a78293..ca7d560340a 100644
--- a/tests/unit/effects/core.js
+++ b/tests/unit/effects/core.js
@@ -45,13 +45,13 @@ asyncTest( ".hide() with step", function() {
 			step = $.noop;
 		};
 
-	element.hide({
+	element.hide( {
 		step: function() {
 			step();
 		},
 		complete: start
-	});
-});
+	} );
+} );
 
 test( "Immediate Return Conditions", function() {
 	var hidden = $( "div.hidden" ),
@@ -59,19 +59,19 @@ test( "Immediate Return Conditions", function() {
 	expect( 3 );
 	hidden.hide( "blind", function() {
 		equal( ++count, 1, "Hide on hidden returned immediately" );
-	}).show().show( "blind", function() {
+	} ).show().show( "blind", function() {
 		equal( ++count, 2, "Show on shown returned immediately" );
-	});
+	} );
 	equal( ++count, 3, "Both Functions worked properly" );
-});
+} );
 
 test( ".hide() with hidden parent", function() {
 	expect( 1 );
 	var element = $( "div.hidden" ).children();
 	element.hide( "blind", function() {
 		equal( element.css( "display" ), "none", "display: none" );
-	});
-});
+	} );
+} );
 
 asyncTest( "Parse of null for options", function() {
 	var hidden = $( "div.hidden" ),
@@ -80,8 +80,8 @@ asyncTest( "Parse of null for options", function() {
 	hidden.show( "blind", null, 1, function() {
 		equal( ++count, 1, "null for options still works" );
 		start();
-	});
-});
+	} );
+} );
 
 test( "removeClass", function() {
 	expect( 3 );
@@ -92,28 +92,28 @@ test( "removeClass", function() {
 	equal( "destroyed", element[ 0 ].className );
 	element.removeClass();
 	equal( "", element[ 0 ].className );
-});
+} );
 
 module( "effects.core: animateClass" );
 
 asyncTest( "animateClass works with borderStyle", function() {
-	var test = $("div.animateClass");
-	expect(3);
-	test.toggleClass("testAddBorder", minDuration, function() {
-		test.toggleClass("testAddBorder", minDuration, function() {
-			equal( test.css("borderLeftStyle"), "none", "None border set" );
+	var test = $( "div.animateClass" );
+	expect( 3 );
+	test.toggleClass( "testAddBorder", minDuration, function() {
+		test.toggleClass( "testAddBorder", minDuration, function() {
+			equal( test.css( "borderLeftStyle" ), "none", "None border set" );
 			start();
-		});
-		equal( test.css("borderLeftStyle"), "solid", "None border not immedately set" );
-	});
-	equal( test.css("borderLeftStyle"), "solid", "Solid border immedately set" );
-});
+		} );
+		equal( test.css( "borderLeftStyle" ), "solid", "None border not immedately set" );
+	} );
+	equal( test.css( "borderLeftStyle" ), "solid", "Solid border immedately set" );
+} );
 
 asyncTest( "animateClass works with colors", function() {
-	var test = $("div.animateClass"),
+	var test = $( "div.animateClass" ),
 		oldStep = jQuery.fx.step.backgroundColor;
 
-	expect(2);
+	expect( 2 );
 
 	// We want to catch the first frame of animation
 	jQuery.fx.step.backgroundColor = function( fx ) {
@@ -122,21 +122,21 @@ asyncTest( "animateClass works with colors", function() {
 		// Make sure it has animated somewhere we can detect
 		if ( fx.pos > 255 / 2000 ) {
 			jQuery.fx.step.backgroundColor = oldStep;
-			notPresent( test.css("backgroundColor"),
+			notPresent( test.css( "backgroundColor" ),
 				[ "#000000", "#ffffff", "#000", "#fff", "rgb(0, 0, 0)", "rgb(255,255,255)" ],
 				"Color is not endpoints in middle." );
 			test.stop( true, true );
 		}
 	};
 
-	test.toggleClass("testChangeBackground", {
+	test.toggleClass( "testChangeBackground", {
 		duration: 2000,
 		complete: function() {
-			present( test.css("backgroundColor"), [ "#ffffff", "#fff", "rgb(255, 255, 255)" ], "Color is final" );
+			present( test.css( "backgroundColor" ), [ "#ffffff", "#fff", "rgb(255, 255, 255)" ], "Color is final" );
 			start();
 		}
-	});
-});
+	} );
+} );
 
 asyncTest( "animateClass calls step option", 1, function() {
 	var test = jQuery( "div.animateClass" ),
@@ -150,23 +150,23 @@ asyncTest( "animateClass calls step option", 1, function() {
 		step: function() {
 			step();
 		}
-	});
-});
+	} );
+} );
 
 asyncTest( "animateClass works with children", 3, function() {
 	var animatedChild,
-		test = $("div.animateClass"),
-		h2 = test.find("h2");
+		test = $( "div.animateClass" ),
+		h2 = test.find( "h2" );
 
-	test.toggleClass("testChildren", {
+	test.toggleClass( "testChildren", {
 		children: true,
 		duration: duration,
 		complete: function() {
-			equal( h2.css("fontSize"), "20px", "Text size is final during complete");
-			test.toggleClass("testChildren", {
+			equal( h2.css( "fontSize" ), "20px", "Text size is final during complete" );
+			test.toggleClass( "testChildren", {
 				duration: duration,
 				complete: function() {
-					equal( h2.css("fontSize"), "10px", "Text size revertted after class removed");
+					equal( h2.css( "fontSize" ), "10px", "Text size revertted after class removed" );
 
 					start();
 				},
@@ -175,7 +175,7 @@ asyncTest( "animateClass works with children", 3, function() {
 						ok( false, "Error - Animating property on h2" );
 					}
 				}
-			});
+			} );
 		},
 		step: function( val, fx ) {
 			if ( fx.prop === "fontSize" && fx.elem === h2[ 0 ] && !animatedChild ) {
@@ -183,12 +183,12 @@ asyncTest( "animateClass works with children", 3, function() {
 				animatedChild = true;
 			}
 		}
-	});
-});
+	} );
+} );
 
 asyncTest( "animateClass clears style properties when stopped", function() {
-	var test = $("div.animateClass"),
-		style = test[0].style,
+	var test = $( "div.animateClass" ),
+		style = test[ 0 ].style,
 		orig = style.cssText;
 
 	expect( 2 );
@@ -199,7 +199,7 @@ asyncTest( "animateClass clears style properties when stopped", function() {
 	test.stop( true, true );
 	equal( orig, $.trim( style.cssText ), "cssText is the same after stopping animation midway" );
 	start();
-});
+} );
 
 asyncTest( "animateClass: css and class changes during animation are not lost (#7106)",
 function( assert ) {
@@ -217,7 +217,7 @@ function( assert ) {
 	test.addClass( "animate", minDuration, animationComplete )
 		.addClass( "testClass" )
 		.height( 100 );
-});
+} );
 
 test( "createPlaceholder: only created for static or relative elements", function() {
 	expect( 4 );
@@ -226,16 +226,16 @@ test( "createPlaceholder: only created for static or relative elements", functio
 	ok( $.effects.createPlaceholder( $( ".static" ) ).length, "placeholder created for static element" );
 	ok( !$.effects.createPlaceholder( $( ".absolute" ) ), "placeholder not created for absolute element" );
 	ok( !$.effects.createPlaceholder( $( ".fixed" ) ), "placeholder not created for fixed element" );
-});
+} );
 
 test( "createPlaceholder: preserves layout affecting properties", function() {
 	expect( 7 );
 
 	var position = 5,
-		element = $( ".relative" ).css({
+		element = $( ".relative" ).css( {
 			top: position,
 			left: position
-		}),
+		} ),
 		before = {
 			offset: element.offset(),
 			outerWidth: element.outerWidth( true ),
@@ -253,10 +253,10 @@ test( "createPlaceholder: preserves layout affecting properties", function() {
 	deepEqual( before.position.top - position, placeholder.position().top, "position top preserved" );
 	deepEqual( before.position.left - position, placeholder.position().left, "position left preserved" );
 
-	deepEqual( before[ "float" ], placeholder.css( "float" ), "float preserved" );
+	deepEqual( before.float, placeholder.css( "float" ), "float preserved" );
 	deepEqual( before.outerWidth, placeholder.outerWidth( true ), "width preserved" );
 	deepEqual( before.outerHeight, placeholder.outerHeight( true ), "height preserved" );
-});
+} );
 
 module( "transfer" );
 
@@ -321,47 +321,47 @@ $.each( $.effects.effect, function( effect ) {
 
 		hidden
 			.queue( queueTest() )
-			.queue( duringTest(function() {
+			.queue( duringTest( function() {
 				ok( hidden.is( ":animated" ),
 					"Hidden is seen as animated during .show(\"" + effect + "\", time)" );
-			}) )
-			.show( effect, minDuration, queueTest(function() {
+			} ) )
+			.show( effect, minDuration, queueTest( function() {
 				equal( hidden.css( "display" ), "block",
 					"Hidden is shown after .show(\"" + effect + "\", time)" );
 				ok( !$( ".ui-effects-placeholder" ).length,
 					"No placeholder remains after .show(\"" + effect + "\", time)" );
-			}) )
+			} ) )
 			.queue( queueTest() )
-			.queue( duringTest(function() {
+			.queue( duringTest( function() {
 				ok( hidden.is( ":animated" ),
 					"Hidden is seen as animated during .hide(\"" + effect + "\", time)" );
-			}) )
-			.hide( effect, minDuration, queueTest(function() {
+			} ) )
+			.hide( effect, minDuration, queueTest( function() {
 				equal( hidden.css( "display" ), "none",
 					"Back to hidden after .hide(\"" + effect + "\", time)" );
 				ok( !$( ".ui-effects-placeholder" ).length,
 					"No placeholder remains after .hide(\"" + effect + "\", time)" );
-			}) )
-			.queue( queueTest(function() {
+			} ) )
+			.queue( queueTest( function() {
 				deepEqual( hidden.queue(), [ "inprogress" ], "Only the inprogress sentinel remains" );
 				start();
-			}) );
-	});
+			} ) );
+	} );
 
 	asyncTest( "relative width & height - properties are preserved", function() {
-		var test = $("div.relWidth.relHeight"),
+		var test = $( "div.relWidth.relHeight" ),
 			width = test.width(), height = test.height(),
-			cssWidth = test[0].style.width, cssHeight = test[0].style.height;
+			cssWidth = test[ 0 ].style.width, cssHeight = test[ 0 ].style.height;
 
 		expect( 4 );
 		test.toggle( effect, minDuration, function() {
-			equal( test[0].style.width, cssWidth, "Inline CSS Width has been reset after animation ended" );
-			equal( test[0].style.height, cssHeight, "Inline CSS Height has been rest after animation ended" );
+			equal( test[ 0 ].style.width, cssWidth, "Inline CSS Width has been reset after animation ended" );
+			equal( test[ 0 ].style.height, cssHeight, "Inline CSS Height has been rest after animation ended" );
 			start();
-		});
+		} );
 		equal( test.width(), width, "Width is the same px after animation started" );
 		equal( test.height(), height, "Height is the same px after animation started" );
-	});
-});
+	} );
+} );
 
 } );
diff --git a/tests/unit/effects/scale.js b/tests/unit/effects/scale.js
index 0558810c863..dc8e9ba7179 100644
--- a/tests/unit/effects/scale.js
+++ b/tests/unit/effects/scale.js
@@ -41,7 +41,7 @@ function run( position, v, h, vo, ho ) {
 		}
 		test.css( css );
 		test.effect( effect );
-	});
+	} );
 }
 
 function suite( position ) {
@@ -55,18 +55,18 @@ function suite( position ) {
 	*/
 }
 
-$(function() {
+$( function() {
 	suite( "absolute" );
 	suite( "relative" );
 	var fixedElem = $( "<div>" )
-		.css({
+		.css( {
 			position: "fixed",
 			top: 10
-		})
+		} )
 		.appendTo( "body" );
 	if ( fixedElem.offset().top === 10 ) {
 		suite( "fixed" );
 	}
-});
+} );
 
 } );
diff --git a/tests/visual/effects/effects.js b/tests/visual/effects/effects.js
index 114dcc2a60a..0b0de96f434 100644
--- a/tests/visual/effects/effects.js
+++ b/tests/visual/effects/effects.js
@@ -1,4 +1,4 @@
-$(function() {
+$( function() {
 
 var duration = 1000,
 	wait = 500;
@@ -6,19 +6,20 @@ var duration = 1000,
 function effect( elem, name, options ) {
 	$.extend( options, {
 		easing: "easeOutQuint"
-	});
+	} );
 
 	$( elem ).on( "click", function() {
 		$( this )
 			.addClass( "current" )
+
 			// delaying the initial animation makes sure that the queue stays in tact
 			.delay( 10 )
 			.hide( name, options, duration )
 			.delay( wait )
 			.show( name, options, duration, function() {
 				$( this ).removeClass( "current" );
-			});
-	});
+			} );
+	} );
 }
 
 $( "#hide" ).on( "click", function() {
@@ -28,8 +29,8 @@ $( "#hide" ).on( "click", function() {
 		.delay( wait )
 		.show( duration, function() {
 			$( this ).removeClass( "current" );
-		});
-});
+		} );
+} );
 
 effect( "#blindLeft", "blind", { direction: "left" } );
 effect( "#blindUp", "blind", { direction: "up" } );
@@ -68,16 +69,16 @@ $( "#sizeToggle" ).on( "click", function() {
 		.delay( wait )
 		.toggle( "size", options, duration, function() {
 			$( this ).removeClass( "current" );
-		});
-});
+		} );
+} );
 
 $( "#shake" ).on( "click", function() {
 	$( this )
 		.addClass( "current" )
 		.effect( "shake", {}, 100, function() {
 			$( this ).removeClass( "current" );
-		});
-});
+		} );
+} );
 
 effect( "#slideDown", "slide", { direction: "down" } );
 effect( "#slideUp", "slide", { direction: "up" } );
@@ -89,19 +90,19 @@ $( "#transfer" ).on( "click", function() {
 		.addClass( "current" )
 		.effect( "transfer", { to: "div:eq(0)" }, 1000, function() {
 			$( this ).removeClass( "current" );
-		});
-});
+		} );
+} );
 
 $( "#addClass" ).on( "click", function() {
 	$( this ).addClass( "current", duration, function() {
 		$( this ).removeClass( "current" );
-	});
-});
+	} );
+} );
 $( "#removeClass" ).on( "click", function() {
 	$( this ).addClass( "current" ).removeClass( "current", duration );
-});
+} );
 $( "#toggleClass" ).on( "click", function() {
 	$( this ).toggleClass( "current", duration );
-});
+} );
 
-});
+} );

From 702e2dbdf5667187c0d8a11bd677325d456d027f Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 09:33:22 -0400
Subject: [PATCH 20/27] Position: Style updates

Ref #14246
---
 tests/unit/position/core.js | 282 ++++++++++++++++++------------------
 1 file changed, 141 insertions(+), 141 deletions(-)

diff --git a/tests/unit/position/core.js b/tests/unit/position/core.js
index c480e21789b..79aac76c45e 100644
--- a/tests/unit/position/core.js
+++ b/tests/unit/position/core.js
@@ -18,63 +18,63 @@ module( "position", {
 	setup: function() {
 		win.scrollTop( 0 ).scrollLeft( 0 );
 	}
-});
+} );
 
 common.testJshint( "position" );
 
 test( "my, at, of", function() {
 	expect( 4 );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left top",
 		at: "left top",
 		of: "#parentx",
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), { top: 40, left: 40 }, "left top, left top" );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left top",
 		at: "left bottom",
 		of: "#parentx",
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), { top: 60, left: 40 }, "left top, left bottom" );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left",
 		at: "bottom",
 		of: "#parentx",
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), { top: 55, left: 50 }, "left, bottom" );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left foo",
 		at: "bar baz",
 		of: "#parentx",
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), { top: 45, left: 50 }, "left foo, bar baz" );
-});
+} );
 
 test( "multiple elements", function() {
 	expect( 3 );
 
 	var elements = $( "#el1, #el2" ),
-		result = elements.position({
+		result = elements.position( {
 			my: "left top",
 			at: "left bottom",
 			of: "#parent",
 			collision: "none"
-		}),
+		} ),
 		expected = { top: 10, left: 4 };
 
 	deepEqual( result, elements );
-	elements.each(function() {
+	elements.each( function() {
 		deepEqual( $( this ).offset(), expected );
-	});
-});
+	} );
+} );
 
 test( "positions", function() {
 	expect( 18 );
@@ -94,67 +94,67 @@ test( "positions", function() {
 			$.each( [ "left", "center", "right" ], function( hindex, horizontal ) {
 				var _my = my ? horizontal + " " + vertical : "left top",
 					_at = !my ? horizontal + " " + vertical : "left top";
-				el.position({
+				el.position( {
 					my: _my,
 					at: _at,
 					of: "#parent",
 					collision: "none"
-				});
+				} );
 				deepEqual( el.offset(), {
-					top: start.top + offsets[ vertical ] * (my ? -1 : 1),
-					left: start.left + offsets[ horizontal ] * (my ? -1 : 1)
-				}, "Position via " + QUnit.jsDump.parse({ my: _my, at: _at }) );
-			});
-		});
-	});
-});
+					top: start.top + offsets[ vertical ] * ( my ? -1 : 1 ),
+					left: start.left + offsets[ horizontal ] * ( my ? -1 : 1 )
+				}, "Position via " + QUnit.jsDump.parse( { my: _my, at: _at } ) );
+			} );
+		} );
+	} );
+} );
 
 test( "of", function() {
-	expect( 9 + (scrollTopSupport() ? 1 : 0) );
+	expect( 9 + ( scrollTopSupport() ? 1 : 0 ) );
 
 	var event;
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left top",
 		at: "left top",
 		of: "#parentx",
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), { top: 40, left: 40 }, "selector" );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left top",
 		at: "left bottom",
-		of: $( "#parentx"),
+		of: $( "#parentx" ),
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), { top: 60, left: 40 }, "jQuery object" );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left top",
 		at: "left top",
 		of: $( "#parentx" )[ 0 ],
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), { top: 40, left: 40 }, "DOM element" );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "right bottom",
 		at: "right bottom",
 		of: document,
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), {
 		top: $( document ).height() - 10,
 		left: $( document ).width() - 10
 	}, "document" );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "right bottom",
 		at: "right bottom",
 		of: $( document ),
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), {
 		top: $( document ).height() - 10,
 		left: $( document ).width() - 10
@@ -162,23 +162,23 @@ test( "of", function() {
 
 	win.scrollTop( 0 );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "right bottom",
 		at: "right bottom",
 		of: window,
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), {
 		top: win.height() - 10,
 		left: win.width() - 10
 	}, "window" );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "right bottom",
 		at: "right bottom",
 		of: win,
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), {
 		top: win.height() - 10,
 		left: win.width() - 10
@@ -186,12 +186,12 @@ test( "of", function() {
 
 	if ( scrollTopSupport() ) {
 		win.scrollTop( 500 ).scrollLeft( 200 );
-		$( "#elx" ).position({
+		$( "#elx" ).position( {
 			my: "right bottom",
 			at: "right bottom",
 			of: window,
 			collision: "none"
-		});
+		} );
 		deepEqual( $( "#elx" ).offset(), {
 			top: win.height() + 500 - 10,
 			left: win.width() + 200 - 10
@@ -200,95 +200,95 @@ test( "of", function() {
 	}
 
 	event = $.extend( $.Event( "someEvent" ), { pageX: 200, pageY: 300 } );
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left top",
 		at: "left top",
 		of: event,
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), {
 		top: 300,
 		left: 200
 	}, "event - left top, left top" );
 
 	event = $.extend( $.Event( "someEvent" ), { pageX: 400, pageY: 600 } );
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left top",
 		at: "right bottom",
 		of: event,
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), {
 		top: 600,
 		left: 400
 	}, "event - left top, right bottom" );
-});
+} );
 
 test( "offsets", function() {
 	expect( 9 );
 
 	var offset;
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left top",
 		at: "left+10 bottom+10",
 		of: "#parentx",
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), { top: 70, left: 50 }, "offsets in at" );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left+10 top-10",
 		at: "left bottom",
 		of: "#parentx",
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), { top: 50, left: 50 }, "offsets in my" );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left top",
 		at: "left+50% bottom-10%",
 		of: "#parentx",
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), { top: 58, left: 50 }, "percentage offsets in at" );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left-30% top+50%",
 		at: "left bottom",
 		of: "#parentx",
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), { top: 65, left: 37 }, "percentage offsets in my" );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left-30.001% top+50.0%",
 		at: "left bottom",
 		of: "#parentx",
 		collision: "none"
-	});
+	} );
 	offset = $( "#elx" ).offset();
 	equal( Math.round( offset.top ), 65, "decimal percentage offsets in my" );
 	equal( Math.round( offset.left ), 37, "decimal percentage offsets in my" );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left+10.4 top-10.6",
 		at: "left bottom",
 		of: "#parentx",
 		collision: "none"
-	});
+	} );
 	offset = $( "#elx" ).offset();
 	equal( Math.round( offset.top ), 49, "decimal offsets in my" );
 	equal( Math.round( offset.left ), 50, "decimal offsets in my" );
 
-	$( "#elx" ).position({
+	$( "#elx" ).position( {
 		my: "left+right top-left",
 		at: "left-top bottom-bottom",
 		of: "#parentx",
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#elx" ).offset(), { top: 60, left: 40 }, "invalid offsets" );
-});
+} );
 
 test( "using", function() {
 	expect( 10 );
@@ -315,14 +315,14 @@ test( "using", function() {
 			vertical: "top",
 			important: "vertical"
 		},
-		originalPosition = elems.position({
+		originalPosition = elems.position( {
 			my: "right bottom",
 			at: "rigt bottom",
 			of: "#parentx",
 			collision: "none"
-		}).offset();
+		} ).offset();
 
-	elems.position({
+	elems.position( {
 		my: "left top",
 		at: "center+10 bottom",
 		of: "#parentx",
@@ -334,15 +334,15 @@ test( "using", function() {
 			deepEqual( feedback, expectedFeedback );
 			count++;
 		}
-	});
+	} );
 
-	elems.each(function() {
+	elems.each( function() {
 		deepEqual( $( this ).offset(), originalPosition, "elements not moved" );
-	});
-});
+	} );
+} );
 
 function collisionTest( config, result, msg ) {
-	var elem = $( "#elx" ).position( $.extend({
+	var elem = $( "#elx" ).position( $.extend( {
 		my: "left top",
 		at: "right bottom",
 		of: "#parent"
@@ -351,7 +351,7 @@ function collisionTest( config, result, msg ) {
 }
 
 function collisionTest2( config, result, msg ) {
-	collisionTest( $.extend({
+	collisionTest( $.extend( {
 		my: "right bottom",
 		at: "left top"
 	}, config ), result, msg );
@@ -360,35 +360,35 @@ function collisionTest2( config, result, msg ) {
 test( "collision: fit, no collision", function() {
 	expect( 2 );
 
-	collisionTest({
+	collisionTest( {
 		collision: "fit"
 	}, {
 		top: 10,
 		left: 10
 	}, "no offset" );
 
-	collisionTest({
+	collisionTest( {
 		collision: "fit",
 		at: "right+2 bottom+3"
 	}, {
 		top: 13,
 		left: 12
 	}, "with offset" );
-});
+} );
 
 // Currently failing in IE8 due to the iframe used by TestSwarm
 if ( !/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() ) ) {
 test( "collision: fit, collision", function() {
-	expect( 2 + (scrollTopSupport() ? 1 : 0) );
+	expect( 2 + ( scrollTopSupport() ? 1 : 0 ) );
 
-	collisionTest2({
+	collisionTest2( {
 		collision: "fit"
 	}, {
 		top: 0,
 		left: 0
 	}, "no offset" );
 
-	collisionTest2({
+	collisionTest2( {
 		collision: "fit",
 		at: "left+2 top+3"
 	}, {
@@ -398,7 +398,7 @@ test( "collision: fit, collision", function() {
 
 	if ( scrollTopSupport() ) {
 		win.scrollTop( 300 ).scrollLeft( 200 );
-		collisionTest({
+		collisionTest( {
 			collision: "fit"
 		}, {
 			top: 300,
@@ -407,188 +407,188 @@ test( "collision: fit, collision", function() {
 
 		win.scrollTop( 0 ).scrollLeft( 0 );
 	}
-});
+} );
 }
 
 test( "collision: flip, no collision", function() {
 	expect( 2 );
 
-	collisionTest({
+	collisionTest( {
 		collision: "flip"
 	}, {
 		top: 10,
 		left: 10
 	}, "no offset" );
 
-	collisionTest({
+	collisionTest( {
 		collision: "flip",
 		at: "right+2 bottom+3"
 	}, {
 		top: 13,
 		left: 12
 	}, "with offset" );
-});
+} );
 
 test( "collision: flip, collision", function() {
 	expect( 2 );
 
-	collisionTest2({
+	collisionTest2( {
 		collision: "flip"
 	}, {
 		top: 10,
 		left: 10
 	}, "no offset" );
 
-	collisionTest2({
+	collisionTest2( {
 		collision: "flip",
 		at: "left+2 top+3"
 	}, {
 		top: 7,
 		left: 8
 	}, "with offset" );
-});
+} );
 
 test( "collision: flipfit, no collision", function() {
 	expect( 2 );
 
-	collisionTest({
+	collisionTest( {
 		collision: "flipfit"
 	}, {
 		top: 10,
 		left: 10
 	}, "no offset" );
 
-	collisionTest({
+	collisionTest( {
 		collision: "flipfit",
 		at: "right+2 bottom+3"
 	}, {
 		top: 13,
 		left: 12
 	}, "with offset" );
-});
+} );
 
 test( "collision: flipfit, collision", function() {
 	expect( 2 );
 
-	collisionTest2({
+	collisionTest2( {
 		collision: "flipfit"
 	}, {
 		top: 10,
 		left: 10
 	}, "no offset" );
 
-	collisionTest2({
+	collisionTest2( {
 		collision: "flipfit",
 		at: "left+2 top+3"
 	}, {
 		top: 7,
 		left: 8
 	}, "with offset" );
-});
+} );
 
 test( "collision: none, no collision", function() {
 	expect( 2 );
 
-	collisionTest({
+	collisionTest( {
 		collision: "none"
 	}, {
 		top: 10,
 		left: 10
 	}, "no offset" );
 
-	collisionTest({
+	collisionTest( {
 		collision: "none",
 		at: "right+2 bottom+3"
 	}, {
 		top: 13,
 		left: 12
 	}, "with offset" );
-});
+} );
 
 test( "collision: none, collision", function() {
 	expect( 2 );
 
-	collisionTest2({
+	collisionTest2( {
 		collision: "none"
 	}, {
 		top: -6,
 		left: -6
 	}, "no offset" );
 
-	collisionTest2({
+	collisionTest2( {
 		collision: "none",
 		at: "left+2 top+3"
 	}, {
 		top: -3,
 		left: -4
 	}, "with offset" );
-});
+} );
 
 test( "collision: fit, with margin", function() {
 	expect( 2 );
 
-	$( "#elx" ).css({
+	$( "#elx" ).css( {
 		marginTop: 6,
 		marginLeft: 4
-	});
+	} );
 
-	collisionTest({
+	collisionTest( {
 		collision: "fit"
 	}, {
 		top: 10,
 		left: 10
 	}, "right bottom" );
 
-	collisionTest2({
+	collisionTest2( {
 		collision: "fit"
 	}, {
 		top: 6,
 		left: 4
 	}, "left top" );
-});
+} );
 
 test( "collision: flip, with margin", function() {
 	expect( 3 );
 
-	$( "#elx" ).css({
+	$( "#elx" ).css( {
 		marginTop: 6,
 		marginLeft: 4
-	});
+	} );
 
-	collisionTest({
+	collisionTest( {
 		collision: "flip"
 	}, {
 		top: 10,
 		left: 10
 	}, "left top" );
 
-	collisionTest2({
+	collisionTest2( {
 		collision: "flip"
 	}, {
 		top: 10,
 		left: 10
 	}, "right bottom" );
 
-	collisionTest2({
+	collisionTest2( {
 		collision: "flip",
 		my: "left top"
 	}, {
 		top: 0,
 		left: 4
 	}, "right bottom" );
-});
+} );
 
 test( "within", function() {
 	expect( 7 );
 
-	collisionTest({
+	collisionTest( {
 		within: document
 	}, {
 		top: 10,
 		left: 10
 	}, "within document" );
 
-	collisionTest({
+	collisionTest( {
 		within: "#within",
 		collision: "fit"
 	}, {
@@ -596,7 +596,7 @@ test( "within", function() {
 		left: 2
 	}, "fit - right bottom" );
 
-	collisionTest2({
+	collisionTest2( {
 		within: "#within",
 		collision: "fit"
 	}, {
@@ -604,7 +604,7 @@ test( "within", function() {
 		left: 0
 	}, "fit - left top" );
 
-	collisionTest({
+	collisionTest( {
 		within: "#within",
 		collision: "flip"
 	}, {
@@ -612,7 +612,7 @@ test( "within", function() {
 		left: -6
 	}, "flip - right bottom" );
 
-	collisionTest2({
+	collisionTest2( {
 		within: "#within",
 		collision: "flip"
 	}, {
@@ -620,7 +620,7 @@ test( "within", function() {
 		left: -6
 	}, "flip - left top" );
 
-	collisionTest({
+	collisionTest( {
 		within: "#within",
 		collision: "flipfit"
 	}, {
@@ -628,26 +628,26 @@ test( "within", function() {
 		left: 0
 	}, "flipfit - right bottom" );
 
-	collisionTest2({
+	collisionTest2( {
 		within: "#within",
 		collision: "flipfit"
 	}, {
 		top: 4,
 		left: 0
 	}, "flipfit - left top" );
-});
+} );
 
 test( "with scrollbars", function() {
 	expect( 4 );
 
-	$( "#scrollx" ).css({
+	$( "#scrollx" ).css( {
 		width: 100,
 		height: 100,
 		left: 0,
 		top: 0
-	});
+	} );
 
-	collisionTest({
+	collisionTest( {
 		of: "#scrollx",
 		collision: "fit",
 		within: "#scrollx"
@@ -656,13 +656,13 @@ test( "with scrollbars", function() {
 		left: 90
 	}, "visible" );
 
-	$( "#scrollx" ).css({
+	$( "#scrollx" ).css( {
 		overflow: "scroll"
-	});
+	} );
 
 	var scrollbarInfo = $.position.getScrollInfo( $.position.getWithinInfo( $( "#scrollx" ) ) );
 
-	collisionTest({
+	collisionTest( {
 		of: "#scrollx",
 		collision: "fit",
 		within: "#scrollx"
@@ -671,11 +671,11 @@ test( "with scrollbars", function() {
 		left: 90 - scrollbarInfo.width
 	}, "scroll" );
 
-	$( "#scrollx" ).css({
+	$( "#scrollx" ).css( {
 		overflow: "auto"
-	});
+	} );
 
-	collisionTest({
+	collisionTest( {
 		of: "#scrollx",
 		collision: "fit",
 		within: "#scrollx"
@@ -684,11 +684,11 @@ test( "with scrollbars", function() {
 		left: 90
 	}, "auto, no scroll" );
 
-	$( "#scrollx" ).css({
+	$( "#scrollx" ).css( {
 		overflow: "auto"
-	}).append( $("<div>").height(300).width(300) );
+	} ).append( $( "<div>" ).height( 300 ).width( 300 ) );
 
-	collisionTest({
+	collisionTest( {
 		of: "#scrollx",
 		collision: "fit",
 		within: "#scrollx"
@@ -696,45 +696,45 @@ test( "with scrollbars", function() {
 		top: 90 - scrollbarInfo.height,
 		left: 90 - scrollbarInfo.width
 	}, "auto, with scroll" );
-});
+} );
 
 test( "fractions", function() {
 	expect( 1 );
 
-	$( "#fractions-element" ).position({
+	$( "#fractions-element" ).position( {
 		my: "left top",
 		at: "left top",
 		of: "#fractions-parent",
 		collision: "none"
-	});
+	} );
 	deepEqual( $( "#fractions-element" ).offset(), $( "#fractions-parent" ).offset(), "left top, left top" );
-});
+} );
 
 test( "bug #5280: consistent results (avoid fractional values)", function() {
 	expect( 1 );
 
 	var wrapper = $( "#bug-5280" ),
 		elem = wrapper.children(),
-		offset1 = elem.position({
+		offset1 = elem.position( {
 			my: "center",
 			at: "center",
 			of: wrapper,
 			collision: "none"
-		}).offset(),
-		offset2 = elem.position({
+		} ).offset(),
+		offset2 = elem.position( {
 			my: "center",
 			at: "center",
 			of: wrapper,
 			collision: "none"
-		}).offset();
+		} ).offset();
 	deepEqual( offset1, offset2 );
-});
+} );
 
 test( "bug #8710: flip if flipped position fits more", function() {
 	expect( 3 );
 
 	// Positions a 10px tall element within 99px height at top 90px.
-	collisionTest({
+	collisionTest( {
 		within: "#bug-8710-within-smaller",
 		of: "#parentx",
 		collision: "flip",
@@ -745,7 +745,7 @@ test( "bug #8710: flip if flipped position fits more", function() {
 	}, "flip - top fits all" );
 
 	// Positions a 10px tall element within 99px height at top 92px.
-	collisionTest({
+	collisionTest( {
 		within: "#bug-8710-within-smaller",
 		of: "#parentx",
 		collision: "flip",
@@ -756,7 +756,7 @@ test( "bug #8710: flip if flipped position fits more", function() {
 	}, "flip - top fits more" );
 
 	// Positions a 10px tall element within 101px height at top 92px.
-	collisionTest({
+	collisionTest( {
 		within: "#bug-8710-within-bigger",
 		of: "#parentx",
 		collision: "flip",
@@ -765,6 +765,6 @@ test( "bug #8710: flip if flipped position fits more", function() {
 		top: 92,
 		left: 60
 	}, "no flip - top fits less" );
-});
+} );
 
 } );

From 4b5e616e39f78d235debad7bec0fba1547c0d64d Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 09:35:44 -0400
Subject: [PATCH 21/27] FormRestMixin: Style updates

Ref #14246
---
 tests/unit/form-reset-mixin/core.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/unit/form-reset-mixin/core.js b/tests/unit/form-reset-mixin/core.js
index 14e804643ea..4dbd7ac4255 100644
--- a/tests/unit/form-reset-mixin/core.js
+++ b/tests/unit/form-reset-mixin/core.js
@@ -26,7 +26,7 @@ module( "widget factory", {
 		delete $.ui.testWidget;
 		delete $.fn.testWidget;
 	}
-});
+} );
 
 common.testJshint( "form-reset-mixin" );
 
@@ -38,7 +38,7 @@ asyncTest( "form reset", function() {
 
 	inputs.testWidget();
 	form.on( "reset", function() {
-		setTimeout(function() {
+		setTimeout( function() {
 			deepEqual( $.ui.testWidget.refreshed, [ "input1", "input2", "input3", "input4" ],
 				"All widgets are refreshed on form reset" );
 			equal( form.data( "ui-form-reset-instances" ).length, 4,
@@ -61,7 +61,7 @@ asyncTest( "destroy", function() {
 			.testWidget( "destroy" );
 
 	form.on( "reset", function() {
-		setTimeout(function() {
+		setTimeout( function() {
 			deepEqual( $.ui.testWidget.refreshed, [ "input1", "input3", "input4" ],
 				"All widgets are refreshed on form reset" );
 			deepEqual( form.data( "ui-form-reset-instances" ).length, 3,
@@ -82,7 +82,7 @@ asyncTest( "destroy all", function() {
 		.testWidget( "destroy" );
 
 	form.on( "reset", function() {
-		setTimeout(function() {
+		setTimeout( function() {
 			deepEqual( $.ui.testWidget.refreshed, [], "No widgets are refreshed after destroy" );
 			strictEqual( form.data( "ui-form-reset-instances" ), undefined,
 				"Form data is removed when the last widget instance is destroyed" );

From 948714fb870f7a2aaf5a247e42592ad5abc324df Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 09:36:06 -0400
Subject: [PATCH 22/27] Build: Style updates

Ref #14246
---
 Gruntfile.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 7797b5c777c..0370a9a94c4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -139,7 +139,10 @@ grunt.initConfig({
 	jscs: {
 		all: {
 			options: {
-				requireCapitalizedComments: null
+				requireCapitalizedComments: null,
+				fix: true,
+				maxErrors: 5000000,
+				config: ".jscsrc"
 			},
 			files: {
 				src: [ "demos/**/*.js", "build/**/*.js", "tests/**/*.js", "ui/**/*.js" ]

From f703bd234e363e8d876f5a34cea1ab36cfc771f5 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 22:58:30 -0400
Subject: [PATCH 23/27] Build: squash .jscsrc fixup

---
 .jscsrc                    | 10 ++++++++--
 tests/unit/effects/core.js |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.jscsrc b/.jscsrc
index de0d7420e64..5d6dfd77e6e 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,8 +1,14 @@
 {
 	"preset": "jquery",
 
-	// disabled until `widget_slice` et al are addressed
-	"requireCamelCaseOrUpperCaseIdentifiers": null,
+	// This is currently unenforcable see https://github.com/jscs-dev/node-jscs/issues/1686
+	"requireCapitalizedComments": null,
+
+	// Until we drop IE8 this prevents things like warning on float keyword
+	"es3": true,
+
+	// We want to output all errors
+	"maxErrors": 1000000,
 
 	// Ref https://github.com/jquery/contribute.jquery.org/issues/80#issuecomment-45253460
 	"maximumLineLength": null
diff --git a/tests/unit/effects/core.js b/tests/unit/effects/core.js
index ca7d560340a..866c272eebd 100644
--- a/tests/unit/effects/core.js
+++ b/tests/unit/effects/core.js
@@ -253,7 +253,7 @@ test( "createPlaceholder: preserves layout affecting properties", function() {
 	deepEqual( before.position.top - position, placeholder.position().top, "position top preserved" );
 	deepEqual( before.position.left - position, placeholder.position().left, "position left preserved" );
 
-	deepEqual( before.float, placeholder.css( "float" ), "float preserved" );
+	deepEqual( before[ "float" ], placeholder.css( "float" ), "float preserved" );
 	deepEqual( before.outerWidth, placeholder.outerWidth( true ), "width preserved" );
 	deepEqual( before.outerHeight, placeholder.outerHeight( true ), "height preserved" );
 } );

From 4219332db1b9c27b11c916462fdaa6e13d581f91 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 23:10:52 -0400
Subject: [PATCH 24/27] Spinner: Update to use camelcase identifiers

---
 ui/widgets/spinner.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ui/widgets/spinner.js b/ui/widgets/spinner.js
index a64d46c76bf..381c052bd76 100644
--- a/ui/widgets/spinner.js
+++ b/ui/widgets/spinner.js
@@ -35,7 +35,7 @@
 	}
 }( function( $ ) {
 
-function spinner_modifier( fn ) {
+function spinnerModifer( fn ) {
 	return function() {
 		var previous = this.element.val();
 		fn.apply( this, arguments );
@@ -435,7 +435,7 @@ $.widget( "ui.spinner", {
 		}
 	},
 
-	_setOptions: spinner_modifier( function( options ) {
+	_setOptions: spinnerModifer( function( options ) {
 		this._super( options );
 	} ),
 
@@ -502,7 +502,7 @@ $.widget( "ui.spinner", {
 		this.uiSpinner.replaceWith( this.element );
 	},
 
-	stepUp: spinner_modifier( function( steps ) {
+	stepUp: spinnerModifer( function( steps ) {
 		this._stepUp( steps );
 	} ),
 	_stepUp: function( steps ) {
@@ -512,7 +512,7 @@ $.widget( "ui.spinner", {
 		}
 	},
 
-	stepDown: spinner_modifier( function( steps ) {
+	stepDown: spinnerModifer( function( steps ) {
 		this._stepDown( steps );
 	} ),
 	_stepDown: function( steps ) {
@@ -522,11 +522,11 @@ $.widget( "ui.spinner", {
 		}
 	},
 
-	pageUp: spinner_modifier( function( pages ) {
+	pageUp: spinnerModifer( function( pages ) {
 		this._stepUp( ( pages || 1 ) * this.options.page );
 	} ),
 
-	pageDown: spinner_modifier( function( pages ) {
+	pageDown: spinnerModifer( function( pages ) {
 		this._stepDown( ( pages || 1 ) * this.options.page );
 	} ),
 
@@ -534,7 +534,7 @@ $.widget( "ui.spinner", {
 		if ( !arguments.length ) {
 			return this._parse( this.element.val() );
 		}
-		spinner_modifier( this._value ).call( this, newVal );
+		spinnerModifer( this._value ).call( this, newVal );
 	},
 
 	widget: function() {

From 9737a5fb3f22f319a6968beaee66fe80b34f1983 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 23:11:16 -0400
Subject: [PATCH 25/27] Widget: Update to use camelCase identifiers

---
 ui/widget.js             | 10 +++++-----
 ui/widgets/datepicker.js |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ui/widget.js b/ui/widget.js
index ab062cfb4cf..183d455b606 100644
--- a/ui/widget.js
+++ b/ui/widget.js
@@ -25,8 +25,8 @@
 	}
 }( function( $ ) {
 
-var widget_uuid = 0,
-	widget_slice = Array.prototype.slice;
+var widgetUuid = 0,
+	widgetSlice = Array.prototype.slice;
 
 $.cleanData = ( function( orig ) {
 	return function( elems ) {
@@ -175,7 +175,7 @@ $.widget = function( name, base, prototype ) {
 };
 
 $.widget.extend = function( target ) {
-	var input = widget_slice.call( arguments, 1 ),
+	var input = widgetSlice.call( arguments, 1 ),
 		inputIndex = 0,
 		inputLength = input.length,
 		key,
@@ -207,7 +207,7 @@ $.widget.bridge = function( name, object ) {
 	var fullName = object.prototype.widgetFullName || name;
 	$.fn[ name ] = function( options ) {
 		var isMethodCall = typeof options === "string",
-			args = widget_slice.call( arguments, 1 ),
+			args = widgetSlice.call( arguments, 1 ),
 			returnValue = this;
 
 		if ( isMethodCall ) {
@@ -274,7 +274,7 @@ $.Widget.prototype = {
 	_createWidget: function( options, element ) {
 		element = $( element || this.defaultElement || this )[ 0 ];
 		this.element = $( element );
-		this.uuid = widget_uuid++;
+		this.uuid = widgetUuid++;
 		this.eventNamespace = "." + this.widgetName + this.uuid;
 
 		this.bindings = $();
diff --git a/ui/widgets/datepicker.js b/ui/widgets/datepicker.js
index f5d406eec6a..6ebc6f7e743 100644
--- a/ui/widgets/datepicker.js
+++ b/ui/widgets/datepicker.js
@@ -1,3 +1,4 @@
+/* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
 /*!
  * jQuery UI Datepicker @VERSION
  * http://jqueryui.com

From 97b0e0b800428d9b71b3440e5f9a7d5fdb5a337c Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 23:12:21 -0400
Subject: [PATCH 26/27] Build: Remove requireCamelCaseOrUpperCaseIdentifiers:
 null from jscs

---
 Gruntfile.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 0370a9a94c4..5cb98266ac6 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -135,13 +135,9 @@ grunt.initConfig({
 		}
 	},
 
-	// Remove the requireSpacesInsideParentheses override once everything is fixed
 	jscs: {
 		all: {
 			options: {
-				requireCapitalizedComments: null,
-				fix: true,
-				maxErrors: 5000000,
 				config: ".jscsrc"
 			},
 			files: {

From d83d24f6aaed2f73ef84806ec277ed1ef16dfbd6 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Mon, 24 Aug 2015 23:56:47 -0400
Subject: [PATCH 27/27] Build: bump jscs version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 355bb3a5a93..99f6b2a6028 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
 		"grunt-esformatter": "0.2.0",
 		"grunt-git-authors": "2.0.0",
 		"grunt-html": "4.0.1",
-		"grunt-jscs": "1.5.0",
+		"grunt-jscs": "2.1.0",
 		"load-grunt-tasks": "0.3.0",
 		"rimraf": "2.1.4",
 		"testswarm": "1.1.0"