github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1574 from sharelatex/sk-ignore-external-updates-from-gitbridge

Browse source 
When a document is updated externally via git-bridge, don't show warning

GitOrigin-RevId: bede2fa0c555a597ac40e8680ff30a51da0ab429
This commit is contained in:
Simon Detheridge 2019-03-04 12:00:04 +00:00 committed by James Allen
parent 870f183595
commit 97145847ef
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/web/public/src/ide/editor/EditorManager.js
View file

@ -236,6 +236,12 @@ define([
if (this._ignoreExternalUpdates) { if (this._ignoreExternalUpdates) {
return return
} }
if (
_.property(['meta', 'type'])(update) === 'external' &&
_.property(['meta', 'source'])(update) === 'git-bridge'
) {
return
}
return this.ide.showGenericMessageModal( return this.ide.showGenericMessageModal(
'Document Updated Externally', 'Document Updated Externally',
'This document was just updated externally. Any recent changes you have made may have been overwritten. To see previous versions please look in the history.' 'This document was just updated externally. Any recent changes you have made may have been overwritten. To see previous versions please look in the history.'