Merge branch 'master' into selectmenu

1 files changed, 135 insertions, 245 deletions

diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js
index d9a7038f7..a3f7169f2 100644
--- a/tests/unit/draggable/draggable_options.js
+++ b/tests/unit/draggable/draggable_options.js
@@ -23,10 +23,10 @@ test("{ addClasses: false }", function() {
 
 test("{ appendTo: 'parent' }, default", function() {
 	expect( 2 );
-	var el = $("#draggable2").draggable({ appendTo: 'parent' });
+	var el = $("#draggable2").draggable({ appendTo: "parent" });
 	TestHelpers.draggable.shouldMove(el);
 
-	el = $("#draggable1").draggable({ appendTo: 'parent' });
+	el = $("#draggable1").draggable({ appendTo: "parent" });
 	TestHelpers.draggable.shouldMove(el);
 
 });
@@ -90,7 +90,7 @@ test("{ axis: ? }, unexpected", function() {
 test("{ cancel: 'input,textarea,button,select,option' }, default", function() {
 	expect( 2 );
 
-	$('<div id="draggable-option-cancel-default"><input type="text"></div>').appendTo('#main');
+	$("<div id='draggable-option-cancel-default'><input type='text'></div>").appendTo("#main");
 
 	var el = $("#draggable-option-cancel-default").draggable({ cancel: "input,textarea,button,select,option" });
 	TestHelpers.draggable.shouldMove(el);
@@ -110,7 +110,7 @@ test("{ cancel: 'span' }", function() {
 
 	el.draggable("destroy");
 
-	el = $("#draggable2").draggable({ cancel: 'span' });
+	el = $("#draggable2").draggable({ cancel: "span" });
 	TestHelpers.draggable.testDrag(el, "#draggable2 span", 50, 50, 0, 0);
 });
 
@@ -123,7 +123,7 @@ test("{ cancel: ? }, unexpected", function() {
 			"[]": [],
 			"null": null,
 			"undefined": undefined,
-			"function() {return '';}": function() {return '';},
+			"function() {return '';}": function() {return "";},
 			"function() {return true;}": function() {return true;},
 			"function() {return false;}": function() {return false;}
 		};
@@ -141,13 +141,13 @@ test("{ cancel: ? }, unexpected", function() {
 test("{ containment: false }, default", function() {
 	expect( 1 );
 
-	ok(false, 'missing test - untested code is broken code');
+	ok(false, "missing test - untested code is broken code");
 });
 
 test("{ containment: Element }", function() {
 	expect( 1 );
 
-	ok(false, 'missing test - untested code is broken code');
+	ok(false, "missing test - untested code is broken code");
 });
 */
 
@@ -155,12 +155,12 @@ test("{ containment: 'parent' }, relative", function() {
 	expect( 1 );
 
 	var offsetAfter,
-		el = $("#draggable1").draggable({ containment: 'parent' }),
+		el = $("#draggable1").draggable({ containment: "parent" }),
 		p = el.parent(),
 		po = p.offset(),
 		expected = {
-			left: po.left + TestHelpers.draggable.border(p, 'left') + TestHelpers.draggable.margin(el, 'left'),
-			top: po.top + TestHelpers.draggable.border(p, 'top') + TestHelpers.draggable.margin(el, 'top')
+			left: po.left + TestHelpers.draggable.border(p, "left") + TestHelpers.draggable.margin(el, "left"),
+			top: po.top + TestHelpers.draggable.border(p, "top") + TestHelpers.draggable.margin(el, "top")
 		};
 
 	el.simulate( "drag", {
@@ -168,19 +168,19 @@ test("{ containment: 'parent' }, relative", function() {
 		dy: -100
 	});
 	offsetAfter = el.offset();
-	deepEqual(offsetAfter, expected, 'compare offset to parent');
+	deepEqual(offsetAfter, expected, "compare offset to parent");
 });
 
 test("{ containment: 'parent' }, absolute", function() {
 	expect( 1 );
 
 	var offsetAfter,
-		el = $("#draggable2").draggable({ containment: 'parent' }),
+		el = $("#draggable2").draggable({ containment: "parent" }),
 		p = el.parent(),
 		po = p.offset(),
 		expected = {
-			left: po.left + TestHelpers.draggable.border(p, 'left') + TestHelpers.draggable.margin(el, 'left'),
-			top: po.top + TestHelpers.draggable.border(p, 'top') + TestHelpers.draggable.margin(el, 'top')
+			left: po.left + TestHelpers.draggable.border(p, "left") + TestHelpers.draggable.margin(el, "left"),
+			top: po.top + TestHelpers.draggable.border(p, "top") + TestHelpers.draggable.margin(el, "top")
 		};
 
 	el.simulate( "drag", {
@@ -188,32 +188,32 @@ test("{ containment: 'parent' }, absolute", function() {
 		dy: -100
 	});
 	offsetAfter = el.offset();
-	deepEqual(offsetAfter, expected, 'compare offset to parent');
+	deepEqual(offsetAfter, expected, "compare offset to parent");
 });
 
 /*
 test("{ containment: 'document' }", function() {
 	expect( 1 );
 
-	ok(false, 'missing test - untested code is broken code');
+	ok(false, "missing test - untested code is broken code");
 });
 
 test("{ containment: 'window' }", function() {
 	expect( 1 );
 
-	ok(false, 'missing test - untested code is broken code');
+	ok(false, "missing test - untested code is broken code");
 });
 
 test("{ containment: Selector }", function() {
 	expect( 1 );
 
-	ok(false, 'missing test - untested code is broken code');
+	ok(false, "missing test - untested code is broken code");
 });
 
 test("{ containment: [x1, y1, x2, y2] }", function() {
 	expect( 1 );
 
-	ok(false, 'missing test - untested code is broken code');
+	ok(false, "missing test - untested code is broken code");
 });
 */
 
@@ -270,154 +270,44 @@ test("{ cursor: 'move' }", function() {
 
 });
 
-/*
-test("{ cursorAt: false}, default", function() {
-	expect( 1 );
-
-	ok(false, 'missing test - untested code is broken code');
-});
-*/
-
-test("{ cursorAt: { left: -5, top: -5 } }", function() {
-	expect(4);
-
-	var deltaX = -3, deltaY = -3,
-		offsetX = 5, offsetY = 5,
-		cursorAtX = -5, cursorAtY = -5;
-
-	$.each(['relative', 'absolute'], function(i, position) {
-		var before, pos, expected,
-			el = $('#draggable' + (i + 1)).draggable({
-					cursorAt: { left: cursorAtX, top: cursorAtY },
-					drag: function(event, ui) {
-						equal(ui.offset.left, expected.left, position + ' left');
-						equal(ui.offset.top, expected.top, position + ' top');
-					}
-			});
-
-		before = el.offset();
-		pos = {
-			clientX: before.left + offsetX,
-			clientY: before.top + offsetY
-		};
-		expected = {
-			left: before.left + offsetX - cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset,
-			top: before.top + offsetY - cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset
-		};
-
-		// todo: replace this with simulated drag event
-		el.simulate("mousedown", pos);
-		pos.clientX += deltaX;
-		pos.clientY += deltaY;
-		$(document).simulate("mousemove", pos);
-		el.simulate("mouseup", pos);
-	});
-});
+test( "cursorAt", function() {
+	expect( 24 );
 
-test("{ cursorAt: { right: 10, bottom: 20 } }", function() {
-	expect(4);
-
-	var deltaX = -3, deltaY = -3,
-		offsetX = 5, offsetY = 5,
-		cursorAtX = 10, cursorAtY = 20;
-
-	$.each(['relative', 'absolute'], function(i, position) {
-		var before, pos, expected,
-			el = $('#draggable' + (i + 1)).draggable({
-				cursorAt: { right: cursorAtX, bottom: cursorAtY },
-				drag: function(event, ui) {
-					equal(ui.offset.left, expected.left, position + ' left');
-					equal(ui.offset.top, expected.top, position + ' top');
-				}
-			});
-		before = el.offset();
-		pos = {
-			clientX: before.left + offsetX,
-			clientY: before.top + offsetY
-		};
-		expected = {
-			left: before.left + offsetX - el.width() + cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset,
-			top: before.top + offsetY - el.height() + cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset
+	var deltaX = -3,
+		deltaY = -3,
+		tests = {
+			"false": { cursorAt : false },
+			"{ left: -5, top: -5 }": { x: -5, y: -5, cursorAt : { left: -5, top: -5 } },
+			"[ 10, 20 ]": { x: 10, y: 20, cursorAt : [ 10, 20 ] },
+			"'10 20'": { x: 10, y: 20, cursorAt : "10 20" },
+			"{ left: 20, top: 40 }": { x: 20, y: 40, cursorAt : { left: 20, top: 40 } },
+			"{ right: 10, bottom: 20 }": { x: 10, y: 20, cursorAt : { right: 10, bottom: 20 } }
 		};
 
-		// todo: replace this with simulated drag event
-		el.simulate("mousedown", pos);
-		pos.clientX += deltaX;
-		pos.clientY += deltaY;
-		$(document).simulate("mousemove", pos);
-		el.simulate("mouseup", pos);
-	});
-});
-
-test("{ cursorAt: [10, 20] }", function() {
-	expect(4);
-
-	var deltaX = -3, deltaY = -3,
-		offsetX = 5, offsetY = 5,
-		cursorAtX = 10, cursorAtY = 20;
-
-	$.each(['relative', 'absolute'], function(i, position) {
-		var before, pos, expected,
-			el = $('#draggable' + (i + 1)).draggable({
-				cursorAt: { left: cursorAtX, top: cursorAtY },
-				drag: function(event, ui) {
-					equal(ui.offset.left, expected.left, position + ' left');
-					equal(ui.offset.top, expected.top, position + ' top');
-				}
+	$.each( tests, function( testName, testData ) {
+		$.each( [ "relative", "absolute" ], function( i, position ) {
+			var el = $( "#draggable" + ( i + 1 ) ).draggable({
+					cursorAt: testData.cursorAt,
+					drag: function( event, ui ) {
+						if( !testData.cursorAt ) {
+							equal( ui.position.left - ui.originalPosition.left, deltaX, testName + " " + position + " left" );
+							equal( ui.position.top - ui.originalPosition.top, deltaY, testName + " " + position + " top" );
+						} else if( testData.cursorAt.right ) {
+							equal( ui.helper.width() - ( event.clientX - ui.offset.left ), testData.x - TestHelpers.draggable.unreliableOffset, testName + " " + position + " left" );
+							equal( ui.helper.height() - ( event.clientY - ui.offset.top ), testData.y - TestHelpers.draggable.unreliableOffset, testName + " " +position + " top" );
+						} else {
+							equal( event.clientX - ui.offset.left, testData.x + TestHelpers.draggable.unreliableOffset, testName + " " + position + " left" );
+							equal( event.clientY - ui.offset.top, testData.y + TestHelpers.draggable.unreliableOffset, testName + " " + position + " top" );
+						}
+					}
 			});
 
-		before = el.offset();
-		pos = {
-			clientX: before.left + offsetX,
-			clientY: before.top + offsetY
-		};
-		expected = {
-			left: before.left + offsetX - cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset,
-			top: before.top + offsetY - cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset
-		};
-
-		// todo: replace this with simulated drag event
-		el.simulate("mousedown", pos);
-		pos.clientX += deltaX;
-		pos.clientY += deltaY;
-		$(document).simulate("mousemove", pos);
-		el.simulate("mouseup", pos);
-	});
-});
-
-test("{ cursorAt: '20, 40' }", function() {
-	expect(4);
-
-	var deltaX = -3, deltaY = -3,
-		offsetX = 5, offsetY = 5,
-		cursorAtX = 20, cursorAtY = 40;
-
-	$.each(['relative', 'absolute'], function(i, position) {
-		var before, pos, expected,
-			el = $('#draggable' + (i + 1)).draggable({
-				cursorAt: { left: cursorAtX, top: cursorAtY },
-				drag: function(event, ui) {
-					equal(ui.offset.left, expected.left, position + ' left');
-					equal(ui.offset.top, expected.top, position + ' top');
-				}
+			el.simulate( "drag", {
+				moves: 1,
+				dx: deltaX,
+				dy: deltaY
 			});
-
-		before = el.offset();
-		pos = {
-			clientX: before.left + offsetX,
-			clientY: before.top + offsetY
-		};
-		expected = {
-			left: before.left + offsetX - cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset,
-			top: before.top + offsetY - cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset
-		};
-
-		// todo: replace this with simulated drag event
-		el.simulate("mousedown", pos);
-		pos.clientX += deltaX;
-		pos.clientY += deltaY;
-		$(document).simulate("mousemove", pos);
-		el.simulate("mouseup", pos);
+		});
 	});
 });
 
@@ -425,11 +315,11 @@ test("{ distance: 10 }", function() {
 	expect( 3 );
 
 	var el = $("#draggable2").draggable({ distance: 10 });
-	TestHelpers.draggable.testDrag(el, el, -9, -9, 0, 0, 'distance not met');
+	TestHelpers.draggable.testDrag(el, el, -9, -9, 0, 0, "distance not met");
 
-	TestHelpers.draggable.testDrag(el, el, -10, -10, -10, -10, 'distance met');
+	TestHelpers.draggable.testDrag(el, el, -10, -10, -10, -10, "distance met");
 
-	TestHelpers.draggable.testDrag(el, el, 9, 9, 0, 0, 'distance not met');
+	TestHelpers.draggable.testDrag(el, el, 9, 9, 0, 0, "distance not met");
 
 });
 
@@ -452,7 +342,7 @@ test("{ grid: [50, 50] }, absolute", function() {
 test("{ handle: 'span' }", function() {
 	expect( 2 );
 
-	var el = $("#draggable2").draggable({ handle: 'span' });
+	var el = $("#draggable2").draggable({ handle: "span" });
 
 	TestHelpers.draggable.testDrag(el, "#draggable2 span", 50, 50, 50, 50, "drag span");
 	TestHelpers.draggable.shouldNotMove(el, "drag element");
@@ -478,13 +368,13 @@ test("{ helper: 'original' }, relative, with scroll offset on parent", function(
 	var el = $("#draggable1").draggable({ helper: "original" });
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.testScroll(el, 'relative');
+	TestHelpers.draggable.testScroll(el, "relative");
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.testScroll(el, 'static');
+	TestHelpers.draggable.testScroll(el, "static");
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.testScroll(el, 'absolute');
+	TestHelpers.draggable.testScroll(el, "absolute");
 
 	TestHelpers.draggable.restoreScroll();
 
@@ -495,16 +385,16 @@ test("{ helper: 'original' }, relative, with scroll offset on root", function()
 
 	var el = $("#draggable1").draggable({ helper: "original" });
 
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'relative');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "relative");
 
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'static');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "static");
 
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'absolute');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "absolute");
 
-	TestHelpers.draggable.restoreScroll('root');
+	TestHelpers.draggable.restoreScroll("root");
 
 });
 
@@ -515,19 +405,19 @@ test("{ helper: 'original' }, relative, with scroll offset on root and parent",
 	var el = $("#draggable1").draggable({ helper: "original" });
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'relative');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "relative");
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'static');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "static");
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'absolute');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "absolute");
 
 	TestHelpers.draggable.restoreScroll();
-	TestHelpers.draggable.restoreScroll('root');
+	TestHelpers.draggable.restoreScroll("root");
 
 });
 
@@ -535,16 +425,16 @@ test("{ helper: 'original' }, absolute, with scroll offset on parent", function(
 
 	expect(3);
 
-	var el = $("#draggable1").css({ position: 'absolute', top: 0, left: 0 }).draggable({ helper: "original" });
+	var el = $("#draggable1").css({ position: "absolute", top: 0, left: 0 }).draggable({ helper: "original" });
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.testScroll(el, 'relative');
+	TestHelpers.draggable.testScroll(el, "relative");
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.testScroll(el, 'static');
+	TestHelpers.draggable.testScroll(el, "static");
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.testScroll(el, 'absolute');
+	TestHelpers.draggable.testScroll(el, "absolute");
 
 	TestHelpers.draggable.restoreScroll();
 
@@ -554,18 +444,18 @@ test("{ helper: 'original' }, absolute, with scroll offset on root", function()
 
 	expect(3);
 
-	var el = $("#draggable1").css({ position: 'absolute', top: 0, left: 0 }).draggable({ helper: "original" });
+	var el = $("#draggable1").css({ position: "absolute", top: 0, left: 0 }).draggable({ helper: "original" });
 
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'relative');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "relative");
 
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'static');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "static");
 
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'absolute');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "absolute");
 
-	TestHelpers.draggable.restoreScroll('root');
+	TestHelpers.draggable.restoreScroll("root");
 
 });
 
@@ -573,22 +463,22 @@ test("{ helper: 'original' }, absolute, with scroll offset on root and parent",
 
 	expect(3);
 
-	var el = $("#draggable1").css({ position: 'absolute', top: 0, left: 0 }).draggable({ helper: "original" });
+	var el = $("#draggable1").css({ position: "absolute", top: 0, left: 0 }).draggable({ helper: "original" });
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'relative');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "relative");
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'static');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "static");
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'absolute');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "absolute");
 
 	TestHelpers.draggable.restoreScroll();
-	TestHelpers.draggable.restoreScroll('root');
+	TestHelpers.draggable.restoreScroll("root");
 
 });
 
@@ -596,16 +486,16 @@ test("{ helper: 'original' }, fixed, with scroll offset on parent", function() {
 
 	expect(3);
 
-	var el = $("#draggable1").css({ position: 'fixed', top: 0, left: 0 }).draggable({ helper: "original" });
+	var el = $("#draggable1").css({ position: "fixed", top: 0, left: 0 }).draggable({ helper: "original" });
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.testScroll(el, 'relative');
+	TestHelpers.draggable.testScroll(el, "relative");
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.testScroll(el, 'static');
+	TestHelpers.draggable.testScroll(el, "static");
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.testScroll(el, 'absolute');
+	TestHelpers.draggable.testScroll(el, "absolute");
 
 	TestHelpers.draggable.restoreScroll();
 
@@ -615,40 +505,40 @@ test("{ helper: 'original' }, fixed, with scroll offset on root", function() {
 
 	expect(3);
 
-	var el = $("#draggable1").css({ position: 'fixed', top: 0, left: 0 }).draggable({ helper: "original" });
+	var el = $("#draggable1").css({ position: "fixed", top: 0, left: 0 }).draggable({ helper: "original" });
 
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'relative');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "relative");
 
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'static');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "static");
 
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'absolute');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "absolute");
 
