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

Merge branch 'master' of github.com:sharelatex/web-sharelatex

Browse source
This commit is contained in:
Henry Oswald 2014-04-08 16:56:38 +01:00
commit 9398625ac5
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
services/web/public/coffee/editor/Document.coffee
View file

@ -20,6 +20,7 @@ define [
@joined = false
@wantToBeJoined = false
@_checkConsistency = _.bind(@_checkConsistency, @)
@inconsistentCount = 0
@_bindToEditorEvents()
@_bindToSocketEvents()
@ -34,10 +35,20 @@ define [
editorDoc?.off "change", @_checkConsistency
_checkConsistency: () ->
editorValue = @ace?.getValue()
sharejsValue = @doc?.getSnapshot()
if editorValue != sharejsValue
@_onError "error", new Error("Editor text does not match server text")
# We've been seeing a lot of errors when I think there shouldn't be
# any, which may be related to this check happening before the change is
# applied. If we use a timeout, hopefully we can reduce this.
setTimeout () =>
editorValue = @ace?.getValue()
sharejsValue = @doc?.getSnapshot()
if editorValue != sharejsValue
@inconsistentCount++
else
@inconsistentCount = 0
if @inconsistentCount >= 3
@_onError new Error("Editor text does not match server text")
, 0
getSnapshot: () ->
@doc?.getSnapshot()

4
services/web/public/coffee/ide/SavingAreaManager.coffee
View file

@ -13,7 +13,9 @@ define [
@warnAboutUnsavedChanges()
pollSavedStatus: () ->
saved = @ide.editor.document.pollSavedStatus()
doc = @ide.editor.document
return if !doc?
saved = doc.pollSavedStatus()
if saved
@unsavedSeconds = 0
else