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

This commit is contained in:
Richard Worth 2009-03-17 11:20:31 +00:00
parent 42789bb2e4
commit 765e7b25bf

View File

@ -677,7 +677,7 @@ $.ui.plugin.add("resizable", "containment", {
resize: function(event, ui) { resize: function(event, ui) {
var self = $(this).data("resizable"), o = self.options, var self = $(this).data("resizable"), o = self.options,
ps = self.containerSize, co = self.containerOffset, cs = self.size, cp = self.position, 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; if (ce[0] != document && (/static/).test(ce.css('position'))) cop = co;
@ -706,12 +706,12 @@ $.ui.plugin.add("resizable", "containment", {
if (woset + self.size.width >= self.parentData.width) { if (woset + self.size.width >= self.parentData.width) {
self.size.width = self.parentData.width - woset; 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) { if (hoset + self.size.height >= self.parentData.height) {
self.size.height = self.parentData.height - hoset; 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;
} }
}, },