r2299 - Fixed #4199 (resizable with containment boundary - aspectRatio breaks.) with patch from #...

r2299 - Fixed #4199 (resizable with containment boundary - aspectRatio breaks.) with patch from #...


Author: rdworth
Date: Tue Mar 17 04:20:31 2009
New Revision: 2299
Modified:
trunk/ui/ui.resizable.js
Log:
Fixed #4199 (resizable with containment boundary - aspectRatio breaks.)
with patch from #4349 (Resizable with Containment Aspect Ratio Bug
(Includes patching instructions)) props tcarnell and garside
Modified: trunk/ui/ui.resizable.js
==============================================================================
--- trunk/ui/ui.resizable.js    (original)
+++ trunk/ui/ui.resizable.js    Tue Mar 17 04:20:31 2009
@@ -677,7 +677,7 @@
    resize: function(event, ui) {
        var self = $(this).data("resizable"), o = self.options,
                ps = self.containerSize, co = self.containerOffset, cs = self.size, cp
= self.position,
-                pRatio = o._aspectRatio || event.shiftKey, cop = { top:0, left:0 }, ce
= self.containerElement;
+                pRatio = self._aspectRatio || event.shiftKey, cop = { top:0, left:0 },
ce = self.containerElement;
        if (ce[0] != document && (/static/).test(ce.css('position'))) cop = co;
@@ -706,12 +706,12 @@
        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;
+            if (pRatio) self.size.height = self.size.width / self.aspectRatio;
        }
        if (hoset + self.size.height >= self.parentData.height) {
            self.size.height = self.parentData.height - hoset;
-            if (pRatio) self.size.width = self.size.height * o.aspectRatio;
+            if (pRatio) self.size.width = self.size.height * self.aspectRatio;
        }
    },