From: Eduardo Lundgren <eduardolundgren@gmail.com>
Date: Wed, 31 Dec 2008 00:11:03 +0000 (+0000)
Subject: Resizable containment acurrate - Fixed #3714
X-Git-Tag: 1.6rc3~64
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5a375537c4e47054db8a92b71114337900894369;p=jquery-ui.git

Resizable containment acurrate - Fixed #3714
---

diff --git a/ui/ui.resizable.js b/ui/ui.resizable.js
index 8a56ba9df..d437f1a99 100644
--- a/ui/ui.resizable.js
+++ b/ui/ui.resizable.js
@@ -699,10 +699,10 @@ $.ui.plugin.add("resizable", "containment", {
 		if (ce[0] != document && (/static/).test(ce.css('position')))
 			cop = self.containerPosition;
 
-		if (cp.left < (o.helper ? co.left : cop.left)) {
+		if (cp.left < (o.helper ? co.left : 0)) {
 			self.size.width = self.size.width + (o.helper ? (self.position.left - co.left) : (self.position.left - cop.left));
 			if (pRatio) self.size.height = self.size.width / o.aspectRatio;
-			self.position.left = o.helper ? co.left : cop.left;
+			self.position.left = o.helper ? co.left : 0;
 		}
 
 		if (cp.top < (o.helper ? co.top : 0)) {
@@ -711,8 +711,8 @@ $.ui.plugin.add("resizable", "containment", {
 			self.position.top = o.helper ? co.top : 0;
 		}
 
-		var woset = (o.helper ? self.offset.left - co.left : (self.position.left - cop.left)) + self.sizeDiff.width,
-					hoset = (o.helper ? self.offset.top - co.top : self.position.top) + self.sizeDiff.height;
+		var woset = Math.abs( (o.helper ? self.offset.left - cop.left : (self.offset.left - cop.left)) + self.sizeDiff.width ),
+					hoset = Math.abs( (o.helper ? self.offset.top - cop.top : (self.offset.top - co.top)) + self.sizeDiff.height );
 
 		if (woset + self.size.width >= self.parentData.width) {
 			self.size.width = self.parentData.width - woset;
@@ -729,13 +729,13 @@ $.ui.plugin.add("resizable", "containment", {
 		var o = ui.options, self = $(this).data("resizable"), cp = self.position,
 				co = self.containerOffset, cop = self.containerPosition, ce = self.containerElement;
 
-		var helper = $(self.helper), ho = helper.offset(), w = helper.innerWidth(), h = helper.innerHeight();
+		var helper = $(self.helper), ho = helper.offset(), w = helper.outerWidth() - self.sizeDiff.width, h = helper.outerHeight() - self.sizeDiff.height;
 
 		if (o.helper && !o.animate && (/relative/).test(ce.css('position')))
-			$(this).css({ left: (ho.left - co.left), top: (ho.top - co.top), width: w, height: h });
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
 
 		if (o.helper && !o.animate && (/static/).test(ce.css('position')))
-			$(this).css({ left: cop.left + (ho.left - co.left), top: cop.top + (ho.top - co.top), width: w, height: h });
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
 
 	}
 });