diff options
| author | Felix Nagel <info@felixnagel.com> | 2013-01-02 19:38:55 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2013-01-02 19:38:55 +0100 |
| commit | 1ba02e9c5fc96bfcdd82e6a72369f54a30a47ecb (patch) | |
| tree | e21226ccc9b62a6a4a03fd4b7c7d62b889bd6aa7 /ui/jquery.ui.core.js | |
| parent | 2eb92232f3c0fa7b6643dce9197dae48f5b174ef (diff) | |
| parent | 18b8ffd796ba557a7c939d67a1551b54402a7eb9 (diff) | |
| download | jquery-ui-1ba02e9c5fc96bfcdd82e6a72369f54a30a47ecb.tar.gz jquery-ui-1ba02e9c5fc96bfcdd82e6a72369f54a30a47ecb.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, 4 insertions, 4 deletions
diff --git a/ui/jquery.ui.core.js b/ui/jquery.ui.core.js index 694cb1bef..b5a4fd756 100644 --- a/ui/jquery.ui.core.js +++ b/ui/jquery.ui.core.js @@ -69,17 +69,17 @@ $.fn.extend({ scrollParent: function() { var scrollParent; - if (($.ui.ie && (/(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')); + return (/(relative|absolute|fixed)/).test($.css(this,"position")) && (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x")); }).eq(0); } else { scrollParent = this.parents().filter(function() { - return (/(auto|scroll)/).test($.css(this,'overflow')+$.css(this,'overflow-y')+$.css(this,'overflow-x')); + return (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x")); }).eq(0); } - return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent; + return (/fixed/).test(this.css("position")) || !scrollParent.length ? $(document) : scrollParent; }, zIndex: function( zIndex ) { |