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

Merge "Use veaction=edit in URL instead of action=edit when we're using multiple tabs"

Browse source
This commit is contained in:
jenkins-bot 2016-03-31 15:42:40 +00:00 committed by Gerrit Code Review
parent 98cf88a205 4210c4bee0
commit 2449ce203d
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -175,7 +175,7 @@
$( '#ca-edit a' ).text( mw.msg( key ) );
}
if ( uri.query.action !== 'edit' ) {
if ( uri.query.action !== 'edit' && uri.query.veaction !== 'edit' ) {
if ( history.pushState ) {
// Replace the current state with one that is tagged as ours, to prevent the
// back button from breaking when used to exit VE. FIXME: there should be a better
@ -301,7 +301,10 @@
);
// On a view page, extend the current URI so parameters like oldid are carried over
// On a non-view page, use viewUri
if ( conf.singleEditTab ) {
if (
conf.singleEditTab &&
mw.user.options.get( 'visualeditor-tabs' ) !== 'multi-tab'
) {
veEditUri = viewUri.clone().extend( { action: 'edit' } );
delete veEditUri.query.veaction;
} else {

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

@ -1114,7 +1114,10 @@ ve.init.mw.DesktopArticleTarget.prototype.transformPage = function () {
// Set the current URL
uri = this.currentUri;
if ( mw.config.get( 'wgVisualEditorConfig' ).singleEditTab ) {
if (
mw.config.get( 'wgVisualEditorConfig' ).singleEditTab &&
mw.user.options.get( 'visualeditor-tabs' ) !== 'multi-tab'
) {
uri.query.action = 'edit';
mw.config.set( 'wgAction', 'edit' );
} else {