From 383b11363bf1eb3107918a50603534f055d426e5 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Fri, 12 Jan 2018 08:56:02 -0800 Subject: [PATCH] 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 --- resources/lib/oojs-ui/oojs-ui-toolbars.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ? -- 2.20.1