viewerjs-rails 0.0.1 → 0.0.2

data/app/assets/javascripts/viewerjs/pdf_find_bar.js

@@ -27,149 +27,151 @@
  */
 var PDFFindBar = {
 
-  opened: false,
-  bar: null,
-  toggleButton: null,
-  findField: null,
-  highlightAll: null,
-  caseSensitive: null,
-  findMsg: null,
-  findStatusIcon: null,
-  findPreviousButton: null,
-  findNextButton: null,
-
-  initialize: function(options) {
-    if(typeof PDFFindController === 'undefined' || PDFFindController === null) {
-        throw 'PDFFindBar cannot be initialized ' +
-            'without a PDFFindController instance.';
-    }
+    opened: false,
+    bar: null,
+    toggleButton: null,
+    findField: null,
+    highlightAll: null,
+    caseSensitive: null,
+    findMsg: null,
+    findStatusIcon: null,
+    findPreviousButton: null,
+    findNextButton: null,
+
+    initialize: function (options) {
+        if (typeof PDFFindController === 'undefined' || PDFFindController === null) {
+            throw 'PDFFindBar cannot be initialized ' +
+                'without a PDFFindController instance.';
+        }
 
-    this.bar = options.bar;
-    this.toggleButton = options.toggleButton;
-    this.findField = options.findField;
-    this.highlightAll = options.highlightAllCheckbox;
-    this.caseSensitive = options.caseSensitiveCheckbox;
-    this.findMsg = options.findMsg;
-    this.findStatusIcon = options.findStatusIcon;
-    this.findPreviousButton = options.findPreviousButton;
-    this.findNextButton = options.findNextButton;
-
-    var self = this;
-    this.toggleButton.addEventListener('click', function() {
-      self.toggle();
-    });
-
-    this.findField.addEventListener('input', function() {
-      self.dispatchEvent('');
-    });
-
-    this.bar.addEventListener('keydown', function(evt) {
-      switch (evt.keyCode) {
-        case 13: // Enter
-          if (evt.target === self.findField) {
-            self.dispatchEvent('again', evt.shiftKey);
-          }
-          break;
-        case 27: // Escape
-          self.close();
-          break;
-      }
-    });
-
-    this.findPreviousButton.addEventListener('click',
-      function() { self.dispatchEvent('again', true); }
-    );
-
-    this.findNextButton.addEventListener('click', function() {
-      self.dispatchEvent('again', false);
-    });
-
-    this.highlightAll.addEventListener('click', function() {
-      self.dispatchEvent('highlightallchange');
-    });
-
-    this.caseSensitive.addEventListener('click', function() {
-      self.dispatchEvent('casesensitivitychange');
-    });
-  },
-
-  dispatchEvent: function(aType, aFindPrevious) {
-    var event = document.createEvent('CustomEvent');
-    event.initCustomEvent('find' + aType, true, true, {
-      query: this.findField.value,
-      caseSensitive: this.caseSensitive.checked,
-      highlightAll: this.highlightAll.checked,
-      findPrevious: aFindPrevious
-    });
-    return window.dispatchEvent(event);
-  },
-
-  updateUIState: function(state, previous) {
-    var notFound = false;
-    var findMsg = '';
-    var status = '';
-
-    switch (state) {
-      case FindStates.FIND_FOUND:
-        break;
-
-      case FindStates.FIND_PENDING:
-        status = 'pending';
-        break;
-
-      case FindStates.FIND_NOTFOUND:
-        findMsg = mozL10n.get('find_not_found', null, 'Phrase not found');
-        notFound = true;
-        break;
-
-      case FindStates.FIND_WRAPPED:
-        if (previous) {
-          findMsg = mozL10n.get('find_reached_top', null,
-                      'Reached top of document, continued from bottom');
-        } else {
-          findMsg = mozL10n.get('find_reached_bottom', null,
-                                'Reached end of document, continued from top');
+        this.bar = options.bar;
+        this.toggleButton = options.toggleButton;
+        this.findField = options.findField;
+        this.highlightAll = options.highlightAllCheckbox;
+        this.caseSensitive = options.caseSensitiveCheckbox;
+        this.findMsg = options.findMsg;
+        this.findStatusIcon = options.findStatusIcon;
+        this.findPreviousButton = options.findPreviousButton;
+        this.findNextButton = options.findNextButton;
+
+        var self = this;
+        this.toggleButton.addEventListener('click', function () {
+            self.toggle();
+        });
+
+        this.findField.addEventListener('input', function () {
+            self.dispatchEvent('');
+        });
+
+        this.bar.addEventListener('keydown', function (evt) {
+            switch (evt.keyCode) {
+                case 13: // Enter
+                    if (evt.target === self.findField) {
+                        self.dispatchEvent('again', evt.shiftKey);
+                    }
+                    break;
+                case 27: // Escape
+                    self.close();
+                    break;
+            }
+        });
+
+        this.findPreviousButton.addEventListener('click',
+            function () {
+                self.dispatchEvent('again', true);
+            }
+        );
+
+        this.findNextButton.addEventListener('click', function () {
+            self.dispatchEvent('again', false);
+        });
+
+        this.highlightAll.addEventListener('click', function () {
+            self.dispatchEvent('highlightallchange');
+        });
+
+        this.caseSensitive.addEventListener('click', function () {
+            self.dispatchEvent('casesensitivitychange');
+        });
+    },
+
+    dispatchEvent: function (aType, aFindPrevious) {
+        var event = document.createEvent('CustomEvent');
+        event.initCustomEvent('find' + aType, true, true, {
+            query: this.findField.value,
+            caseSensitive: this.caseSensitive.checked,
+            highlightAll: this.highlightAll.checked,
+            findPrevious: aFindPrevious
+        });
+        return window.dispatchEvent(event);
+    },
+
+    updateUIState: function (state, previous) {
+        var notFound = false;
+        var findMsg = '';
+        var status = '';
+
+        switch (state) {
+            case FindStates.FIND_FOUND:
+                break;
+
+            case FindStates.FIND_PENDING:
+                status = 'pending';
+                break;
+
+            case FindStates.FIND_NOTFOUND:
+                findMsg = mozL10n.get('find_not_found', null, 'Phrase not found');
+                notFound = true;
+                break;
+
+            case FindStates.FIND_WRAPPED:
+                if (previous) {
+                    findMsg = mozL10n.get('find_reached_top', null,
+                        'Reached top of document, continued from bottom');
+                } else {
+                    findMsg = mozL10n.get('find_reached_bottom', null,
+                        'Reached end of document, continued from top');
+                }
+                break;
         }
-        break;
-    }
 
-    if (notFound) {
-      this.findField.classList.add('notFound');
-    } else {
-      this.findField.classList.remove('notFound');
-    }
+        if (notFound) {
+            this.findField.classList.add('notFound');
+        } else {
+            this.findField.classList.remove('notFound');
+        }
 
-    this.findField.setAttribute('data-status', status);
-    this.findMsg.textContent = findMsg;
-  },
+        this.findField.setAttribute('data-status', status);
+        this.findMsg.textContent = findMsg;
+    },
 
-  open: function() {
-    if (!this.opened) {
-      this.opened = true;
-      this.toggleButton.classList.add('toggled');
-      this.bar.classList.remove('hidden');
-    }
+    open: function () {
+        if (!this.opened) {
+            this.opened = true;
+            this.toggleButton.classList.add('toggled');
+            this.bar.classList.remove('hidden');
+        }
 
-    this.findField.select();
-    this.findField.focus();
-  },
+        this.findField.select();
+        this.findField.focus();
+    },
 
-  close: function() {
-    if (!this.opened) return;
+    close: function () {
+        if (!this.opened) return;
 
-    this.opened = false;
-    this.toggleButton.classList.remove('toggled');
-    this.bar.classList.add('hidden');
+        this.opened = false;
+        this.toggleButton.classList.remove('toggled');
+        this.bar.classList.add('hidden');
 
-    PDFFindController.active = false;
-  },
+        PDFFindController.active = false;
+    },
 
-  toggle: function() {
-    if (this.opened) {
-      this.close();
-    } else {
-      this.open();
+    toggle: function () {
+        if (this.opened) {
+            this.close();
+        } else {
+            this.open();
+        }
     }
-  }
 };
 

data/app/assets/javascripts/viewerjs/pdf_find_controller.js

@@ -24,332 +24,334 @@
  */
 
 var PDFFindController = {
-  startedTextExtraction: false,
+    startedTextExtraction: false,
 
-  extractTextPromises: [],
+    extractTextPromises: [],
 
-  pendingFindMatches: {},
+    pendingFindMatches: {},
 
-  // If active, find results will be highlighted.
-  active: false,
+    // If active, find results will be highlighted.
+    active: false,
 
-  // Stores the text for each page.
-  pageContents: [],
+    // Stores the text for each page.
+    pageContents: [],
 
-  pageMatches: [],
+    pageMatches: [],
 
-  // Currently selected match.
-  selected: {
-    pageIdx: -1,
-    matchIdx: -1
-  },
+    // Currently selected match.
+    selected: {
+        pageIdx: -1,
+        matchIdx: -1
+    },
 
-  // Where find algorithm currently is in the document.
-  offset: {
-    pageIdx: null,
-    matchIdx: null
-  },
+    // Where find algorithm currently is in the document.
+    offset: {
+        pageIdx: null,
+        matchIdx: null
+    },
 
-  resumePageIdx: null,
+    resumePageIdx: null,
 
-  state: null,
+    state: null,
 
-  dirtyMatch: false,
+    dirtyMatch: false,
 
-  findTimeout: null,
+    findTimeout: null,
 
-  pdfPageSource: null,
+    pdfPageSource: null,
 
-  integratedFind: false,
+    integratedFind: false,
 
-  initialize: function(options) {
-    if(typeof PDFFindBar === 'undefined' || PDFFindBar === null) {
-      throw 'PDFFindController cannot be initialized ' +
-            'without a PDFFindController instance';
-    }
+    initialize: function (options) {
+        if (typeof PDFFindBar === 'undefined' || PDFFindBar === null) {
+            throw 'PDFFindController cannot be initialized ' +
+                'without a PDFFindController instance';
+        }
 
-    this.pdfPageSource = options.pdfPageSource;
-    this.integratedFind = options.integratedFind;
+        this.pdfPageSource = options.pdfPageSource;
+        this.integratedFind = options.integratedFind;
 
-    var events = [
-      'find',
-      'findagain',
-      'findhighlightallchange',
-      'findcasesensitivitychange'
-    ];
+        var events = [
+            'find',
+            'findagain',
+            'findhighlightallchange',
+            'findcasesensitivitychange'
+        ];
 
-    this.firstPagePromise = new Promise(function (resolve) {
-      this.resolveFirstPage = resolve;
-    }.bind(this));
-    this.handleEvent = this.handleEvent.bind(this);
+        this.firstPagePromise = new Promise(function (resolve) {
+            this.resolveFirstPage = resolve;
+        }.bind(this));
+        this.handleEvent = this.handleEvent.bind(this);
 
-    for (var i = 0; i < events.length; i++) {
-      window.addEventListener(events[i], this.handleEvent);
-    }
-  },
-
-  reset: function pdfFindControllerReset() {
-    this.startedTextExtraction = false;
-    this.extractTextPromises = [];
-    this.active = false;
-  },
-
-  calcFindMatch: function(pageIndex) {
-    var pageContent = this.pageContents[pageIndex];
-    var query = this.state.query;
-    var caseSensitive = this.state.caseSensitive;
-    var queryLen = query.length;
-
-    if (queryLen === 0) {
-      // Do nothing the matches should be wiped out already.
-      return;
-    }
+        for (var i = 0; i < events.length; i++) {
+            window.addEventListener(events[i], this.handleEvent);
+        }
+    },
+
+    reset: function pdfFindControllerReset() {
+        this.startedTextExtraction = false;
+        this.extractTextPromises = [];
+        this.active = false;
+    },
+
+    calcFindMatch: function (pageIndex) {
+        var pageContent = this.pageContents[pageIndex];
+        var query = this.state.query;
+        var caseSensitive = this.state.caseSensitive;
+        var queryLen = query.length;
+
+        if (queryLen === 0) {
+            // Do nothing the matches should be wiped out already.
+            return;
+        }
 
-    if (!caseSensitive) {
-      pageContent = pageContent.toLowerCase();
-      query = query.toLowerCase();
-    }
+        if (!caseSensitive) {
+            pageContent = pageContent.toLowerCase();
+            query = query.toLowerCase();
+        }
 
-    var matches = [];
+        var matches = [];
 
-    var matchIdx = -queryLen;
-    while (true) {
-      matchIdx = pageContent.indexOf(query, matchIdx + queryLen);
-      if (matchIdx === -1) {
-        break;
-      }
+        var matchIdx = -queryLen;
+        while (true) {
+            matchIdx = pageContent.indexOf(query, matchIdx + queryLen);
+            if (matchIdx === -1) {
+                break;
+            }
 
-      matches.push(matchIdx);
-    }
-    this.pageMatches[pageIndex] = matches;
-    this.updatePage(pageIndex);
-    if (this.resumePageIdx === pageIndex) {
-      this.resumePageIdx = null;
-      this.nextPageMatch();
-    }
-  },
+            matches.push(matchIdx);
+        }
+        this.pageMatches[pageIndex] = matches;
+        this.updatePage(pageIndex);
+        if (this.resumePageIdx === pageIndex) {
+            this.resumePageIdx = null;
+            this.nextPageMatch();
+        }
+    },
 
-  extractText: function() {
-    if (this.startedTextExtraction) {
-      return;
-    }
-    this.startedTextExtraction = true;
-
-    this.pageContents = [];
-    var extractTextPromisesResolves = [];
-    for (var i = 0, ii = this.pdfPageSource.pdfDocument.numPages; i < ii; i++) {
-      this.extractTextPromises.push(new Promise(function (resolve) {
-        extractTextPromisesResolves.push(resolve);
-      }));
-    }
+    extractText: function () {
+        if (this.startedTextExtraction) {
+            return;
+        }
+        this.startedTextExtraction = true;
+
+        this.pageContents = [];
+        var extractTextPromisesResolves = [];
+        for (var i = 0, ii = this.pdfPageSource.pdfDocument.numPages; i < ii; i++) {
+            this.extractTextPromises.push(new Promise(function (resolve) {
+                extractTextPromisesResolves.push(resolve);
+            }));
+        }
+
+        var self = this;
 
-    var self = this;
-    function extractPageText(pageIndex) {
-      self.pdfPageSource.pages[pageIndex].getTextContent().then(
-        function textContentResolved(bidiTexts) {
-          var str = '';
+        function extractPageText(pageIndex) {
+            self.pdfPageSource.pages[pageIndex].getTextContent().then(
+                function textContentResolved(bidiTexts) {
+                    var str = '';
 
-          for (var i = 0; i < bidiTexts.length; i++) {
-            str += bidiTexts[i].str;
-          }
+                    for (var i = 0; i < bidiTexts.length; i++) {
+                        str += bidiTexts[i].str;
+                    }
 
-          // Store the pageContent as a string.
-          self.pageContents.push(str);
+                    // Store the pageContent as a string.
+                    self.pageContents.push(str);
 
-          extractTextPromisesResolves[pageIndex](pageIndex);
-          if ((pageIndex + 1) < self.pdfPageSource.pages.length)
-            extractPageText(pageIndex + 1);
+                    extractTextPromisesResolves[pageIndex](pageIndex);
+                    if ((pageIndex + 1) < self.pdfPageSource.pages.length)
+                        extractPageText(pageIndex + 1);
+                }
+            );
         }
-      );
-    }
-    extractPageText(0);
-  },
 
-  handleEvent: function(e) {
-    if (this.state === null || e.type !== 'findagain') {
-      this.dirtyMatch = true;
-    }
-    this.state = e.detail;
-    this.updateUIState(FindStates.FIND_PENDING);
-
-    this.firstPagePromise.then(function() {
-      this.extractText();
-
-      clearTimeout(this.findTimeout);
-      if (e.type === 'find') {
-        // Only trigger the find action after 250ms of silence.
-        this.findTimeout = setTimeout(this.nextMatch.bind(this), 250);
-      } else {
-        this.nextMatch();
-      }
-    }.bind(this));
-  },
-
-  updatePage: function(idx) {
-    var page = this.pdfPageSource.pages[idx];
-
-    if (this.selected.pageIdx === idx) {
-      // If the page is selected, scroll the page into view, which triggers
-      // rendering the page, which adds the textLayer. Once the textLayer is
-      // build, it will scroll onto the selected match.
-      page.scrollIntoView();
-    }
+        extractPageText(0);
+    },
 
-    if (page.textLayer) {
-      page.textLayer.updateMatches();
-    }
-  },
-
-  nextMatch: function() {
-    var previous = this.state.findPrevious;
-    var currentPageIndex = this.pdfPageSource.page - 1;
-    var numPages = this.pdfPageSource.pages.length;
-
-    this.active = true;
-
-    if (this.dirtyMatch) {
-      // Need to recalculate the matches, reset everything.
-      this.dirtyMatch = false;
-      this.selected.pageIdx = this.selected.matchIdx = -1;
-      this.offset.pageIdx = currentPageIndex;
-      this.offset.matchIdx = null;
-      this.hadMatch = false;
-      this.resumePageIdx = null;
-      this.pageMatches = [];
-      var self = this;
-
-      for (var i = 0; i < numPages; i++) {
-        // Wipe out any previous highlighted matches.
-        this.updatePage(i);
-
-        // As soon as the text is extracted start finding the matches.
-        if (!(i in this.pendingFindMatches)) {
-          this.pendingFindMatches[i] = true;
-          this.extractTextPromises[i].then(function(pageIdx) {
-            delete self.pendingFindMatches[pageIdx];
-            self.calcFindMatch(pageIdx);
-          });
+    handleEvent: function (e) {
+        if (this.state === null || e.type !== 'findagain') {
+            this.dirtyMatch = true;
+        }
+        this.state = e.detail;
+        this.updateUIState(FindStates.FIND_PENDING);
+
+        this.firstPagePromise.then(function () {
+            this.extractText();
+
+            clearTimeout(this.findTimeout);
+            if (e.type === 'find') {
+                // Only trigger the find action after 250ms of silence.
+                this.findTimeout = setTimeout(this.nextMatch.bind(this), 250);
+            } else {
+                this.nextMatch();
+            }
+        }.bind(this));
+    },
+
+    updatePage: function (idx) {
+        var page = this.pdfPageSource.pages[idx];
+
+        if (this.selected.pageIdx === idx) {
+            // If the page is selected, scroll the page into view, which triggers
+            // rendering the page, which adds the textLayer. Once the textLayer is
+            // build, it will scroll onto the selected match.
+            page.scrollIntoView();
         }
-      }
-    }
 
-    // If there's no query there's no point in searching.
-    if (this.state.query === '') {
-      this.updateUIState(FindStates.FIND_FOUND);
-      return;
-    }
+        if (page.textLayer) {
+            page.textLayer.updateMatches();
+        }
+    },
+
+    nextMatch: function () {
+        var previous = this.state.findPrevious;
+        var currentPageIndex = this.pdfPageSource.page - 1;
+        var numPages = this.pdfPageSource.pages.length;
+
+        this.active = true;
+
+        if (this.dirtyMatch) {
+            // Need to recalculate the matches, reset everything.
+            this.dirtyMatch = false;
+            this.selected.pageIdx = this.selected.matchIdx = -1;
+            this.offset.pageIdx = currentPageIndex;
+            this.offset.matchIdx = null;
+            this.hadMatch = false;
+            this.resumePageIdx = null;
+            this.pageMatches = [];
+            var self = this;
+
+            for (var i = 0; i < numPages; i++) {
+                // Wipe out any previous highlighted matches.
+                this.updatePage(i);
+
+                // As soon as the text is extracted start finding the matches.
+                if (!(i in this.pendingFindMatches)) {
+                    this.pendingFindMatches[i] = true;
+                    this.extractTextPromises[i].then(function (pageIdx) {
+                        delete self.pendingFindMatches[pageIdx];
+                        self.calcFindMatch(pageIdx);
+                    });
+                }
+            }
+        }
 
-    // If we're waiting on a page, we return since we can't do anything else.
-    if (this.resumePageIdx) {
-      return;
-    }
+        // If there's no query there's no point in searching.
+        if (this.state.query === '') {
+            this.updateUIState(FindStates.FIND_FOUND);
+            return;
+        }
 
-    var offset = this.offset;
-    // If there's already a matchIdx that means we are iterating through a
-    // page's matches.
-    if (offset.matchIdx !== null) {
-      var numPageMatches = this.pageMatches[offset.pageIdx].length;
-      if ((!previous && offset.matchIdx + 1 < numPageMatches) ||
-          (previous && offset.matchIdx > 0)) {
-        // The simple case, we just have advance the matchIdx to select the next
-        // match on the page.
-        this.hadMatch = true;
-        offset.matchIdx = previous ? offset.matchIdx - 1 : offset.matchIdx + 1;
-        this.updateMatch(true);
-        return;
-      }
-      // We went beyond the current page's matches, so we advance to the next
-      // page.
-      this.advanceOffsetPage(previous);
-    }
-    // Start searching through the page.
-    this.nextPageMatch();
-  },
-
-  matchesReady: function(matches) {
-    var offset = this.offset;
-    var numMatches = matches.length;
-    var previous = this.state.findPrevious;
-    if (numMatches) {
-      // There were matches for the page, so initialize the matchIdx.
-      this.hadMatch = true;
-      offset.matchIdx = previous ? numMatches - 1 : 0;
-      this.updateMatch(true);
-      // matches were found
-      return true;
-    } else {
-      // No matches attempt to search the next page.
-      this.advanceOffsetPage(previous);
-      if (offset.wrapped) {
-        offset.matchIdx = null;
-        if (!this.hadMatch) {
-          // No point in wrapping there were no matches.
-          this.updateMatch(false);
-          // while matches were not found, searching for a page 
-          // with matches should nevertheless halt.
-          return true;
+        // If we're waiting on a page, we return since we can't do anything else.
+        if (this.resumePageIdx) {
+            return;
         }
-      }
-      // matches were not found (and searching is not done)
-      return false;
-    }
-  },
 
-  nextPageMatch: function() {
-    if (this.resumePageIdx !== null) {
-      console.error('There can only be one pending page.');
-    }
-    do {
-      var pageIdx = this.offset.pageIdx;
-      var matches = this.pageMatches[pageIdx];
-      if (!matches) {
-        // The matches don't exist yet for processing by "matchesReady",
-        // so set a resume point for when they do exist.
-        this.resumePageIdx = pageIdx;
-        break;
-      }
-    } while (!this.matchesReady(matches));
-  },
-
-  advanceOffsetPage: function(previous) {
-    var offset = this.offset;
-    var numPages = this.extractTextPromises.length;
-    offset.pageIdx = previous ? offset.pageIdx - 1 : offset.pageIdx + 1;
-    offset.matchIdx = null;
-    if (offset.pageIdx >= numPages || offset.pageIdx < 0) {
-      offset.pageIdx = previous ? numPages - 1 : 0;
-      offset.wrapped = true;
-      return;
-    }
-  },
-
-  updateMatch: function(found) {
-    var state = FindStates.FIND_NOTFOUND;
-    var wrapped = this.offset.wrapped;
-    this.offset.wrapped = false;
-    if (found) {
-      var previousPage = this.selected.pageIdx;
-      this.selected.pageIdx = this.offset.pageIdx;
-      this.selected.matchIdx = this.offset.matchIdx;
-      state = wrapped ? FindStates.FIND_WRAPPED : FindStates.FIND_FOUND;
-      // Update the currently selected page to wipe out any selected matches.
-      if (previousPage !== -1 && previousPage !== this.selected.pageIdx) {
-        this.updatePage(previousPage);
-      }
-    }
-    this.updateUIState(state, this.state.findPrevious);
-    if (this.selected.pageIdx !== -1) {
-      this.updatePage(this.selected.pageIdx, true);
-    }
-  },
+        var offset = this.offset;
+        // If there's already a matchIdx that means we are iterating through a
+        // page's matches.
+        if (offset.matchIdx !== null) {
+            var numPageMatches = this.pageMatches[offset.pageIdx].length;
+            if ((!previous && offset.matchIdx + 1 < numPageMatches) ||
+                (previous && offset.matchIdx > 0)) {
+                // The simple case, we just have advance the matchIdx to select the next
+                // match on the page.
+                this.hadMatch = true;
+                offset.matchIdx = previous ? offset.matchIdx - 1 : offset.matchIdx + 1;
+                this.updateMatch(true);
+                return;
+            }
+            // We went beyond the current page's matches, so we advance to the next
+            // page.
+            this.advanceOffsetPage(previous);
+        }
+        // Start searching through the page.
+        this.nextPageMatch();
+    },
+
+    matchesReady: function (matches) {
+        var offset = this.offset;
+        var numMatches = matches.length;
+        var previous = this.state.findPrevious;
+        if (numMatches) {
+            // There were matches for the page, so initialize the matchIdx.
+            this.hadMatch = true;
+            offset.matchIdx = previous ? numMatches - 1 : 0;
+            this.updateMatch(true);
+            // matches were found
+            return true;
+        } else {
+            // No matches attempt to search the next page.
+            this.advanceOffsetPage(previous);
+            if (offset.wrapped) {
+                offset.matchIdx = null;
+                if (!this.hadMatch) {
+                    // No point in wrapping there were no matches.
+                    this.updateMatch(false);
+                    // while matches were not found, searching for a page
+                    // with matches should nevertheless halt.
+                    return true;
+                }
+            }
+            // matches were not found (and searching is not done)
+            return false;
+        }
+    },
 
-  updateUIState: function(state, previous) {
-    if (this.integratedFind) {
-      FirefoxCom.request('updateFindControlState',
-                         {result: state, findPrevious: previous});
-      return;
+    nextPageMatch: function () {
+        if (this.resumePageIdx !== null) {
+            console.error('There can only be one pending page.');
+        }
+        do {
+            var pageIdx = this.offset.pageIdx;
+            var matches = this.pageMatches[pageIdx];
+            if (!matches) {
+                // The matches don't exist yet for processing by "matchesReady",
+                // so set a resume point for when they do exist.
+                this.resumePageIdx = pageIdx;
+                break;
+            }
+        } while (!this.matchesReady(matches));
+    },
+
+    advanceOffsetPage: function (previous) {
+        var offset = this.offset;
+        var numPages = this.extractTextPromises.length;
+        offset.pageIdx = previous ? offset.pageIdx - 1 : offset.pageIdx + 1;
+        offset.matchIdx = null;
+        if (offset.pageIdx >= numPages || offset.pageIdx < 0) {
+            offset.pageIdx = previous ? numPages - 1 : 0;
+            offset.wrapped = true;
+            return;
+        }
+    },
+
+    updateMatch: function (found) {
+        var state = FindStates.FIND_NOTFOUND;
+        var wrapped = this.offset.wrapped;
+        this.offset.wrapped = false;
+        if (found) {
+            var previousPage = this.selected.pageIdx;
+            this.selected.pageIdx = this.offset.pageIdx;
+            this.selected.matchIdx = this.offset.matchIdx;
+            state = wrapped ? FindStates.FIND_WRAPPED : FindStates.FIND_FOUND;
+            // Update the currently selected page to wipe out any selected matches.
+            if (previousPage !== -1 && previousPage !== this.selected.pageIdx) {
+                this.updatePage(previousPage);
+            }
+        }
+        this.updateUIState(state, this.state.findPrevious);
+        if (this.selected.pageIdx !== -1) {
+            this.updatePage(this.selected.pageIdx, true);
+        }
+    },
+
+    updateUIState: function (state, previous) {
+        if (this.integratedFind) {
+            FirefoxCom.request('updateFindControlState',
+                {result: state, findPrevious: previous});
+            return;
+        }
+        PDFFindBar.updateUIState(state, previous);
     }
-    PDFFindBar.updateUIState(state, previous);
-  }
 };