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

replace $timeout by setTimeout in pdf viewer

Brian Gough 11 лет назад
Родитель
Сommit
192918dda1
1 измененных файлов с 7 добавлено и 5 удалено
  1. 7 5
      services/web/public/coffee/ide/pdfng/directives/pdfRenderer.coffee

+ 7 - 5
services/web/public/coffee/ide/pdfng/directives/pdfRenderer.coffee

@@ -91,7 +91,8 @@ define [
 				@resetState()
 				@resetState()
 
 
 			triggerRenderQueue: (interval = @JOB_QUEUE_INTERVAL) ->
 			triggerRenderQueue: (interval = @JOB_QUEUE_INTERVAL) ->
-				$timeout () =>
+				@queueTimer = setTimeout () =>
+					@queueTimer = null
 					@processRenderQueue()
 					@processRenderQueue()
 				, interval
 				, interval
 
 
@@ -134,7 +135,7 @@ define [
 				@jobs = @jobs + 1
 				@jobs = @jobs + 1
 
 
 				element.canvas.addClass('pdfng-loading')
 				element.canvas.addClass('pdfng-loading')
-				spinTimer = $timeout () =>
+				spinTimer = setTimeout () =>
 					@spinner.add(element.canvas)
 					@spinner.add(element.canvas)
 				, 100
 				, 100
 
 
@@ -147,7 +148,7 @@ define [
 					Raven.captureMessage?('pdfng page load timed out after ' + @PAGE_LOAD_TIMEOUT + 'ms')
 					Raven.captureMessage?('pdfng page load timed out after ' + @PAGE_LOAD_TIMEOUT + 'ms')
 					# console.log 'page load timed out', pagenum
 					# console.log 'page load timed out', pagenum
 					timedOut = true
 					timedOut = true
-					$timeout.cancel(spinTimer)
+					clearTimeout(spinTimer)
 					@spinner.stop(element.canvas)
 					@spinner.stop(element.canvas)
 					# @jobs = @jobs - 1
 					# @jobs = @jobs - 1
 					# @triggerRenderQueue(0)
 					# @triggerRenderQueue(0)
@@ -159,7 +160,7 @@ define [
 				@pageLoad[pagenum].then (pageObject) =>
 				@pageLoad[pagenum].then (pageObject) =>
 					# console.log 'in page load success', pagenum
 					# console.log 'in page load success', pagenum
 					$timeout.cancel(timer)
 					$timeout.cancel(timer)
-					$timeout.cancel(spinTimer)
+					clearTimeout(spinTimer)
 					@renderTask[pagenum] = @doRender element, pagenum, pageObject
 					@renderTask[pagenum] = @doRender element, pagenum, pageObject
 					@renderTask[pagenum].then () =>
 					@renderTask[pagenum].then () =>
 						# complete
 						# complete
@@ -173,7 +174,7 @@ define [
 				.catch (error) ->
 				.catch (error) ->
 					# console.log 'in page load error', pagenum, 'timedOut=', timedOut
 					# console.log 'in page load error', pagenum, 'timedOut=', timedOut
 					$timeout.cancel(timer)
 					$timeout.cancel(timer)
-					$timeout.cancel(spinTimer)
+					clearTimeout(spinTimer)
 					# console.log 'ERROR', error
 					# console.log 'ERROR', error
 
 
 			doRender: (element, pagenum, page) ->
 			doRender: (element, pagenum, page) ->
@@ -278,6 +279,7 @@ define [
 			destroy: () ->
 			destroy: () ->
 				# console.log 'in pdf renderer destroy', @renderQueue
 				# console.log 'in pdf renderer destroy', @renderQueue
 				@shuttingDown = true
 				@shuttingDown = true
+				clearTimeout @queueTimer if @queueTimer?
 				@renderQueue = []
 				@renderQueue = []
 				for task in @renderTask
 				for task in @renderTask
 					task.cancel() if task?
 					task.cancel() if task?