-	TestHelpers.draggable.restoreScroll('root');
+	TestHelpers.draggable.restoreScroll("root");
 });
 
 test("{ helper: 'original' }, fixed, with scroll offset on root and parent", function() {
 
 	expect(3);
 
-	var el = $("#draggable1").css({ position: 'fixed', top: 0, left: 0 }).draggable({ helper: "original" });
+	var el = $("#draggable1").css({ position: "fixed", top: 0, left: 0 }).draggable({ helper: "original" });
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'relative');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "relative");
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'static');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "static");
 
 	TestHelpers.draggable.setScroll();
-	TestHelpers.draggable.setScroll('root');
-	TestHelpers.draggable.testScroll(el, 'absolute');
+	TestHelpers.draggable.setScroll("root");
+	TestHelpers.draggable.testScroll(el, "absolute");
 
 	TestHelpers.draggable.restoreScroll();
-	TestHelpers.draggable.restoreScroll('root');
+	TestHelpers.draggable.restoreScroll("root");
 
 });
 
@@ -666,7 +556,7 @@ test("{ helper: 'clone' }, absolute", function() {
 		dx: 1,
 		dy: 1
 	});
-	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[1, 1] ');
+	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, "dragged[1, 1] ");
 
 });
 
@@ -681,29 +571,29 @@ test("{ helper: 'clone' }, absolute with scroll offset on parent", function() {
 			helperOffset = ui.helper.offset();
 		} });
 
