jenkins-bot has submitted this change and it was merged.

Change subject: Don't try to load VE over the top of the wikitext editor we 
just switched to
......................................................................


Don't try to load VE over the top of the wikitext editor we just switched to

(if we discarded changes)

Bug: T124316
Change-Id: Ic5e6ee8f4b6e75c3ae877021bcb29733b881e6d2
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



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 094d2b1..7107375 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
@@ -723,8 +723,9 @@
                                uri.query.editintro === undefined &&
                                uri.query.preload === undefined &&
                                uri.query.preloadtitle === undefined &&
-                               uri.query.preloadparams === undefined
-                               // Known-good parameters: edit, veaction, 
section, vesection, veswitched
+                               uri.query.preloadparams === undefined &&
+                               uri.query.veswitched === undefined
+                               // Known-good parameters: edit, veaction, 
section, vesection
                                // TODO: other params too? See identical list 
in VisualEditor.hooks.php
                        ) {
                                trackActivateStart( {

-- 
To view, visit https://gerrit.wikimedia.org/r/265903
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5e6ee8f4b6e75c3ae877021bcb29733b881e6d2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to