wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-12 09:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "DesktopArticleTarget: Don't abort in SET mode if veswitched is set"

Browse source
This commit is contained in:
jenkins-bot 2015-12-14 16:46:02 +00:00 committed by Gerrit Code Review
parent 648457ca4c 5b083a7272
commit 51d493918b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
VisualEditor.hooks.php
View file

@ -75,7 +75,7 @@ class VisualEditorHooks {
$user->getOption( 'visualeditor-autodisable' ) || $user->getOption( 'visualeditor-autodisable' ) ||
$user->getOption( 'visualeditor-tabs' ) === 'prefer-wt' || $user->getOption( 'visualeditor-tabs' ) === 'prefer-wt' ||
( $veConfig->get( 'VisualEditorDisableForAnons' ) && $user->isAnon() ) || ( $veConfig->get( 'VisualEditorDisableForAnons' ) && $user->isAnon() ) ||
false // TODO: Detect incompatibility - P2373 false // TODO: Detect incompatibility - T121298, P2373
) { ) {
return true; return true;
} }
@ -102,13 +102,13 @@ class VisualEditorHooks {
$title->getContentModel() !== CONTENT_MODEL_WIKITEXT || $title->getContentModel() !== CONTENT_MODEL_WIKITEXT ||
// check for parameters that VE does not handle // check for parameters that VE does not handle
// TODO: other params too? See identical list in ve.init.mw.DesktopArticleTarget.init.js // TODO: other params too? See identical list in ve.init.mw.DesktopArticleTarget.init.js
in_array( 'veswitched', $params ) ||
in_array( 'undo', $params ) || in_array( 'undo', $params ) ||
in_array( 'undoafter', $params ) || in_array( 'undoafter', $params ) ||
in_array( 'editintro', $params ) || in_array( 'editintro', $params ) ||
in_array( 'preload', $params ) || in_array( 'preload', $params ) ||
in_array( 'preloadtitle', $params ) || in_array( 'preloadtitle', $params ) ||
in_array( 'preloadparams', $params ); in_array( 'preloadparams', $params );
// Known-good parameters: edit, veaction, section, vesection, veswitched
} }
/** /**

2
modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
View file

@ -713,13 +713,13 @@
) )
) )
) && ) &&
uri.query.veswitched === undefined &&
uri.query.undo === undefined && uri.query.undo === undefined &&
uri.query.undoafter === undefined && uri.query.undoafter === undefined &&
uri.query.editintro === undefined && uri.query.editintro === undefined &&
uri.query.preload === undefined && uri.query.preload === undefined &&
uri.query.preloadtitle === undefined && uri.query.preloadtitle === undefined &&
uri.query.preloadparams === undefined uri.query.preloadparams === undefined
// Known-good parameters: edit, veaction, section, vesection, veswitched
// TODO: other params too? See identical list in VisualEditor.hooks.php // TODO: other params too? See identical list in VisualEditor.hooks.php
) { ) {
trackActivateStart( { trackActivateStart( {