Merge pull request #3645 from Snuffleupagus/presentationMode-fix-search

Fix searching in presentation mode in Firefox
This commit is contained in:
Brendan Dahl 2013-09-06 08:18:46 -07:00
commit ec52dea70e
2 changed files with 10 additions and 7 deletions

View File

@ -36,6 +36,7 @@ var TextLayerBuilder = function textLayerBuilder(options) {
this.pageIdx = options.pageIndex;
this.matches = [];
this.lastScrollSource = options.lastScrollSource;
this.isViewerInPresentationMode = options.isViewerInPresentationMode;
if(typeof PDFFindController === 'undefined') {
window.PDFFindController = null;
@ -304,8 +305,9 @@ var TextLayerBuilder = function textLayerBuilder(options) {
var isSelected = isSelectedPage && i === selectedMatchIdx;
var highlightSuffix = (isSelected ? ' selected' : '');
if (isSelected)
scrollIntoView(textDivs[begin.divIdx], {top: -50});
if (isSelected && !this.isViewerInPresentationMode) {
scrollIntoView(textDivs[begin.divIdx], { top: -50 });
}
// Match inside new div.
if (!prevEnd || begin.divIdx !== prevEnd.divIdx) {

View File

@ -1904,11 +1904,12 @@ var PageView = function pageView(container, id, scale,
div.appendChild(textLayerDiv);
}
var textLayer = this.textLayer =
textLayerDiv ? new TextLayerBuilder({
textLayerDiv: textLayerDiv,
pageIndex: this.id - 1,
lastScrollSource: PDFView
}) : null;
textLayerDiv ? new TextLayerBuilder({
textLayerDiv: textLayerDiv,
pageIndex: this.id - 1,
lastScrollSource: PDFView,
isViewerInPresentationMode: PDFView.isPresentationMode
}) : null;
if (outputScale.scaled) {
var cssScale = 'scale(' + (1 / outputScale.sx) + ', ' +