diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-10-12 22:56:45 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-10-12 22:56:45 +0200 |
| commit | c59fbbaad74f7bee73b57985570f689c9a5d9383 (patch) | |
| tree | 89209c996ac48c84a0ce20e77061eaef04f87d6c /ui/jquery.ui.core.js | |
| parent | fc729a8c8ebfbe9c05f8b1ebbd6629898f3fc6c0 (diff) | |
| parent | 94221c4e5b11496ef927889e1541d84b5746fb31 (diff) | |
| download | jquery-ui-c59fbbaad74f7bee73b57985570f689c9a5d9383.tar.gz jquery-ui-c59fbbaad74f7bee73b57985570f689c9a5d9383.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.core.js')
| -rw-r--r-- | ui/jquery.ui.core.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ui/jquery.ui.core.js b/ui/jquery.ui.core.js index bb9411dc9..e569eea42 100644 --- a/ui/jquery.ui.core.js +++ b/ui/jquery.ui.core.js @@ -69,7 +69,7 @@ $.fn.extend({ scrollParent: function() { var scrollParent; - if (($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) { + if (($.ui.ie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) { scrollParent = this.parents().filter(function() { return (/(relative|absolute|fixed)/).test($.css(this,'position')) && (/(auto|scroll)/).test($.css(this,'overflow')+$.css(this,'overflow-y')+$.css(this,'overflow-x')); }).eq(0); @@ -258,6 +258,12 @@ $(function() { // deprecated +(function() { + var uaMatch = /msie ([\w.]+)/.exec( navigator.userAgent.toLowerCase() ) || []; + $.ui.ie = uaMatch.length ? true : false; + $.ui.ie6 = parseFloat( uaMatch[ 1 ], 10 ) === 6; +})(); + $.fn.extend({ disableSelection: function() { return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) + |