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

Merge "Catch errors during document initialization"

Browse source
This commit is contained in:
jenkins-bot 2019-10-11 16:24:02 +00:00 committed by Gerrit Code Review
parent b15eea1cb0 57d8e53111
commit 389fd5c668
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/ve-mw-collab/ve.init.mw.CollabTarget.init.js
View file

@ -92,7 +92,7 @@
dummySurface.createProgress( progressDeferred.promise(), ve.msg( 'visualeditor-rebase-client-connecting' ), true );
surfaceModel.synchronizer.once( 'initDoc', function () {
surfaceModel.synchronizer.once( 'initDoc', function ( error ) {
var initPromise;
progressDeferred.resolve();
@ -102,6 +102,18 @@
target.clearSurfaces();
// Don't add the surface until the history has been applied
target.addSurface( surfaceModel );
if ( error ) {
OO.ui.alert(
$( '<p>' ).append(
ve.htmlMsg( 'visualeditor-corrupted-document-error', $( '<pre>' ).text( error.stack ) )
),
{ title: ve.msg( 'visualeditor-corrupted-document-title' ), size: 'large' }
).then( function () {
// eslint-disable-next-line no-use-before-define
showForm( true );
} );
return;
}
target.once( 'surfaceReady', function () {
initPromise.then( function () {
surfaceModel.selectFirstContentOffset();
@ -184,7 +196,7 @@
} ).fail( function ( err ) {
mw.log.error( err );
// eslint-disable-next-line no-use-before-define
showForm();
showForm( true );
} );
}