Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/274019
Change subject: Fix WTE->VE switching in prefer-wt SET mode
......................................................................
Fix WTE->VE switching in prefer-wt SET mode
Bug: T128402
Change-Id: I56af672f2334214f048a4bbfe2f9fab891832792
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 16 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/19/274019/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 3d4504c..440fc78 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
@@ -559,7 +559,7 @@
activatePageTarget( true );
} else if ( data &&
data.action === 'discard' ) {
setEditorPreference( 'visualeditor' );
- location.href =
veEditUri;
+ location.href =
veEditUri.clone().extend( { wteswitched: 1 } );
}
} );
} );
@@ -682,18 +682,23 @@
// … or if on ?action=edit in single
edit mode and the user wants it
(
isEditPage &&
- tabPreference !== 'multi-tab' &&
- userPrefEnabled &&
- // If it's a view-source
situation, we don't want to show VE on-load
- !$( '#ca-viewsource' ).length &&
(
+ uri.query.wteswitched
=== '1' ||
(
- tabPreference
=== 'prefer-ve' &&
- mw.config.get(
'wgAction' ) !== 'submit'
- ) ||
- (
- tabPreference
=== 'remember-last' &&
- getLastEditor()
!== 'wikitext'
+ tabPreference
!== 'multi-tab' &&
+
userPrefEnabled &&
+ // If it's a
view-source situation, we don't want to show VE on-load
+ !$(
'#ca-viewsource' ).length &&
+ (
+ (
+
tabPreference === 'prefer-ve' &&
+
mw.config.get( 'wgAction' ) !== 'submit'
+ ) ||
+ (
+
tabPreference === 'remember-last' &&
+
getLastEditor() !== 'wikitext'
+ )
+ )
)
)
)
--
To view, visit https://gerrit.wikimedia.org/r/274019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56af672f2334214f048a4bbfe2f9fab891832792
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <kren...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