-	$("#main").css('position', 'relative');
+	$("#main").css("position", "relative");
 	origOffset = $("#draggable1").offset();
 	el.simulate( "drag", {
 		dx: 1,
 		dy: 1
 	});
-	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[1, 1] ');
+	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, "dragged[1, 1] ");
 
-	$("#main").css('position', 'static');
+	$("#main").css("position", "static");
 	origOffset = $("#draggable1").offset();
 	el.simulate( "drag", {
 		dx: 1,
 		dy: 1
 	});
-	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[1, 1] ');
+	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, "dragged[1, 1] ");
 
-	$("#main").css('position', 'absolute');
+	$("#main").css("position", "absolute");
 	origOffset = $("#draggable1").offset();
 	el.simulate( "drag", {
 		dx: 1,
 		dy: 1
 	});
-	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[1, 1] ');
+	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, "dragged[1, 1] ");
 
 	TestHelpers.draggable.restoreScroll();
 
@@ -713,38 +603,38 @@ test("{ helper: 'clone' }, absolute with scroll offset on root", function() {
 
 	expect(3);
 
-	TestHelpers.draggable.setScroll('root');
+	TestHelpers.draggable.setScroll("root");
 	var helperOffset = null,
 		origOffset = null,
 		el = $("#draggable1").draggable({ helper: "clone", drag: function(event, ui) {
 			helperOffset = ui.helper.offset();
 		} });
 
-	$("#main").css('position', 'relative');
+	$("#main").css("position", "relative");
 	origOffset = $("#draggable1").offset();
 	el.simulate( "drag", {
 		dx: 1,
 		dy: 1
 	});
-	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[1, 1] ');
+	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, "dragged[1, 1] ");
 
-	$("#main").css('position', 'static');
+	$("#main").css("position", "static");
 	origOffset = $("#draggable1").offset();
 	el.simulate( "drag", {
 		dx: 1,
 		dy: 1
 	});
-	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[1, 1] ');
+	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, "dragged[1, 1] ");
 
