Alex Monk has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330419 )
Change subject: More error handling fixes
......................................................................
More error handling fixes
See T154565
Change-Id: I073aae149497342157503ad3f465b7d57aaad4fa
---
M ApiVisualEditor.php
M modules/ve-mw/i18n/en.json
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
3 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/19/330419/1
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 6e40807..e527bb1 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -113,12 +113,12 @@
} elseif ( $response['error'] !== '' ) {
$this->dieWithError(
[ 'apierror-visualeditor-docserver-http-error',
wfEscapeWikiText( $response['error'] ) ],
- $response['error']
+ 'apierror-visualeditor-docserver-http-error'
);
} else { // error null, code not 200
$this->dieWithError(
[ 'apierror-visualeditor-docserver-http',
$response['code'] ],
- (string) $response['code']
+ 'apierror-visualeditor-docserver-http'
);
}
return $response['body'];
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 4dd37d3..6f1f066 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -54,8 +54,8 @@
"apierror-visualeditor-badcachekey": "No cached serialization found
with that key",
"apierror-visualeditor-difffailed": "Diff failed",
"apierror-visualeditor-docserver": "Error contacting the
Parsoid/RESTbase server",
- "apierror-visualeditor-docserver-http": "docserver-http: HTTP $1",
- "apierror-visualeditor-docserver-http-error": "docserver-http-error:
$1",
+ "apierror-visualeditor-docserver-http": "HTTP $1",
+ "apierror-visualeditor-docserver-http-error": "$1",
"apierror-visualeditor-invaliddeflate": "Content provided is not
properly deflated",
"apierror-visualeditor-latestnotfound": "Could not find latest revision
for title",
"tooltip-ca-createsource": "Create the source code of this page",
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index d138d29..e26c543 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -688,11 +688,11 @@
// Don't show an error if the load was manually aborted
// The response.status check here is to catch aborts triggered by
navigation away from the page
if (
- error &&
- Object.prototype.hasOwnProperty.call( error, 'error' ) &&
- Object.prototype.hasOwnProperty.call( error.error, 'info' )
+ errorText &&
+ Object.prototype.hasOwnProperty.call( errorText, 'error' ) &&
+ Object.prototype.hasOwnProperty.call( errorText.error, 'info' )
) {
- errorInfo = error.error.info;
+ errorInfo = errorText.error.info;
}
if ( !error || error.statusText !== 'abort' ) {
@@ -709,7 +709,7 @@
);
}
} else if ( errorInfo ) {
- confirmPromptMessage = ve.msg(
'visualeditor-loadwarning', errorText + ': ' + errorInfo );
+ confirmPromptMessage = ve.msg(
'visualeditor-loadwarning', error + ': ' + errorInfo );
} else if ( typeof error === 'string' ) {
confirmPromptMessage = error;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/330419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I073aae149497342157503ad3f465b7d57aaad4fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <a...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
