aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.resizable.js
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2012-10-12 22:56:45 +0200
committerFelix Nagel <info@felixnagel.com>2012-10-12 22:56:45 +0200
commitc59fbbaad74f7bee73b57985570f689c9a5d9383 (patch)
tree89209c996ac48c84a0ce20e77061eaef04f87d6c /ui/jquery.ui.resizable.js
parentfc729a8c8ebfbe9c05f8b1ebbd6629898f3fc6c0 (diff)
parent94221c4e5b11496ef927889e1541d84b5746fb31 (diff)
downloadjquery-ui-c59fbbaad74f7bee73b57985570f689c9a5d9383.tar.gz
jquery-ui-c59fbbaad74f7bee73b57985570f689c9a5d9383.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.resizable.js')
-rw-r--r--ui/jquery.ui.resizable.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
index 724ae9ddf..cc82b8b92 100644
--- a/ui/jquery.ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -466,8 +466,8 @@ $.widget("ui.resizable", $.ui.mouse, {
this.helper = this.helper || $('<div style="overflow:hidden;"></div>');
// fix ie6 offset TODO: This seems broken
- var ie6 = $.browser.msie && $.browser.version < 7, ie6offset = (ie6 ? 1 : 0),
- pxyoffset = ( ie6 ? 2 : -1 );
+ var ie6offset = ($.ui.ie6 ? 1 : 0),
+ pxyoffset = ( $.ui.ie6 ? 2 : -1 );
this.helper.addClass(this._helper).css({
width: this.element.outerWidth() + pxyoffset,