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

Wait until search panel is shown before setting a search query

Browse source 
Bug: T151659
Change-Id: I3eb3b903a8df1c7732da2a08e4b46b13b162617e
This commit is contained in:
Ed Sanders 2016-11-29 16:19:06 +00:00 committed by James D. Forrester
parent ba232c9f75
commit 44fee9b61d
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
View file

@ -262,24 +262,11 @@ ve.ui.MWGalleryDialog.prototype.getSetupProcess = function ( data ) {
var titlesString, title, titleText, imageTitles, mode,
caption, widths, heights, perrow,
showFilename, classes, styles,
pageTitle, namespace, namespacesWithSubpages, namespaceIds,
namespaceIds = mw.config.get( 'wgNamespaceIds' ),
dialog = this,
attributes = this.selectedNode && this.selectedNode.getAttribute( 'mw' ).attrs;
// Images card
// First set the search widget input value to the page title
pageTitle = mw.config.get( 'wgTitle' );
namespace = mw.config.get( 'wgNamespaceNumber' );
namespacesWithSubpages = mw.config.get( 'wgVisualEditorConfig' ).namespacesWithSubpages;
namespaceIds = mw.config.get( 'wgNamespaceIds' );
if ( namespacesWithSubpages[ namespace ] ) {
pageTitle = pageTitle.slice( pageTitle.lastIndexOf( '/' ) + 1 );
}
this.searchWidget.getQuery().setValue( pageTitle );
// If editing an existing gallery, populate with the images...
if ( this.selectedNode ) {
imageTitles = [];
@ -578,6 +565,8 @@ ve.ui.MWGalleryDialog.prototype.onShowSearchPanelButtonClick = function () {
* @param {boolean} visible The search panel is visible
*/
ve.ui.MWGalleryDialog.prototype.toggleSearchPanel = function ( visible ) {
var pageTitle, namespace, namespacesWithSubpages;
visible = visible !== undefined ? visible : !this.searchPanelVisible;
// If currently visible panel is an edit panel, store the caption
@ -598,6 +587,20 @@ ve.ui.MWGalleryDialog.prototype.toggleSearchPanel = function ( visible ) {
if ( !visible ) {
this.highlightedCaptionInput.focus();
} else {
if ( !this.searchWidget.getQuery().getValue() ) {
// Wait until the search panel is visible before setting a default query
// as this triggers a request and render.
pageTitle = mw.config.get( 'wgTitle' );
namespace = mw.config.get( 'wgNamespaceNumber' );
namespacesWithSubpages = mw.config.get( 'wgVisualEditorConfig' ).namespacesWithSubpages;
if ( namespacesWithSubpages[ namespace ] ) {
pageTitle = pageTitle.slice( pageTitle.lastIndexOf( '/' ) + 1 );
}
this.searchWidget.getQuery().setValue( pageTitle );
}
this.searchWidget.getQuery().focus().select();
}
this.updateDialogSize();