Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/281580
Change subject: Ensure veswitched is not set when we set wteswitched in the URI
......................................................................
Ensure veswitched is not set when we set wteswitched in the URI
veswitched and wteswitched together cannot result in any sane behaviour.
To reproduce:
* Open VE (while having multi-tab pref?), switch into WTE
* Make a change
* Switch into VE
Change-Id: I90e19169e3fab60ab876c8e4d349801309db262f
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/80/281580/1
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 180b6ce..26d940b 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -567,11 +567,14 @@
.then( function ( opened ) {
return opened; } )
.then( function ( closing ) {
return closing; } )
.then( function ( data ) {
+ var oldUri;
if ( data &&
data.action === 'keep' ) {
activatePageTarget( true );
} else if ( data &&
data.action === 'discard' ) {
setEditorPreference( 'visualeditor' );
- location.href =
veEditUri.clone().extend( { wteswitched: 1 } );
+ oldUri =
veEditUri.clone();
+ delete
oldUri.query.veswitched;
+ location.href =
oldUri.extend( { wteswitched: 1 } );
}
} );
} );
--
To view, visit https://gerrit.wikimedia.org/r/281580
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I90e19169e3fab60ab876c8e4d349801309db262f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
