Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/275599
Change subject: DesktopArticleTarget.init#getLastEditor: Check values for
validity
......................................................................
DesktopArticleTarget.init#getLastEditor: Check values for validity
Change-Id: I23e0884a97b3689dd42c3df11a6311cd0601c348
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/99/275599/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 41444a1..8eba3dc 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
@@ -267,8 +267,15 @@
function getLastEditor() {
var editor = $.cookie( 'VEE' );
- // TODO: Check validity?
- if ( !mw.user.isAnon() || !editor ) {
+ // Set editor to user's preference or site's default if …
+ if (
+ // … user is logged in,
+ !mw.user.isAnon() ||
+ // … no cookie is set, or
+ !editor ||
+ // value is invalid.
+ !( editor === 'visualeditor' || editor === 'wikitext' )
+ ) {
editor = mw.user.options.get( 'visualeditor-editor' );
}
return editor;
--
To view, visit https://gerrit.wikimedia.org/r/275599
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23e0884a97b3689dd42c3df11a6311cd0601c348
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
