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

Merge "Don't try to JSON stringify load error messages that are already strings"

Browse source
This commit is contained in:
jenkins-bot 2017-01-03 20:22:50 +00:00 committed by Gerrit Code Review
parent 4abdf21413 101b0ff45c
commit 1ac5ede187
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
View file

@ -710,6 +710,8 @@ ve.init.mw.DesktopArticleTarget.prototype.loadFail = function ( error, errorText
}
} else if ( errorInfo ) {
confirmPromptMessage = ve.msg( 'visualeditor-loadwarning', errorText + ': ' + errorInfo );
} else if ( typeof error === 'string' ) {
confirmPromptMessage = error;
} else {
// At least give the devs something to work from
confirmPromptMessage = JSON.stringify( error );