diff options
author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-11-18 17:13:28 +0100 |
---|---|---|
committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-11-18 17:13:28 +0100 |
commit | d6e4d4705d3d3be01ab92ea4f07a52a59ba10b5a (patch) | |
tree | 185bf6282643a667a1e69837b106249156f71952 /ui/jquery.ui.resizable.js | |
parent | 26603de5bafb4fe9e824b28d8f799ed0f7e0604f (diff) | |
parent | 66f9e12797c16d8fa9078f45401f08f0f200e1bc (diff) | |
download | jquery-ui-d6e4d4705d3d3be01ab92ea4f07a52a59ba10b5a.tar.gz jquery-ui-d6e4d4705d3d3be01ab92ea4f07a52a59ba10b5a.zip |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.resizable.js')
-rw-r--r-- | ui/jquery.ui.resizable.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js index 673a8fd75..baca11f83 100644 --- a/ui/jquery.ui.resizable.js +++ b/ui/jquery.ui.resizable.js @@ -292,7 +292,7 @@ $.widget("ui.resizable", $.ui.mouse, { if (!trigger) return false; // Calculate the attrs that will be change - var data = trigger.apply(this, [event, dx, dy]), ie6 = $.browser.msie && $.browser.version < 7, csdif = this.sizeDiff; + var data = trigger.apply(this, [event, dx, dy]); // Put this in the mouseDrag handler since the user can start pressing shift while resizing this._updateVirtualBoundaries(event.shiftKey); |