Просмотр исходного кода

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

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

GitOrigin-RevId: bede2fa0c555a597ac40e8680ff30a51da0ab429
Simon Detheridge 7 лет назад
Родитель
Сommit
97145847ef
1 измененных файлов с 6 добавлено и 0 удалено
  1. 6 0
      services/web/public/src/ide/editor/EditorManager.js

+ 6 - 0
services/web/public/src/ide/editor/EditorManager.js

@@ -236,6 +236,12 @@ define([
           if (this._ignoreExternalUpdates) {
             return
           }
+          if (
+            _.property(['meta', 'type'])(update) === 'external' &&
+            _.property(['meta', 'source'])(update) === 'git-bridge'
+          ) {
+            return
+          }
           return this.ide.showGenericMessageModal(
             '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.'