diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2012-03-14 13:42:48 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2012-03-14 13:42:48 -0400 |
| commit | 682a321d1e4b80835a860f82fb686cff4943982b (patch) | |
| tree | 6f49b28f40fb952977cdfbccb80dd553640dea4b /ui/jquery.ui.resizable.js | |
| parent | 94f85149db2a8b2540f9b204c14d57d8b087fbf6 (diff) | |
| parent | ec062c1156d58726dc212e6e2191ee7196302c44 (diff) | |
| download | jquery-ui-682a321d1e4b80835a860f82fb686cff4943982b.tar.gz jquery-ui-682a321d1e4b80835a860f82fb686cff4943982b.zip | |
Merge branch 'master' into selectmenu
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 34efe834a..77fe8bcc1 100644 --- a/ui/jquery.ui.resizable.js +++ b/ui/jquery.ui.resizable.js @@ -1,7 +1,7 @@ /* * jQuery UI Resizable @VERSION * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -688,13 +688,13 @@ $.ui.plugin.add("resizable", "containment", { if (cp.left < (self._helper ? co.left : 0)) { self.size.width = self.size.width + (self._helper ? (self.position.left - co.left) : (self.position.left - cop.left)); - if (pRatio) self.size.height = self.size.width / o.aspectRatio; + if (pRatio) self.size.height = self.size.width / self.aspectRatio; self.position.left = o.helper ? co.left : 0; } if (cp.top < (self._helper ? co.top : 0)) { self.size.height = self.size.height + (self._helper ? (self.position.top - co.top) : self.position.top); - if (pRatio) self.size.width = self.size.height * o.aspectRatio; + if (pRatio) self.size.width = self.size.height * self.aspectRatio; self.position.top = self._helper ? co.top : 0; } |