Przeglądaj źródła

handle error loading pdf

Brian Gough 11 lat temu
rodzic
commit
1a8438be5f

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

@@ -58,6 +58,8 @@ define [
 					]
 					]
 					# console.log 'resolved q.all, page size is', result
 					# console.log 'resolved q.all, page size is', result
 					$scope.numPages = result.numPages
 					$scope.numPages = result.numPages
+				.catch (error) ->
+					$scope.$emit 'pdf:error', 'loading initial document parameters'
 
 
 		@setScale = (scale, containerHeight, containerWidth) ->
 		@setScale = (scale, containerHeight, containerWidth) ->
 			$scope.loaded.then () ->
 			$scope.loaded.then () ->
@@ -359,7 +361,7 @@ define [
 				scope.$on 'pdf:error', (event, error) ->
 				scope.$on 'pdf:error', (event, error) ->
 					return if error == 'cancelled'
 					return if error == 'cancelled'
 					# check if too many retries or file is missing
 					# check if too many retries or file is missing
-					if scope.loadCount > 3 || error.match(/^Missing PDF/i)
+					if scope.loadCount > 3 || error.match(/^Missing PDF/i) || error.match(/^loading/i)
 						scope.$emit 'pdf:error:display'
 						scope.$emit 'pdf:error:display'
 						return
 						return
 					ctrl.load()
 					ctrl.load()