diff options
Diffstat (limited to 'ui/ui.core.js')
| -rw-r--r-- | ui/ui.core.js | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/ui/ui.core.js b/ui/ui.core.js index 7bafe917a..172968bde 100644 --- a/ui/ui.core.js +++ b/ui/ui.core.js @@ -187,9 +187,21 @@ $.fn.extend({ }, scrollParent: function() { - return $(this).parents().filter(function() { - return (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1)); - }).eq(0); + + var scrollParent; + if(($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) { + scrollParent = this.parents().filter(function() { + return (/(relative|absolute|fixed)/).test($.curCSS(this,'position',1)) && (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1)); + }).eq(0); + } else { + scrollParent = this.parents().filter(function() { + return (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1)); + }).eq(0); + } + + return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent; + + } }); |