Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/258059
Change subject: Don't check editor preferences etc. if user wants veaction=edit
......................................................................
Don't check editor preferences etc. if user wants veaction=edit
Bug: T120978
Change-Id: I39e28c80440260959b7f1c25b82a057c21de43be
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/59/258059/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 1c4e6b6..f88bad6 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
@@ -692,16 +692,16 @@
(
isEditPage &&
mw.user.options.get(
'visualeditor-tabs' ) !== 'prefer-wt' &&
- mw.user.options.get(
'visualeditor-tabs' ) !== 'multi-tab'
+ mw.user.options.get(
'visualeditor-tabs' ) !== 'multi-tab' &&
+ (
+ (
+
mw.user.options.get( 'visualeditor-tabs' ) === 'prefer-ve' &&
+ mw.config.get(
'wgAction' ) !== 'submit'
+ ) || getLastEditor()
!== 'wikitext'
+ )
)
) &&
- uri.query.veswitched === undefined && // TODO:
other params too?
- (
- (
- mw.user.options.get(
'visualeditor-tabs' ) === 'prefer-ve' &&
- mw.config.get( 'wgAction' ) !==
'submit'
- ) || getLastEditor() !== 'wikitext'
- )
+ uri.query.veswitched === undefined // TODO:
other params too?
) {
trackActivateStart( {
type: uri.query.vesection === undefined
? 'page' : 'section',
--
To view, visit https://gerrit.wikimedia.org/r/258059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39e28c80440260959b7f1c25b82a057c21de43be
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
