Adding new errorback and code to display error messages.

diff --git a/src/core.js b/src/core.js
index 3549eb906b6795d70d99572494a2351c66373bbf..72601fdf7283ddc0b57522091220292304fa95a4 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -63,6 +63,10 @@ var Page = (function pagePage() {
     };
     this.xref = xref;
     this.ref = ref;
+
+    this.ctx = null;
+    this.callback = null;
+    this.errorback = null;
   }
 
   constructor.prototype = {
@@ -165,8 +169,10 @@ var Page = (function pagePage() {
           try {
             self.display(gfx, self.callback);
           } catch (e) {
-            if (self.callback) self.callback(e.toString());
-            throw e;
+            if (self.errorback)
+              self.errorback(e);
+            else
+              throw e;
           }
         });
       };
@@ -303,9 +309,10 @@ var Page = (function pagePage() {
       }
       return links;
     },
-    startRendering: function pageStartRendering(ctx, callback)  {
+    startRendering: function pageStartRendering(ctx, callback, errorback)  {
       this.ctx = ctx;
       this.callback = callback;
+      this.errorback = errorback;
 
       this.startRenderingTime = Date.now();
       this.pdf.startRendering(this);
@@ -599,6 +606,14 @@ var PDFDoc = (function pdfDoc() {
         }
       }.bind(this));
 
+      messageHandler.on('page_error', function pdfDocError(data) {
+        var page = this.pageCache[data.pageNum];
+        if (page.errorback)
+          page.errorback(data.error)
+        else
+          throw data.error;
+      }, this);
+
       setTimeout(function pdfDocFontReadySetTimeout() {
         messageHandler.send('doc', this.data);
         this.workerReadyPromise.resolve(true);

diff --git a/src/worker.js b/src/worker.js
index 67f1bf658e10e6366d0a3e63d56477c728afc94d..06b9c7a22f4c5a8e237061e0630fb88b44aab392 100644 (file)
--- a/src/worker.js
+++ b/src/worker.js
@@ -14,7 +14,6 @@ function MessageHandler(name, comObj) {
   ah['console_error'] = [function ahConsoleError(data) {
       console.error.apply(console, data);
   }];
-
   comObj.onmessage = function messageHandlerComObjOnMessage(event) {
     var data = event.data;
     if (data.action in ah) {
@@ -67,7 +66,6 @@ var WorkerMessageHandler = {
     handler.on('page_request', function wphSetupPageRequest(pageNum) {
       pageNum = parseInt(pageNum);
 
-      var page = pdfDoc.getPage(pageNum);
 
       // The following code does quite the same as
       // Page.prototype.startRendering, but stops at one point and sends the
@@ -77,9 +75,22 @@ var WorkerMessageHandler = {
       var start = Date.now();
 
       var dependency = [];
-
-      // Pre compile the pdf page and fetch the fonts/images.
-      var IRQueue = page.getIRQueue(handler, dependency);
+      try {
+        var page = pdfDoc.getPage(pageNum);
+        // Pre compile the pdf page and fetch the fonts/images.
+        var IRQueue = page.getIRQueue(handler, dependency);
+      } catch(e) {
+        // Turn the error into an obj that can be serialized
+        e = {
+          message: e.message,
+          stack: e.stack
+        };
+        handler.send('page_error', {
+          pageNum: pageNum,
+          error: e
+        });
+        return;
+      }
 
       console.log('page=%d - getIRQueue: time=%dms, len=%d', pageNum,
                                   Date.now() - start, IRQueue.fnArray.length);

diff --git a/test/driver.js b/test/driver.js
index c11cecf5699e0aa15aab533932124e0778f0b0c5..48ac77e653e8c4cdae9d040786a83e32a30d5adc 100644 (file)
--- a/test/driver.js
+++ b/test/driver.js
@@ -162,9 +162,11 @@ function nextPage(task, loadError) {
 
       page.startRendering(
         ctx,
-        function nextPageStartRendering(e) {
-          snapshotCurrentPage(task, (!failure && e) ?
-            ('render : ' + e) : failure);
+        function nextPageStartRendering() {
+          snapshotCurrentPage(task, false);
+        },
+        function errorNextPageStartRendering(e) {
+          snapshotCurrentPage(task, 'render : ' + e.message);
         }
       );
     } catch (e) {

diff --git a/web/viewer.css b/web/viewer.css
index c379e91c4be54e660588ad2f830350da011f3d01..81458b6121a5f5bc3b2ddf5cd05f2fe9635a46c2 100644 (file)
--- a/web/viewer.css
+++ b/web/viewer.css
@@ -252,6 +252,37 @@ canvas {
   display: none;
 }
 
+#errorWrapper {
+  background: none repeat scroll 0 0 #FF5555;
+  color: white;
+  left: 0;
+  position: fixed;
+  right: 0;
+  top: 30px;
+  z-index: 1000;
+  padding: 3px;
+}
+
+#errorMessageLeft {
+  float: left;
+}
+
+#errorMessageRight {
+  float: right;
+}
+
+#errorMoreInfo {
+  background-color: #FFFFFF;
+  color: black;
+  padding: 3px;
+  margin: 3px;
+  white-space: pre;
+}
+
+.clearBoth {
+  clear: both;
+}
+
 /* === Printed media overrides === */
 @media print {
   #sidebar {

diff --git a/web/viewer.html b/web/viewer.html
index e441a984791fa93dd60972475b0e899fafccb11b..153b22e805c45c35deea654cccff46f9444c354d 100644 (file)
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -97,6 +97,24 @@
 
       <span id="info">--</span>
     </div>
+    <div id="errorWrapper" hidden='true'>
+      <div id="errorMessageLeft">
+        <span id="errorMessage"></span>
+        <button id="errorShowMore" onclick="" oncontextmenu="return false;">
+          More Information
+        </button>
+        <button id="errorShowLess" onclick="" oncontextmenu="return false;" hidden='true'>
+          Less Information
+        </button>
+      </div>
+      <div id="errorMessageRight">
+        <button id="errorClose" oncontextmenu="return false;">
+          X
+        </button>
+      </div>
+      <div class="clearBoth"></div>
+      <div id="errorMoreInfo" hidden='true'></div>
+    </div>
 
     <div id="sidebar">
       <div id="sidebarBox">

diff --git a/web/viewer.js b/web/viewer.js
index bfb3a43033a7f4ba84db6a06f681b0ff6c9b70da..00de7feaf08a39a7548428d5f9ef066512f595f2 100644 (file)
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -181,9 +181,34 @@ var PDFView = {
     return '';
   },
 
-  error: function pdfViewError() {
-    var loadingIndicator = document.getElementById('loading');
-    loadingIndicator.innerHTML = 'Error';
+  error: function pdfViewError(message, error) {
+    var errorWrapper = document.getElementById('errorWrapper');
+    errorWrapper.removeAttribute('hidden');
+
+    var errorMessage = document.getElementById('errorMessage');
+    errorMessage.innerHTML = message;
+
+    if (error) {
+      var errorMoreInfo = document.getElementById('errorMoreInfo');
+      var moreInfoButton = document.getElementById('errorShowMore');
+      var lessInfoButton = document.getElementById('errorShowLess');
+      var closeButton = document.getElementById('errorClose');
+      moreInfoButton.onclick = function() {
+        errorMoreInfo.removeAttribute('hidden');
+        moreInfoButton.setAttribute('hidden', 'true');
+        lessInfoButton.removeAttribute('hidden');
+      };
+      lessInfoButton.onclick = function() {
+        errorMoreInfo.setAttribute('hidden', 'true');
+        moreInfoButton.removeAttribute('hidden');
+        lessInfoButton.setAttribute('hidden', 'true');
+      };
+      closeButton.onclick = function() {
+        errorWrapper.setAttribute('hidden', 'true');
+      };
+      moreInfoButton.removeAttribute('hidden');
+      errorMoreInfo.innerHTML = error.message + '\n' + error.stack;
+    }
   },
 
   progress: function pdfViewProgress(level) {
@@ -487,7 +512,9 @@ var PageView = function pageView(container, content, id, pageWidth, pageHeight,
     ctx.translate(-this.x * scale, -this.y * scale);
 
     stats.begin = Date.now();
-    this.content.startRendering(ctx, this.updateStats);
+    this.content.startRendering(ctx, this.updateStats, function(e) {
+      PDFView.error('An error occured while rendering the page.', e);
+    });
 
     setupLinks(this.content, this.scale);
     div.setAttribute('data-loaded', true);