Update PDF.js build to take past-end-of-file fix

rstudio · Feb 29, 2012 · 3d60537 · 3d60537
1 parent 46c185c
commit 3d60537
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/gwt/src/org/rstudio/studio/client/pdfviewer/pdfjs/pdf.js b/src/gwt/src/org/rstudio/studio/client/pdfviewer/pdfjs/pdf.js
@@ -7,7 +7,7 @@ var PDFJS = {};
   // Use strict in our context only - users might not want it
   'use strict';
 
-  PDFJS.build = '4a9c1ac';
+  PDFJS.build = '8624cf0';
 
   // Files are inserted below - see Makefile
   /* PDFJSSCRIPT_INCLUDE_ALL */

diff --git a/src/gwt/src/org/rstudio/studio/client/pdfviewer/pdfjs/pdf.min.js b/src/gwt/src/org/rstudio/studio/client/pdfviewer/pdfjs/pdf.min.js
diff --git a/src/gwt/src/org/rstudio/studio/client/pdfviewer/pdfjs/viewer.js b/src/gwt/src/org/rstudio/studio/client/pdfviewer/pdfjs/viewer.js
@@ -962,6 +962,10 @@ var PDFView = {
       this.page = 1;
     }
 
+    // Don't let us be past the end of the document--bad things happen
+    if (this.page > this.pages.length)
+      this.page = this.pages.length;
+
     if (PDFView.currentScale === kUnknownScale) {
       // Scale was not initialized: invalid bookmark or scale was not specified.
       // Setting the default one.

diff --git a/src/gwt/tools/sync-pdfjs b/src/gwt/tools/sync-pdfjs
@@ -13,7 +13,7 @@ cd pdfjs
 git clean -dfx
 
 # Use this commit
-git checkout 4a9c1ac4831077dc52e4f7591d6a78e1851d3152
+git checkout 8624cf03485741e995b1bbcca058ea0f35a298b3
 
 make
 cd ..