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

Merge pull request #137 from sharelatex/fix-pdfng-progress-bar

Fix pdfng progress bar
Brian Gough 11 лет назад
Родитель
Сommit
e9366aa88a

+ 1 - 1
services/web/public/coffee/ide/pdfng/directives/pdfJs.coffee

@@ -91,8 +91,8 @@ define [
 						#				flashControls()
 				
 				scope.$on "loaded", () ->
-					# console.log "LOADED"
 					scope.loading = false
+					delete scope.progress
 
 				#scope.$watch "highlights", (areas) ->
 					# console.log 'got HIGHLIGHTS in pdfJS', areas

+ 4 - 0
services/web/public/coffee/ide/pdfng/directives/pdfRenderer.coffee

@@ -21,10 +21,14 @@ define [
 				@navigateFn = @options.navigateFn
 				@spinner = new pdfSpinner
 				@resetState()
+				@document.then (pdfDocument) =>
+					pdfDocument.getDownloadInfo().then () =>
+						@options.loadedCallback()
 				@errorCallback = @options.errorCallback
 				@pdfjs.catch (exception) =>
 					# console.log 'ERROR in get document', exception
 					@errorCallback(exception)
+
 			resetState: () ->
 				@complete = []
 				@timeout = []

+ 2 - 1
services/web/public/coffee/ide/pdfng/directives/pdfViewer.coffee

@@ -35,6 +35,8 @@ define [
 					$scope.$apply()
 				progressCallback: (progress) ->
 					$scope.$emit 'progress', progress
+				loadedCallback: () ->
+					$scope.$emit 'loaded'
 				errorCallback: (error) ->
 					Raven.captureMessage?('pdfng error ' + error)
 					$scope.$emit 'pdf:error', error
@@ -54,7 +56,6 @@ define [
 					]
 					# console.log 'resolved q.all, page size is', result
 					$scope.numPages = result.numPages
-					$scope.$emit "loaded"
 
 		@setScale = (scale, containerHeight, containerWidth) ->
 			$scope.loaded.then () ->