jenkins-bot has submitted this change and it was merged.
Change subject: More NWE-SET integration fixes
......................................................................
More NWE-SET integration fixes
Also stop calling $skin->getUser() so much, store the result
Change-Id: Ic91a660bc4b97a82f1d2b0bffb55425564696da1
---
M VisualEditor.hooks.php
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
2 files changed, 33 insertions(+), 9 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index a41eb1f..3b74c6b 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -428,12 +428,13 @@
return true;
}
+ $user = $skin->getUser();
// Exit if the user doesn't have VE enabled
if (
- !$skin->getUser()->getOption( 'visualeditor-enable' ) ||
- $skin->getUser()->getOption(
'visualeditor-betatempdisable' ) ||
- $skin->getUser()->getOption( 'visualeditor-autodisable'
) ||
- ( $config->get( 'VisualEditorDisableForAnons' ) &&
$skin->getUser()->isAnon() )
+ !$user->getOption( 'visualeditor-enable' ) ||
+ $user->getOption( 'visualeditor-betatempdisable' ) ||
+ $user->getOption( 'visualeditor-autodisable' ) ||
+ ( $config->get( 'VisualEditorDisableForAnons' ) &&
$user->isAnon() )
) {
return true;
}
@@ -447,12 +448,12 @@
return true;
}
- $editor = self::getUserEditor( $skin->getUser(),
RequestContext::getMain()->getRequest() );
+ $editor = self::getUserEditor( $user,
RequestContext::getMain()->getRequest() );
if (
!$config->get( 'VisualEditorUseSingleEditTab' ) ||
- $skin->getUser()->getOption( 'visualeditor-tabs' ) ===
'multi-tab' ||
+ $user->getOption( 'visualeditor-tabs' ) === 'multi-tab'
||
(
- $skin->getUser()->getOption(
'visualeditor-tabs' ) === 'remember-last' &&
+ $user->getOption( 'visualeditor-tabs' ) ===
'remember-last' &&
$editor === 'wikitext'
)
) {
@@ -463,10 +464,29 @@
$result['editsection']['text'] = $skin->msg(
$sourceEditSection )->inLanguage( $lang )->text();
}
+ if (
+ $config->get( 'VisualEditorEnableWikitext' ) &&
+ $user->getOption( 'visualeditor-newwikitext' ) &&
+ (
+ !$config->get( 'VisualEditorUseSingleEditTab' )
||
+ $user->getOption( 'visualeditor-tabs' ) ===
'prefer-wt' ||
+ $user->getOption( 'visualeditor-tabs' ) ===
'multi-tab' ||
+ (
+ $user->getOption( 'visualeditor-tabs' )
=== 'remember-last' &&
+ $editor === 'wikitext'
+ )
+ )
+ ) {
+ $result['editsection']['query'] = [
+ 'veaction' => 'editsource',
+ 'vesection' => $section
+ ];
+ }
+
// Exit if we're using the single edit tab.
if (
$config->get( 'VisualEditorUseSingleEditTab' ) &&
- $skin->getUser()->getOption( 'visualeditor-tabs' ) !==
'multi-tab'
+ $user->getOption( 'visualeditor-tabs' ) !== 'multi-tab'
) {
return true;
}
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 9041c7c..c247668 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
@@ -237,7 +237,11 @@
.fail( handleLoadFailure );
}
- setEditorPreference( 'visualeditor' );
+ if ( mode === 'visual' ) {
+ setEditorPreference( 'visualeditor' );
+ } else {
+ setEditorPreference( 'wikitext' );
+ }
showLoading();
incrementLoadingProgress();
--
To view, visit https://gerrit.wikimedia.org/r/315835
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic91a660bc4b97a82f1d2b0bffb55425564696da1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <a...@wikimedia.org>
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
