jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403755 )
Change subject: PopupToolGroup: Revert "Fix popup direction changing..."
......................................................................
PopupToolGroup: Revert "Fix popup direction changing..."
PopupToolGroup does not mix in FloatableElement. The fix was unnecessary
and actually broke it.
This partially reverts commit a3dfbe7ab046711497cfb07eb6393fff77b855f3.
Bug: T184665
Change-Id: I99caad7babd089c60aae9079ba1a9de749c04709
---
M src/toolgroups/PopupToolGroup.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/toolgroups/PopupToolGroup.js b/src/toolgroups/PopupToolGroup.js
index 3adf7f3..96345dd 100644
--- a/src/toolgroups/PopupToolGroup.js
+++ b/src/toolgroups/PopupToolGroup.js
@@ -211,7 +211,7 @@
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
@@ -219,7 +219,7 @@
.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 ?
--
To view, visit https://gerrit.wikimedia.org/r/403755
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I99caad7babd089c60aae9079ba1a9de749c04709
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Petar.petkovic <[email protected]>
Gerrit-Reviewer: VolkerE <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