-	$("#main").css('position', 'absolute');
+	$("#main").css("position", "absolute");
 	origOffset = $("#draggable1").offset();
 	el.simulate( "drag", {
 		dx: 1,
 		dy: 1
 	});
-	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[1, 1] ');
+	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, "dragged[1, 1] ");
 
-	TestHelpers.draggable.restoreScroll('root');
+	TestHelpers.draggable.restoreScroll("root");
 
 });
 
@@ -752,7 +642,7 @@ test("{ helper: 'clone' }, absolute with scroll offset on root and parent", func
 
 	expect(3);
 
-	TestHelpers.draggable.setScroll('root');
+	TestHelpers.draggable.setScroll("root");
 	TestHelpers.draggable.setScroll();
 
 	var helperOffset = null,
@@ -761,31 +651,31 @@ test("{ helper: 'clone' }, absolute with scroll offset on root and parent", func
 			helperOffset = ui.helper.offset();
 		} });
 
-	$("#main").css('position', 'relative');
+	$("#main").css("position", "relative");
 	origOffset = $("#draggable1").offset();
 	el.simulate( "drag", {
 		dx: 1,
 		dy: 1
 	});
-	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[1, 1] ');
+	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, "dragged[1, 1] ");
 
-	$("#main").css('position', 'static');
+	$("#main").css("position", "static");
 	origOffset = $("#draggable1").offset();
 	el.simulate( "drag", {
 		dx: 1,
 		dy: 1
 	});
-	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[1, 1] ');
+	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, "dragged[1, 1] ");
 
-	$("#main").css('position', 'absolute');
+	$("#main").css("position", "absolute");
 	origOffset = $("#draggable1").offset();
 	el.simulate( "drag", {
 		dx: 1,
 		dy: 1
 	});
-	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[1, 1] ');
+	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, "dragged[1, 1] ");
 
-	TestHelpers.draggable.restoreScroll('root');
+	TestHelpers.draggable.restoreScroll("root");
 	TestHelpers.draggable.restoreScroll();
 
 });