jenkins-bot has submitted this change and it was merged.
Change subject: mw.ViewPageTarget: Remove workaround for cascading
defaultUserOptions
......................................................................
mw.ViewPageTarget: Remove workaround for cascading defaultUserOptions
Originally added in 50360999064f.
* Account for bug T89513 for 'tempdisable' (was done for 'enable' in
9cba9910c6).
* MediaWiki core now loads user defaults in a separate module not
subject to page caching, making our workaround obsolete.
Keeping defaultthumbsize as that is intentionally ignoring the user's
preferences.
Change-Id: I07a7aa8e08c728ddeba67f36a98e989c220dcb50
---
M VisualEditor.hooks.php
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
3 files changed, 7 insertions(+), 26 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index b1ceae8..ea36763 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -429,8 +429,6 @@
$veConfig->get( 'VisualEditorPluginModules' )
// @todo deprecate the global setting
),
'defaultUserOptions' => array(
- 'betatempdisable' =>
$defaultUserOptions['visualeditor-betatempdisable'],
- 'enable' =>
$defaultUserOptions['visualeditor-enable'],
'defaultthumbsize' => $thumbLimits[
$defaultUserOptions['thumbsize'] ]
),
'blacklist' => $veConfig->get(
'VisualEditorBrowserBlacklist' ),
@@ -442,11 +440,6 @@
'svgMaxSize' => $coreConfig->get( 'SVGMaxSize' ),
'namespacesWithSubpages' => $coreConfig->get(
'NamespacesWithSubpages' ),
);
-
- foreach ( $veConfig->get( 'VisualEditorPreferenceModules' ) as
$pref => $module ) {
-
$vars['wgVisualEditorConfig']['defaultUserOptions'][$pref] =
- $defaultUserOptions[$pref];
- }
return true;
}
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
index 5efaae8..997dc16 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
@@ -18,7 +18,7 @@
*/
( function () {
var conf, tabMessages, uri, pageExists, viewUri, veEditUri, isViewPage,
- init, support, targetPromise, enable, userPrefEnabled,
+ init, support, targetPromise, enable, tempdisable,
userPrefEnabled,
plugins = [];
/**
@@ -407,7 +407,9 @@
support.svg &&
( ( 'vewhitelist' in uri.query ) || !$.client.test(
init.blacklist, null, true ) );
- enable = mw.user.options.get( 'visualeditor-enable',
conf.defaultUserOptions.enable );
+ // Cast "0" (T89513)
+ enable = Number( mw.user.options.get( 'visualeditor-enable' ) );
+ tempdisable = Number( mw.user.options.get(
'visualeditor-betatempdisable' ) );
userPrefEnabled = (
// Allow disabling for anonymous users separately from changing
the
@@ -416,20 +418,7 @@
// User has 'visualeditor-enable' preference enabled (for alpha
opt-in)
// User has 'visualeditor-betatempdisable' preference disabled
- // Because user.options is embedded in the HTML and cached
per-page for anons on wikis
- // with static caching (e.g. wgUseFileCache or reverse-proxy)
ignore user.options for
- // anons as it is likely outdated.
- (
- mw.config.get( 'wgUserName' ) === null ?
- ( conf.defaultUserOptions.enable &&
!conf.defaultUserOptions.betatempdisable ) :
- (
- enable && enable !== '0' &&
- !mw.user.options.get(
-
'visualeditor-betatempdisable',
-
conf.defaultUserOptions.betatempdisable
- )
- )
- )
+ enable && !tempdisable
);
// Whether VisualEditor should be available for the current user, page,
wiki, mediawiki skin,
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 926ed57..7643097 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -72,9 +72,8 @@
// Load preference modules
for ( prefName in conf.preferenceModules ) {
- prefValue = mw.config.get( 'wgUserName' ) === null ?
- conf.defaultUserOptions[prefName] :
- mw.user.options.get( prefName,
conf.defaultUserOptions[prefName] );
+ prefValue = mw.user.options.get( prefName );
+ // Check "0" (T89513)
if ( prefValue && prefValue !== '0' ) {
this.modules.push( conf.preferenceModules[prefName] );
}
--
To view, visit https://gerrit.wikimedia.org/r/190630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I07a7aa8e08c728ddeba67f36a98e989c220dcb50
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
