jenkins-bot has submitted this change and it was merged.
Change subject: Various fixes for wikitext saving error handling
......................................................................
Various fixes for wikitext saving error handling
Bug: T121079
Change-Id: I4f1a5727b83e01ecd5f83c4796e6ee0f50a64a45
---
M resources/mobile.editor.overlay/EditorOverlay.js
1 file changed, 4 insertions(+), 7 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, but someone else must approve
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.editor.overlay/EditorOverlay.js
b/resources/mobile.editor.overlay/EditorOverlay.js
index 7944fcd..7be9a82 100644
--- a/resources/mobile.editor.overlay/EditorOverlay.js
+++ b/resources/mobile.editor.overlay/EditorOverlay.js
@@ -426,12 +426,12 @@
'blocked',
'autoblocked'
],
- key = response.error.code,
+ key = response &&
response.error && response.error.code,
typeMap = {
editconflict:
'editConflict',
wasdeleted:
'editPageDeleted',
'abusefilter-disallowed': 'extensionAbuseFilter',
- captcha:
'extensionConfirmEdit',
+ captcha:
'extensionCaptcha',
spamprotectiontext:
'extensionSpamBlacklist',
'titleblacklist-forbidden-edit': 'extensionTitleBlacklist'
};
@@ -443,12 +443,9 @@
} else if ( data.type === 'abusefilter'
) {
self._showAbuseFilter(
data.details.type, data.details.message );
} else {
- if ( data.details ===
'editconflict' ) {
+ if ( key === 'editconflict' ) {
msg = mw.msg(
'mobile-frontend-editor-error-conflict' );
- } else if (
- response.error &&
- $.inArray(
response.error.code, whitelistedErrorInfo ) > -1
- ) {
+ } else if ( $.inArray( key,
whitelistedErrorInfo ) > -1 ) {
msg =
response.error.info;
} else {
msg = mw.msg(
'mobile-frontend-editor-error' );
--
To view, visit https://gerrit.wikimedia.org/r/260693
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f1a5727b83e01ecd5f83c4796e6ee0f50a64a45
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
