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

Merge pull request #89 from sharelatex/bg-slow-connection-fix

increase allowed op backlog and flush tolerance
Brian Gough 9 лет назад
Родитель
Сommit
fe12a341e1

+ 1 - 1
services/web/public/coffee/ide/editor/Document.coffee

@@ -162,7 +162,7 @@ define [
 		clearChaosMonkey: () ->
 			clearTimeout @_cm
 
-		MAX_PENDING_OP_SIZE: 30 # pending ops bigger than this are always considered unsaved
+		MAX_PENDING_OP_SIZE: 64 # pending ops bigger than this are always considered unsaved
 
 		pollSavedStatus: () ->
 			# returns false if doc has ops waiting to be acknowledged or

+ 2 - 2
services/web/public/coffee/ide/editor/ShareJsDoc.coffee

@@ -104,8 +104,8 @@ define [
 		getInflightOp: () -> @_doc.inflightOp
 		getPendingOp: () -> @_doc.pendingOp
 		getRecentAck: () ->
-			# check if we have received an ack recently (within the flush delay)
-			@lastAcked? and new Date() - @lastAcked < @_doc._flushDelay
+			# check if we have received an ack recently (within a factor of two of the single user flush delay)
+			@lastAcked? and new Date() - @lastAcked <  2 * SINGLE_USER_FLUSH_DELAY
 		getOpSize: (op) ->
 			# compute size of an op from its components
 			# (total number of characters inserted and deleted)