Merge branch 'master' into core-1.6.1

Conflicts:
	demos/menubar/default.html
	tests/unit/autocomplete/autocomplete.html
	tests/visual/effects/effects.all.html
	ui/jquery.ui.menu.js
	ui/jquery.ui.popup.js

1 files changed, 61 insertions, 0 deletions

diff --git a/tests/unit/effects/effects_scale.js b/tests/unit/effects/effects_scale.js
new file mode 100644
index 000000000..1436cd030
--- /dev/null
+++ b/tests/unit/effects/effects_scale.js
@@ -0,0 +1,61 @@
+(function( $ ) {
+module( "effect.scale: Scale" );
+
+function run( position, v, h, vo, ho ) {
+	var desc = "End Position Correct: " + position + " (" + v + "," + h + ") - origin: (" + vo + "," + ho + ")";
+	asyncTest( desc, function() {
+		var test = $( ".testScale" ),
+			css = {
+				position: position
+			},
+			effect = {
+				effect: "scale",
+				mode: "effect",
+				percent: 200,
+				origin: [ vo, ho ],
+				complete: complete,
+				duration: 1
+			},
+			target = {},
+			relative = position === "relative";
+
+		css[ h ] = 33;
+		css[ v ] = 33;
+		target[ h ] = h === ho ? css[ h ] : ho == "center" ? css[ h ] - 35 : css[ h ] - 70;
+		target[ v ] = v === vo ? css[ v ] : vo == "middle" ? css[ v ] - 35 : css[ v ] - 70;
+		if ( relative && h == "right" ) {
+			target[ h ] += 70;
+		}
+		if ( relative && v == "bottom" ) {
+			target[ v ] += 70;
+		}
+		test.css( css );
+		test.effect( effect );
+
+		function complete() {
+			equal( parseInt( test.css( h ), 10 ), target[ h ], "Horizontal Position Correct " + desc );
+			equal( parseInt( test.css( v ), 10 ), target[ v ], "Vertical Position Correct " + desc );
+			start();
+		}
+	});
+}
+
+function suite( position ) {
+	run( position, "top", "left", "top", "left" );
+	run( position, "top", "left", "middle", "center" );
+	run( position, "top", "left", "bottom", "right" );
+	run( position, "bottom", "right", "top", "left" );
+	run( position, "bottom", "right", "middle", "center" );
+	run( position, "bottom", "right", "bottom", "right" );
+}
+
+$(function() {
+	suite( "absolute" );
+	suite( "relative" );
+	$.offset.initialize();
+	if ( $.offset.supportsFixedPosition ) {
+		suite( "fixed" );
+	}
+});
+
+})( jQuery );