From 494d5e04f0709d80d9a7a62e57a3ea75b6fa8f13 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Mon, 22 Sep 2014 16:33:08 -0500
Subject: [PATCH] PDF.js version 1.0.661

---
 bower.json            | 2 +-
 build/pdf.combined.js | 9 ++++++---
 build/pdf.js          | 9 ++++++---
 build/pdf.worker.js   | 4 ++--
 package.json          | 2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/bower.json b/bower.json
index 9331a8464..7e4ee3d10 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.659",
+  "version": "1.0.661",
   "keywords": [
     "Mozilla",
     "pdf",
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index b15ea3c89..4efb70df6 100644
--- a/build/pdf.combined.js
+++ b/build/pdf.combined.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.659';
-PDFJS.build = '7fb6c87';
+PDFJS.version = '1.0.661';
+PDFJS.build = '84584f9';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -2507,7 +2507,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
       messageHandler.on('PageError', function transportError(data) {
         var page = this.pageCache[data.pageNum - 1];
         var intentState = page.intentStates[data.intent];
-        if (intentState.displayReadyCapability.promise) {
+        if (intentState.displayReadyCapability) {
           intentState.displayReadyCapability.reject(data.error);
         } else {
           error(data.error);
@@ -6001,6 +6001,9 @@ var FontLoader = {
       return true;
     }
     // TODO other browsers
+    if (userAgent === 'node') {
+      return true;
+    }
     return false;
   })(),
 
diff --git a/build/pdf.js b/build/pdf.js
index a2eb63017..d09522cc0 100644
--- a/build/pdf.js
+++ b/build/pdf.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.659';
-PDFJS.build = '7fb6c87';
+PDFJS.version = '1.0.661';
+PDFJS.build = '84584f9';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -2551,7 +2551,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
       messageHandler.on('PageError', function transportError(data) {
         var page = this.pageCache[data.pageNum - 1];
         var intentState = page.intentStates[data.intent];
-        if (intentState.displayReadyCapability.promise) {
+        if (intentState.displayReadyCapability) {
           intentState.displayReadyCapability.reject(data.error);
         } else {
           error(data.error);
@@ -6045,6 +6045,9 @@ var FontLoader = {
       return true;
     }
     // TODO other browsers
+    if (userAgent === 'node') {
+      return true;
+    }
     return false;
   })(),
 
diff --git a/build/pdf.worker.js b/build/pdf.worker.js
index 04ebb6734..665ba1c0d 100644
--- a/build/pdf.worker.js
+++ b/build/pdf.worker.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.659';
-PDFJS.build = '7fb6c87';
+PDFJS.version = '1.0.661';
+PDFJS.build = '84584f9';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/package.json b/package.json
index 0ae1b1f47..2cddb71ee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.659",
+  "version": "1.0.661",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",