wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 02:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Focus the input after switching to the content pane"

Browse source
This commit is contained in:
jenkins-bot 2022-07-06 14:19:41 +00:00 committed by Gerrit Code Review
parent f93527e00f b20b5dbe9d
commit 9754f8fd8f
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
View file

@ -371,6 +371,9 @@ ve.ui.MWTransclusionDialog.prototype.toggleSidebar = function ( expandSidebar )
dialog.sidebar.setSelectionByPageName( name );
} else {
selectedPage.scrollElementIntoView( { alignToTop: true, padding: { top: 20 } } );
if ( !OO.ui.isMobile() ) {
selectedPage.focus();
}
}
}, OO.ui.theme.getDialogTransitionDuration() );
}

6
modules/ve-mw/ui/layouts/ve.ui.MWTwoPaneTransclusionDialogLayout.js
View file

@ -133,8 +133,10 @@ ve.ui.MWTwoPaneTransclusionDialogLayout.prototype.focus = function () {
if ( !page ) {
return;
}
// Only change the focus if is not already in the current page
if ( !OO.ui.contains( page.$element[ 0 ], this.getElementDocument().activeElement, true ) ) {
// Only change the focus if it's visible and is not already the current page
if ( page.$element[ 0 ].offsetParent !== null &&
!OO.ui.contains( page.$element[ 0 ], this.getElementDocument().activeElement, true )
) {
page.focus();
}
};