From: Moriel Schottlender <moriel@gmail.com>
Date: Mon, 6 Mar 2017 20:26:43 +0000 (-0800)
Subject: RCFilters UI: Fix scrolling behavior on search/popup
X-Git-Tag: 1.31.0-rc.0~3881^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=e50bbe8e8e569750f622d7c3c221def17cffa0db;p=lhc%2Fweb%2Fwiklou.git

RCFilters UI: Fix scrolling behavior on search/popup

Bug: T158018
Change-Id: I7278f34018721e7631ed3f9307e093bd55ff7d24
---

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 ) );