Merge pull request #3135 from Snuffleupagus/issue3068

Workaround for issue 3068
mozilla · Apr 23, 2013 · a8b652b · a8b652b
2 parents d12812e + 77c1235
commit a8b652b
Showing 1 changed file with 27 additions and 18 deletions.
diff --git a/web/viewer.js b/web/viewer.js
@@ -1172,23 +1172,31 @@ var PDFView = {
   },
 
   navigateTo: function pdfViewNavigateTo(dest) {
-    if (typeof dest === 'string')
-      dest = this.destinations[dest];
-    if (!(dest instanceof Array))
-      return; // invalid destination
-    // dest array looks like that: <page-ref> </XYZ|FitXXX> <args..>
-    var destRef = dest[0];
-    var pageNumber = destRef instanceof Object ?
-      this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] : (destRef + 1);
-    if (pageNumber > this.pages.length)
-      pageNumber = this.pages.length;
-    if (pageNumber) {
-      this.page = pageNumber;
-      var currentPage = this.pages[pageNumber - 1];
-      if (!this.isFullscreen) { // Avoid breaking fullscreen mode.
-        currentPage.scrollIntoView(dest);
+    var self = this;
+    PDFJS.Promise.all([this.pagesPromise,
+                       this.destinationsPromise]).then(function() {
+      if (typeof dest === 'string') {
+        dest = self.destinations[dest];
       }
-    }
+      if (!(dest instanceof Array)) {
+        return; // invalid destination
+      }
+      // dest array looks like that: <page-ref> </XYZ|FitXXX> <args..>
+      var destRef = dest[0];
+      var pageNumber = destRef instanceof Object ?
+        self.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] :
+        (destRef + 1);
+      if (pageNumber) {
+        if (pageNumber > self.pages.length) {
+          pageNumber = self.pages.length;
+        }
+        self.page = pageNumber;
+        if (!self.isFullscreen) { // Avoid breaking fullscreen mode.
+          var currentPage = self.pages[pageNumber - 1];
+          currentPage.scrollIntoView(dest);
+        }
+      }
+    });
   },
 
   getDestinationHash: function pdfViewGetDestinationHash(dest) {
@@ -1368,7 +1376,7 @@ var PDFView = {
     var pagesRefMap = this.pagesRefMap = {};
     var thumbnails = this.thumbnails = [];
 
-    var pagesPromise = new PDFJS.Promise();
+    var pagesPromise = this.pagesPromise = new PDFJS.Promise();
     var self = this;
 
     var firstPagePromise = pdfDocument.getPage(1);
@@ -1458,7 +1466,8 @@ var PDFView = {
       }
     });
 
-    var destinationsPromise = pdfDocument.getDestinations();
+    var destinationsPromise =
+      this.destinationsPromise = pdfDocument.getDestinations();
     destinationsPromise.then(function(destinations) {
       self.destinations = destinations;
     });