diff options
author | kborchers <kris.borchers@gmail.com> | 2011-12-01 12:53:35 -0600 |
---|---|---|
committer | kborchers <kris.borchers@gmail.com> | 2011-12-01 12:53:35 -0600 |
commit | 490dc4d36b6a0bf1dac5d8a9ba86aef7c9c27ee9 (patch) | |
tree | e65043eb657d9232888dcc1435bdd6907f990d15 /ui/jquery.ui.resizable.js | |
parent | e206e549352684a4c30ad53e38c5544599328f2d (diff) | |
parent | ce7918fc73c161ab237f052bad070e34250526be (diff) | |
download | jquery-ui-490dc4d36b6a0bf1dac5d8a9ba86aef7c9c27ee9.tar.gz jquery-ui-490dc4d36b6a0bf1dac5d8a9ba86aef7c9c27ee9.zip |
Merge branch 'master' into menubar_otherStructures
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); |