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

DesktopArticleTarget: Only try to show notices if some exist

Browse source 
This avoids an OOui deprecation warning for trying to toggle a popup which
isn't connected to anything.

Bug: T160161
Change-Id: I9ad97785f0de4ecf81d189985459689644e25923
This commit is contained in:
David Lynch 2017-03-16 11:35:10 -05:00
parent cf94956fba
commit eb8ba26adf
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
View file

@ -1598,7 +1598,7 @@ ve.init.mw.DesktopArticleTarget.prototype.maybeShowMetaDialog = function () {
if ( this.welcomeDialogPromise ) {
this.welcomeDialogPromise
.always( function () {
var noticesTool, popup;
var noticesTool, popup, notices;
// Pop out the notices when the welcome dialog is closed
if (
target.switched &&
@ -1608,9 +1608,12 @@ ve.init.mw.DesktopArticleTarget.prototype.maybeShowMetaDialog = function () {
target.actionsToolbar.tools.editModeSource.toolGroup.$element.append( popup.$element );
popup.toggle( true );
} else {
noticesTool = target.actionsToolbar.tools.notices;
noticesTool.setNotices( target.getEditNotices() );
noticesTool.getPopup().toggle( true );
notices = target.getEditNotices();
if ( notices.length ) {
noticesTool = target.actionsToolbar.tools.notices;
noticesTool.setNotices( notices );
noticesTool.getPopup().toggle( true );
}
}
} );
}