merge with master and resolve more conflicts

1 files changed, 27 insertions, 1 deletions

diff --git a/test/unit/offset.js b/test/unit/offset.js
index a346b657c..f7bda29be 100644
--- a/test/unit/offset.js
+++ b/test/unit/offset.js
@@ -433,7 +433,33 @@ test("offsetParent", function(){
 	equals( div[1], jQuery("#nothiddendiv")[0], "The div is the offsetParent." );
 });
 
-function testoffset( name, fn ) {
+test("fractions (see #7730 and #7885)", function() {
+	expect(2);
+	
+	jQuery('body').append('<div id="fractions"/>');
+	
+	var expected = { top: 1000, left: 1000 };
+	var div = jQuery('#fractions');
+	
+	div.css({
+		position: 'absolute',
+		left: '1000.7432222px',
+		top: '1000.532325px',
+		width: 100,
+		height: 100
+	});
+	
+	div.offset(expected);
+	
+	var result = div.offset();
+
+	equals( result.top, expected.top, "Check top" );
+	equals( result.left, expected.left, "Check left" );
+	
+	div.remove();
+});
+
+function testoffset(name, fn) {
 
 	test(name, function() {
 		// pause execution for now