Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/258635
Change subject: Check that we really want VE before loading it for section edits
......................................................................
Check that we really want VE before loading it for section edits
Bug: T121189
Change-Id: I34371bf78d34e9d362e9cf5c64bdd108478969b9
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 11 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/35/258635/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 8affb55..7f0d15d 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
@@ -761,17 +761,20 @@
mw.user.options.get( 'visualeditor-tabs' ) !==
'multi-tab' &&
userPrefEnabled
) {
+ loadVEInPage = mw.user.options.get(
'visualeditor-tabs' ) === 'prefer-ve' ||
+ (
+ getLastEditor() !== 'wikitext'
&&
+ mw.user.options.get(
'visualeditor-tabs' ) !== 'prefer-wt'
+ );
// Handle section edit link clicks
- $( '.mw-editsection a' ).on( 'click',
init.onEditSectionLinkClick );
+ $( '.mw-editsection a' ).on( 'click', function
( e ) {
+ if ( loadVEInPage ) {
+ init.onEditSectionLinkClick( e
);
+ }
+ } );
// Allow instant switching to edit mode,
without refresh
$( '#ca-edit' ).on( 'click', function ( e ) {
- if (
- mw.user.options.get(
'visualeditor-tabs' ) === 'prefer-ve' ||
- (
- getLastEditor() !==
'wikitext' &&
- mw.user.options.get(
'visualeditor-tabs' ) !== 'prefer-wt'
- )
- ) {
+ if ( loadVEInPage ) {
trackActivateStart( { type:
'page', mechanism: 'click' } );
activateTarget();
e.preventDefault();
--
To view, visit https://gerrit.wikimedia.org/r/258635
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34371bf78d34e9d362e9cf5c64bdd108478969b9
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
