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

Merge "SET: Set user's editor to wikitext if the browser doesn't do JS"

Browse source
This commit is contained in:
jenkins-bot 2016-02-04 19:57:07 +00:00 committed by Gerrit Code Review
parent 622ca082ca c2e792e334
commit cf3ccd3b45
1 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
VisualEditor.hooks.php
View file

@ -109,7 +109,7 @@ class VisualEditorHooks {
* @return bool Whether to show the wikitext editor or not.
*/
public static function onCustomEditor( Article $article, User $user ) {
$req = RequestContext::getMain()->getRequest();
$req = $article->getContext()->getRequest();
$veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 'visualeditor' );
if (
@ -128,23 +128,40 @@ class VisualEditorHooks {
$availableNamespaces = $veConfig->get( 'VisualEditorAvailableNamespaces' );
$params = $req->getValueNames();
$params = $req->getValues();
return $req->getVal( 'action' ) !== 'edit' ||
if ( isset( $params['venoscript'] ) ) {
$req->response()->setCookie( 'VEE', 'wikitext', 0, array( 'prefix' => '' ) );
$user->setOption( 'visualeditor-editor', 'wikitext' );
$user->saveSettings();
return true;
}
$ret = $req->getVal( 'action' ) !== 'edit' ||
!$veConfig->get( 'VisualEditorUseSingleEditTab' ) ||
self::getUserEditor( $user, $req ) === 'wikitext' ||
!$title->userCan( 'edit' ) ||
!$title->inNamespaces( array_keys( array_filter( $availableNamespaces ) ) ) ||
$title->getContentModel() !== CONTENT_MODEL_WIKITEXT ||
// check for parameters that VE does not handle
// TODO: other params too? See identical list in ve.init.mw.DesktopArticleTarget.init.js
in_array( 'undo', $params ) ||
in_array( 'undoafter', $params ) ||
in_array( 'editintro', $params ) ||
in_array( 'preload', $params ) ||
in_array( 'preloadtitle', $params ) ||
in_array( 'preloadparams', $params );
// Known parameters that VE does not handle
// TODO: Other params too? See identical list in ve.init.mw.DesktopArticleTarget.init.js
isset( $params['undo'] ) ||
isset( $params['undoafter'] ) ||
isset( $params['editintro'] ) ||
isset( $params['preload'] ) ||
isset( $params['preloadtitle'] ) ||
isset( $params['preloadparams'] );
// Known-good parameters: edit, veaction, section, vesection, veswitched
if ( !$ret ) {
$params['venoscript'] = '1';
$url = htmlspecialchars( wfScript() . '?' . wfArrayToCgi( $params ) );
$article->getContext()->getOutput()->addHeadItem(
've-noscript-fallback',
"<noscript><meta http-equiv=\"refresh\" content=\"0; url=$url\"></noscript>"
);
}
return $ret;
}
private static function getUserEditor( User $user, WebRequest $req ) {