jenkins-bot has submitted this change and it was merged.
Change subject: Use a proper error message when VE fails to load due to not
being able to connect
......................................................................
Use a proper error message when VE fails to load due to not being able to
connect
Not just 'HTTP 0'
Change-Id: Icd1b5b64ca8ea4af80e3cf32f8502d8fb0d11ae2
---
M extension.json
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
5 files changed, 27 insertions(+), 2 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 3930bf9..1e5de9f 100644
--- a/extension.json
+++ b/extension.json
@@ -337,6 +337,7 @@
],
"messages": [
"visualeditor-loaderror-message",
+ "visualeditor-loaderror-message-noconnect",
"visualeditor-loaderror-title"
],
"targets": [
@@ -389,6 +390,7 @@
"readonlywarning",
"redirectpagesub",
"visualeditor-loadwarning",
+ "visualeditor-loadwarning-noconnect",
"visualeditor-loadwarning-token",
"visualeditor-savedialog-identify-anon",
"visualeditor-savedialog-identify-trylogin",
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index a31646e..f58cb81 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -244,8 +244,10 @@
"visualeditor-linknodeinspector-add-label": "Add label",
"visualeditor-linknodeinspector-title": "Simple link",
"visualeditor-loaderror-message": "Error loading data from server: $1.",
+ "visualeditor-loaderror-message-noconnect": "Could not connect to the
server.",
"visualeditor-loaderror-title": "The editor could not load",
"visualeditor-loadwarning": "Error loading data from server: $1. Would
you like to retry?",
+ "visualeditor-loadwarning-noconnect": "Could not connect",
"visualeditor-loadwarning-token": "Error loading edit token from
server: $1. Would you like to retry?",
"visualeditor-magiclinknodeinspector-convert-link": "Convert to simple
link",
"visualeditor-magiclinknodeinspector-title-isbn": "ISBN link",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 7916675..c423600 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -255,8 +255,10 @@
"visualeditor-linknodeinspector-add-label": "Label of button that
converts an auto-numbered, external, labelless link into a labeled external
link",
"visualeditor-linknodeinspector-title": "Title of inspector for editing
auto-numbered, external, labelless links.\n\nSee also:\n*
{{msg-mw|Visualeditor-annotationbutton-linknode-tooltip}}",
"visualeditor-loaderror-message": "Text shown in a message box when the
editor fails to load properly due to a RESTBase call failing.\n\nParameters:\n*
$1 - an error message",
+ "visualeditor-loaderror-message-noconnect": "Error message used in
{{mw-msg|visualeditor-loaderror-message}} when the editor fails to load
properly due to a RESTBase call failing due to not being able to connect.",
"visualeditor-loaderror-title": "Text shown as the title of a message
box when the editor fails to load properly for some reason.",
"visualeditor-loadwarning": "Text (JavaScript confirm()) shown when the
editor fails to load properly.\n\nParameters:\n* $1 - the error message from
the server, in English. e.g. \"docserver-http-error\"",
+ "visualeditor-loadwarning-noconnect": "Error shown in
{{mw-msg|visualeditor-loadwarning}} when the editor fails to load due to a
connection issue.",
"visualeditor-loadwarning-token": "Text (JavaScript confirm()) shown
when the editor fails to load properly.\n\nParameters:\n* $1 - the error
message from the server.",
"visualeditor-magiclinknodeinspector-convert-link": "Label of button
that converts a magic link into a normal labeled link",
"visualeditor-magiclinknodeinspector-title-isbn": "Title of inspector
for editing ISBN magic links.\n\nSee also:\n*
{{msg-mw|Visualeditor-annotationbutton-magiclinknode-tooltip-isbn}}",
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 fbba350..d34857f 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -677,7 +677,19 @@
if (
errorText === 'http' &&
( error.statusText !== 'abort' || error.xhr.status !== 504 ) &&
- confirm( ve.msg( 'visualeditor-loadwarning', 'HTTP ' +
error.xhr.status ) )
+ (
+ (
+ error.xhr.status &&
+ confirm( ve.msg( 'visualeditor-loadwarning',
'HTTP ' + error.xhr.status ) )
+ ) ||
+ (
+ !error.xhr.status &&
+ confirm( ve.msg(
+ 'visualeditor-loadwarning',
+ ve.msg(
'visualeditor-loadwarning-noconnect' )
+ ) )
+ )
+ )
) {
this.load();
} else if (
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
index a75603c..3c4c065 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
@@ -204,7 +204,14 @@
// Page does not exist,
so let the user start with a blank document.
return
$.Deferred().resolve( [ '', undefined ] ).promise();
} else {
- window.alert( mw.msg(
'visualeditor-loaderror-message', 'HTTP ' + response.status ) );
+ if ( response.status ) {
+ window.alert(
mw.msg( 'visualeditor-loaderror-message', 'HTTP ' + response.status ) );
+ } else {
+ window.alert(
mw.msg(
+
'visualeditor-loaderror-message',
+ mw.msg(
'visualeditor-loaderror-message-noconnect' )
+ ) );
+ }
mw.log.warn( 'RESTBase
load failed: ' + response.statusText );
}
--
To view, visit https://gerrit.wikimedia.org/r/314216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd1b5b64ca8ea4af80e3cf32f8502d8fb0d11ae2
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <a...@wikimedia.org>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
