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

autosave: Handle switched document with no transactions

Browse source 
Always store immediately if fromEditedState is true. Also
now that we only store if there is state to recover, remove
the check for transactions before deciding to show the notification.

Change-Id: I5357a9098b91e303f5c71881ea03a080d2969fff
This commit is contained in:
Ed Sanders 2018-03-04 23:31:49 +00:00
parent 007bb6fa09
commit 4c759e2587
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
modules/ve-mw/init/ve.init.mw.ArticleTarget.js
View file

@ -463,11 +463,10 @@ ve.init.mw.ArticleTarget.prototype.surfaceReady = function () {
if ( this.recovered ) { if ( this.recovered ) {
// Restore auto-saved transactions if document state was recovered // Restore auto-saved transactions if document state was recovered
try { try {
if ( surfaceModel.restoreChanges() ) { surfaceModel.restoreChanges();
mw.notify( ve.msg( 'visualeditor-autosave-recovered-text' ), { mw.notify( ve.msg( 'visualeditor-autosave-recovered-text' ), {
title: ve.msg( 'visualeditor-autosave-recovered-title' ) title: ve.msg( 'visualeditor-autosave-recovered-title' )
} ); } );
}
} catch ( e ) { } catch ( e ) {
mw.log.warn( e ); mw.log.warn( e );
mw.notify( ve.msg( 'visualeditor-autosave-not-recovered-text' ), { mw.notify( ve.msg( 'visualeditor-autosave-not-recovered-text' ), {
@ -477,10 +476,19 @@ ve.init.mw.ArticleTarget.prototype.surfaceReady = function () {
} }
} else { } else {
// ...otherwise store this document state for later recovery // ...otherwise store this document state for later recovery
// Wait for the first change before doing this. if ( !this.fromEditedState ) {
surfaceModel.once( 'undoStackChange', function () { // Store immediately if the document was previously edited
target.storeDocState( target.originalHtml ); // (e.g. in a different mode)
} ); this.storeDocState( this.originalHtml );
} else {
// Only store after the first change if this is an unmodified document
surfaceModel.once( 'undoStackChange', function () {
// Check the surface hasn't been destroyed
if ( target.getSurface() ) {
target.storeDocState( target.originalHtml );
}
} );
}
} }
// Start auto-saving transactions // Start auto-saving transactions
surfaceModel.startStoringChanges(); surfaceModel.startStoringChanges();