Merge pull request #3607 from Snuffleupagus/issue-3604

Prevent searching during load from breaking the find functionality

web/pdf_find_controller.js

@@ -64,6 +64,8 @@ var PDFFindController = {
 
   integratedFind: false,
 
+  firstPagePromise: new PDFJS.Promise(),
+
   initialize: function(options) {
     if(typeof PDFFindBar === 'undefined' || PDFFindBar === null) {
         throw 'PDFFindController cannot be initialized ' +
@@ -172,6 +174,7 @@ var PDFFindController = {
     this.state = e.detail;
     this.updateUIState(FindStates.FIND_PENDING);
 
+    this.firstPagePromise.then(function() {
       this.extractText();
 
       clearTimeout(this.findTimeout);
@@ -181,6 +184,7 @@ var PDFFindController = {
       } else {
         this.nextMatch();
       }
+    }.bind(this));
   },
 
   updatePage: function(idx) {

web/viewer.js

@@ -162,8 +162,6 @@ var Settings = (function SettingsClosure() {
 var cache = new Cache(CACHE_SIZE);
 var currentPageNumber = 1;
 
-// TODO: Enable the FindBar *AFTER* the pagesPromise in the load function
-// got resolved
 //#include pdf_find_bar.js
 //#include pdf_find_controller.js
 //#include pdf_history.js
@@ -941,6 +939,8 @@ var PDFView = {
         pagePromises.push(pagePromise);
       }
 
+      PDFFindController.firstPagePromise.resolve();
+
       PDFJS.Promise.all(pagePromises).then(function(pages) {
         pagesPromise.resolve(pages);
       });