diff options
| author | George Marshall <echosx@gmail.com> | 2011-02-01 18:52:17 -0800 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-02-02 14:15:19 -0500 |
| commit | d6fa44a0b4c5bf08f31040f9008e8fb54b36db02 (patch) | |
| tree | adad199132eb189efb17c8dfee94045762f54f7b /ui/jquery.ui.resizable.js | |
| parent | d4e715f4bc82f7020bc26808abfd5e1b9a174d7f (diff) | |
| download | jquery-ui-d6fa44a0b4c5bf08f31040f9008e8fb54b36db02.tar.gz jquery-ui-d6fa44a0b4c5bf08f31040f9008e8fb54b36db02.zip | |
Resizable: Changed the way box size is determined when using a helper. Fixed #6926 - Window doesn't change to size that helper shows when snapping to grid
(cherry picked from commit 002f9a2629b906983c0b9edaffa0f7b9b5e457f5)
Diffstat (limited to 'ui/jquery.ui.resizable.js')
| -rw-r--r-- | ui/jquery.ui.resizable.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js index 38d543d20..1e1706a9d 100644 --- a/ui/jquery.ui.resizable.js +++ b/ui/jquery.ui.resizable.js @@ -322,10 +322,10 @@ $.widget("ui.resizable", $.ui.mouse, { if(this._helper) { var pr = this._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName), - soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height, - soffsetw = ista ? 0 : self.sizeDiff.width; + soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height, + soffsetw = ista ? 0 : self.sizeDiff.width; - var s = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) }, + var s = { width: (self.helper.width() - soffsetw), height: (self.helper.height() - soffseth) }, left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null, top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null; |