From: James D. Forrester <jforrester@wikimedia.org>
Date: Fri, 12 Jan 2018 16:56:02 +0000 (-0800)
Subject: OOUI: Manually pull in fix from I99caad7b ahead of the release cycle
X-Git-Tag: 1.31.0-rc.0~912^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=383b11363bf1eb3107918a50603534f055d426e5

OOUI: Manually pull in fix from I99caad7b ahead of the release cycle

The .map file will be wrong, but those aren't used outside of an
experimental branch yet, so it's not the end of the world.

Bug: T184665
Change-Id: I9ff1ed80496ec61b836de4221dd36cde6d4a71ac
---

diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars.js b/resources/lib/oojs-ui/oojs-ui-toolbars.js
index 59d647493b..1b57f09e0b 100644
--- a/resources/lib/oojs-ui/oojs-ui-toolbars.js
+++ b/resources/lib/oojs-ui/oojs-ui-toolbars.js
@@ -1978,7 +1978,7 @@ OO.ui.PopupToolGroup.prototype.setActive = function ( value ) {
 			this.$element.addClass( 'oo-ui-popupToolGroup-active oo-ui-popupToolGroup-left' );
 			this.setFlags( { progressive: true } );
 			this.toggleClipping( true );
-			if ( this.isClippedHorizontally() || this.isFloatableOutOfView() ) {
+			if ( this.isClippedHorizontally() ) {
 				// Anchoring to the left caused the popup to clip, so anchor it to the right instead
 				this.toggleClipping( false );
 				this.$element
@@ -1986,7 +1986,7 @@ OO.ui.PopupToolGroup.prototype.setActive = function ( value ) {
 					.addClass( 'oo-ui-popupToolGroup-right' );
 				this.toggleClipping( true );
 			}
-			if ( this.isClippedHorizontally() || this.isFloatableOutOfView() ) {
+			if ( this.isClippedHorizontally() ) {
 				// Anchoring to the right also caused the popup to clip, so just make it fill the container
 				containerWidth = this.$clippableScrollableContainer.width();
 				containerLeft = this.$clippableScrollableContainer[ 0 ] === document.documentElement ?