From b4f527b0994e03ac3a25f341d2a754d19c09123e Mon Sep 17 00:00:00 2001
From: Brian Gough <bjg@network-theory.co.uk>
Date: Mon, 26 Jan 2015 14:37:43 +0000
Subject: [PATCH] handle rejected promises in pdf viewer

---
 .../ide/pdfng/directives/pdfViewer.coffee     | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/services/web/public/coffee/ide/pdfng/directives/pdfViewer.coffee b/services/web/public/coffee/ide/pdfng/directives/pdfViewer.coffee
index a7a4ab4ceb..fcbb28fcfb 100644
--- a/services/web/public/coffee/ide/pdfng/directives/pdfViewer.coffee
+++ b/services/web/public/coffee/ide/pdfng/directives/pdfViewer.coffee
@@ -59,7 +59,8 @@ define [
 					# console.log 'resolved q.all, page size is', result
 					$scope.numPages = result.numPages
 				.catch (error) ->
-					$scope.$emit 'pdf:error', 'loading initial document parameters'
+					$scope.$emit 'pdf:error', error
+					return $q.reject(error)
 
 		@setScale = (scale, containerHeight, containerWidth) ->
 			$scope.loaded.then () ->
@@ -87,6 +88,9 @@ define [
 					numScale * $scope.pdfPageSize[1]
 				]
 				# console.log 'in setScale result', $scope.scale.scale, $scope.defaultPageSize
+			.catch (error) ->
+				$scope.$emit 'pdf:error', error
+				return $q.reject(error)
 
 		@redraw = (position) ->
 			# console.log 'in redraw'
@@ -302,6 +306,10 @@ define [
 									spinner.remove(element)
 								ctrl.redraw(origposition)
 								$timeout renderVisiblePages
+								scope.loadSuccess = true
+						.catch (error) ->
+							scope.$emit 'pdf:error', error
+							return $q.reject(error)
 
 				elementTimer = null
 				spinnerTimer = null
@@ -364,9 +372,13 @@ define [
 					if scope.loadCount > 3 || error.match(/^Missing PDF/i) || error.match(/^loading/i)
 						scope.$emit 'pdf:error:display'
 						return
-					ctrl.load()
-					# trigger a redraw
-					scope.scale = angular.copy (scope.scale)
+					if scope.loadSuccess
+						ctrl.load()
+						# trigger a redraw
+						scope.scale = angular.copy (scope.scale)
+					else
+						scope.$emit 'pdf:error:display'
+						return
 
 				scope.$on 'pdf:page:size-change', (event, pageNum, delta) ->
 					#console.log 'page size change event', pageNum, delta
@@ -400,6 +412,7 @@ define [
 					# console.log 'loading pdf', newVal, oldVal
 					return unless newVal?
 					scope.loadCount = 0; # new pdf, so reset load count
+					scope.loadSuccess = false
 					ctrl.load()
 					# trigger a redraw
 					scope.scale = angular.copy (scope.scale)