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

Merge "Use correct switch type when opening welcome dialog on NWE"

Browse source
This commit is contained in:
jenkins-bot 2016-09-19 18:16:59 +00:00 committed by Gerrit Code Review
parent 29ff6c43ef 926212dbae
commit 376a4520ea
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -962,7 +962,7 @@
welcomeDialog,
{
switchable: init.isAvailable,
editor: 'wte'
editor: 'source'
}
)
.then( function ( opened ) { return opened; } )

6
modules/ve-mw/init/ve.init.MWWelcomeDialog.js
View file

@ -40,18 +40,18 @@ mw.libs.ve.WelcomeDialog.static.actions = [
{
action: 'switch-wte',
label: OO.ui.deferMsg( 'visualeditor-welcomedialog-switch' ),
modes: [ 've' ]
modes: [ 'visual' ]
},
{
action: 'switch-ve',
label: OO.ui.deferMsg( 'visualeditor-welcomedialog-switch-ve' ),
modes: [ 'wte' ]
modes: [ 'source' ]
},
{
action: 'accept',
label: OO.ui.deferMsg( 'visualeditor-welcomedialog-action' ),
flags: [ 'progressive', 'primary' ],
modes: [ 've', 'wte', 'noswitch' ]
modes: [ 'visual', 'source', 'noswitch' ]
}
];

6
modules/ve-mw/init/ve.init.mw.ArticleTarget.js
View file

@ -1812,7 +1812,7 @@ ve.init.mw.ArticleTarget.prototype.maybeShowWelcomeDialog = function () {
this.welcomeDialog,
{
switchable: this.constructor.static.trackingName !== 'mobile',
editor: 've'
editor: this.mode
}
)
.then( function ( opened ) {
@ -1824,11 +1824,15 @@ ve.init.mw.ArticleTarget.prototype.maybeShowWelcomeDialog = function () {
.then( function ( data ) {
target.welcomeDialogPromise.resolve();
target.welcomeDialog = null;
// switchToWikitextEditor and switchToVisualEditor are actually
// only defined in subclasses :/
if ( data && data.action === 'switch-wte' ) {
// TODO: Make this work on mobile - right now we can only
// get away with it because the button which triggers this
// action is hidden on mobile
target.switchToWikitextEditor( true, true );
} else if ( data && data.action === 'switch-ve' ) {
target.switchToVisualEditor();
}
} );
} else {