From e50bbe8e8e569750f622d7c3c221def17cffa0db Mon Sep 17 00:00:00 2001 From: Moriel Schottlender Date: Mon, 6 Mar 2017 12:26:43 -0800 Subject: [PATCH] RCFilters UI: Fix scrolling behavior on search/popup Bug: T158018 Change-Id: I7278f34018721e7631ed3f9307e093bd55ff7d24 --- .../ui/mw.rcfilters.ui.FilterWrapperWidget.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js index 7da97a1bd3..886dc43a6c 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js @@ -186,11 +186,12 @@ */ mw.rcfilters.ui.FilterWrapperWidget.prototype.scrollToTop = function ( $element, marginFromTop ) { var container = OO.ui.Element.static.getClosestScrollableContainer( $element[ 0 ], 'y' ), - pos = OO.ui.Element.static.getRelativePosition( $element, $( container ) ); + pos = OO.ui.Element.static.getRelativePosition( $element, $( container ) ), + containerScrollTop = $( container ).is( 'body' ) ? 0 : $( container ).scrollTop(); // Scroll to item $( container ).animate( { - scrollTop: $( container ).scrollTop() + pos.top + ( marginFromTop || 0 ) + scrollTop: containerScrollTop + pos.top - ( marginFromTop || 0 ) } ); }; }( mediaWiki ) ); -- 2.20.1