Merge branch 'master' of github.com:jquery/jquery-ui

jquery · Mar 27, 2010 · c49be0be1a57cac325f021ffddc2f0fbccde1553 · c49be0b
2 parents 551fa98 + a0f754f
commit c49be0be1a57cac325f021ffddc2f0fbccde1553
Unified Split

Showing with 26 additions and 0 deletions.

+4 −0 tests/unit/position/position.html

+18 −0 tests/unit/position/position_core.js

+4 −0 ui/jquery.ui.position.js
diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
@@ -43,5 +43,9 @@ <h2 id="qunit-userAgent"></h2>
 
 <div style="position: absolute; height: 5000px; width: 5000px;"></div>
 
+<div id="bug-5280" style="height: 30px; width: 201px;">
+	<div style="width: 50px; height: 10px;"></div>
+</div>
+
 </body>
 </html>
diff --git a/tests/unit/position/position_core.js b/tests/unit/position/position_core.js
@@ -330,4 +330,22 @@ test("collision: none, with offset", function() {
 	}, { top: -13, left: -12 }, "left top, negative offset");
 });
 
+//test('bug #5280: consistent results (avoid fractional values)', function() {
+//	var wrapper = $('#bug-5280'),
+//		elem = wrapper.children(),
+//		offset1 = elem.position({
+//			my: 'center',
+//			at: 'center',
+//			of: wrapper,
+//			collision: 'none'
+//		}).offset(),
+//		offset2 = elem.position({
+//			my: 'center',
+//			at: 'center',
+//			of: wrapper,
+//			collision: 'none'
+//		}).offset();
+//	same(offset1, offset2);
+//});
+
 })(jQuery);
diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js
@@ -113,6 +113,10 @@ $.fn.position = function( options ) {
 			position.top -= elemHeight / 2;
 		}
 
+		// prevent fractions (see #5280)
+		position.left = parseInt( position.left );
+		position.top = parseInt( position.top );
+
 		$.each( [ "left", "top" ], function( i, dir ) {
 			if ( $.ui.position[ collision[i] ] ) {
 				$.ui.position[ collision[i] ][ dir ]( position, {