r2376 - merged to /branches/1.6, trunk r2107 - Resizable - Left Margin Calculated Incorrectly (Us...
Author: scott.gonzalez
Date: Tue Mar 24 17:33:57 2009
New Revision: 2376
Modified:
branches/1.6/ui/ui.resizable.js
Log:
merged to /branches/1.6, trunk r2107 - Resizable - Left Margin Calculated
Incorrectly (Using Containment) - Fixed #3882
Modified: branches/1.6/ui/ui.resizable.js
==============================================================================
--- branches/1.6/ui/ui.resizable.js (original)
+++ branches/1.6/ui/ui.resizable.js Tue Mar 24 17:33:57 2009
@@ -716,6 +716,11 @@
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 );
+ var isParent = self.containerElement.get(0) ==
self.element.parent().get(0),
+ isOffsetRelative = /relative|
absolute/.test(self.containerElement.css('position'));
+
+ if(isParent && isOffsetRelative) woset -= self.parentData.left;
+
if (woset + self.size.width >= self.parentData.width) {
self.size.width = self.parentData.width - woset;
if (pRatio) self.size.height = self.size.width / o.aspectRatio;