Remove the find controller setter in web/base_viewer.js
With `PDFFindController` instances no longer (directly) depending on `BaseViewer` instances, we can pass a single `findController` when initializing a viewer, similar to other components.
This commit is contained in:
parent
38ff79186a
commit
f79fb88864
@ -38,17 +38,17 @@ var container = document.getElementById('viewerContainer');
|
|||||||
// (Optionally) enable hyperlinks within PDF files.
|
// (Optionally) enable hyperlinks within PDF files.
|
||||||
var pdfLinkService = new pdfjsViewer.PDFLinkService();
|
var pdfLinkService = new pdfjsViewer.PDFLinkService();
|
||||||
|
|
||||||
var pdfViewer = new pdfjsViewer.PDFViewer({
|
|
||||||
container: container,
|
|
||||||
linkService: pdfLinkService,
|
|
||||||
});
|
|
||||||
pdfLinkService.setViewer(pdfViewer);
|
|
||||||
|
|
||||||
// (Optionally) enable find controller.
|
// (Optionally) enable find controller.
|
||||||
var pdfFindController = new pdfjsViewer.PDFFindController({
|
var pdfFindController = new pdfjsViewer.PDFFindController({
|
||||||
linkService: pdfLinkService,
|
linkService: pdfLinkService,
|
||||||
});
|
});
|
||||||
pdfViewer.setFindController(pdfFindController);
|
|
||||||
|
var pdfViewer = new pdfjsViewer.PDFViewer({
|
||||||
|
container: container,
|
||||||
|
linkService: pdfLinkService,
|
||||||
|
findController: pdfFindController,
|
||||||
|
});
|
||||||
|
pdfLinkService.setViewer(pdfViewer);
|
||||||
|
|
||||||
container.addEventListener('pagesinit', function () {
|
container.addEventListener('pagesinit', function () {
|
||||||
// We can use pdfViewer now, e.g. let's change default scale.
|
// We can use pdfViewer now, e.g. let's change default scale.
|
||||||
|
@ -38,17 +38,17 @@ var container = document.getElementById('viewerContainer');
|
|||||||
// (Optionally) enable hyperlinks within PDF files.
|
// (Optionally) enable hyperlinks within PDF files.
|
||||||
var pdfLinkService = new pdfjsViewer.PDFLinkService();
|
var pdfLinkService = new pdfjsViewer.PDFLinkService();
|
||||||
|
|
||||||
var pdfSinglePageViewer = new pdfjsViewer.PDFSinglePageViewer({
|
|
||||||
container: container,
|
|
||||||
linkService: pdfLinkService,
|
|
||||||
});
|
|
||||||
pdfLinkService.setViewer(pdfSinglePageViewer);
|
|
||||||
|
|
||||||
// (Optionally) enable find controller.
|
// (Optionally) enable find controller.
|
||||||
var pdfFindController = new pdfjsViewer.PDFFindController({
|
var pdfFindController = new pdfjsViewer.PDFFindController({
|
||||||
linkService: pdfLinkService,
|
linkService: pdfLinkService,
|
||||||
});
|
});
|
||||||
pdfSinglePageViewer.setFindController(pdfFindController);
|
|
||||||
|
var pdfSinglePageViewer = new pdfjsViewer.PDFSinglePageViewer({
|
||||||
|
container: container,
|
||||||
|
linkService: pdfLinkService,
|
||||||
|
findController: pdfFindController,
|
||||||
|
});
|
||||||
|
pdfLinkService.setViewer(pdfSinglePageViewer);
|
||||||
|
|
||||||
container.addEventListener('pagesinit', function () {
|
container.addEventListener('pagesinit', function () {
|
||||||
// We can use pdfSinglePageViewer now, e.g. let's change default scale.
|
// We can use pdfSinglePageViewer now, e.g. let's change default scale.
|
||||||
|
13
web/app.js
13
web/app.js
@ -305,6 +305,12 @@ let PDFViewerApplication = {
|
|||||||
});
|
});
|
||||||
this.downloadManager = downloadManager;
|
this.downloadManager = downloadManager;
|
||||||
|
|
||||||
|
const findController = new PDFFindController({
|
||||||
|
linkService: pdfLinkService,
|
||||||
|
eventBus,
|
||||||
|
});
|
||||||
|
this.findController = findController;
|
||||||
|
|
||||||
let container = appConfig.mainContainer;
|
let container = appConfig.mainContainer;
|
||||||
let viewer = appConfig.viewerContainer;
|
let viewer = appConfig.viewerContainer;
|
||||||
this.pdfViewer = new PDFViewer({
|
this.pdfViewer = new PDFViewer({
|
||||||
@ -314,6 +320,7 @@ let PDFViewerApplication = {
|
|||||||
renderingQueue: pdfRenderingQueue,
|
renderingQueue: pdfRenderingQueue,
|
||||||
linkService: pdfLinkService,
|
linkService: pdfLinkService,
|
||||||
downloadManager,
|
downloadManager,
|
||||||
|
findController,
|
||||||
renderer: AppOptions.get('renderer'),
|
renderer: AppOptions.get('renderer'),
|
||||||
enableWebGL: AppOptions.get('enableWebGL'),
|
enableWebGL: AppOptions.get('enableWebGL'),
|
||||||
l10n: this.l10n,
|
l10n: this.l10n,
|
||||||
@ -342,12 +349,6 @@ let PDFViewerApplication = {
|
|||||||
});
|
});
|
||||||
pdfLinkService.setHistory(this.pdfHistory);
|
pdfLinkService.setHistory(this.pdfHistory);
|
||||||
|
|
||||||
this.findController = new PDFFindController({
|
|
||||||
linkService: pdfLinkService,
|
|
||||||
eventBus,
|
|
||||||
});
|
|
||||||
this.pdfViewer.setFindController(this.findController);
|
|
||||||
|
|
||||||
// TODO: improve `PDFFindBar` constructor parameter passing
|
// TODO: improve `PDFFindBar` constructor parameter passing
|
||||||
let findBarConfig = Object.create(appConfig.findBar);
|
let findBarConfig = Object.create(appConfig.findBar);
|
||||||
findBarConfig.eventBus = eventBus;
|
findBarConfig.eventBus = eventBus;
|
||||||
|
@ -49,6 +49,8 @@ const SpreadMode = {
|
|||||||
* @property {IPDFLinkService} linkService - The navigation/linking service.
|
* @property {IPDFLinkService} linkService - The navigation/linking service.
|
||||||
* @property {DownloadManager} downloadManager - (optional) The download
|
* @property {DownloadManager} downloadManager - (optional) The download
|
||||||
* manager component.
|
* manager component.
|
||||||
|
* @property {PDFFindController} findController - (optional) The find
|
||||||
|
* controller component.
|
||||||
* @property {PDFRenderingQueue} renderingQueue - (optional) The rendering
|
* @property {PDFRenderingQueue} renderingQueue - (optional) The rendering
|
||||||
* queue object.
|
* queue object.
|
||||||
* @property {boolean} removePageBorders - (optional) Removes the border shadow
|
* @property {boolean} removePageBorders - (optional) Removes the border shadow
|
||||||
@ -142,6 +144,7 @@ class BaseViewer {
|
|||||||
this.eventBus = options.eventBus || getGlobalEventBus();
|
this.eventBus = options.eventBus || getGlobalEventBus();
|
||||||
this.linkService = options.linkService || new SimpleLinkService();
|
this.linkService = options.linkService || new SimpleLinkService();
|
||||||
this.downloadManager = options.downloadManager || null;
|
this.downloadManager = options.downloadManager || null;
|
||||||
|
this.findController = options.findController || null;
|
||||||
this.removePageBorders = options.removePageBorders || false;
|
this.removePageBorders = options.removePageBorders || false;
|
||||||
this.textLayerMode = Number.isInteger(options.textLayerMode) ?
|
this.textLayerMode = Number.isInteger(options.textLayerMode) ?
|
||||||
options.textLayerMode : TextLayerMode.ENABLE;
|
options.textLayerMode : TextLayerMode.ENABLE;
|
||||||
@ -955,10 +958,6 @@ class BaseViewer {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
setFindController(findController) {
|
|
||||||
this.findController = findController;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @returns {boolean} Whether all pages of the PDF document have identical
|
* @returns {boolean} Whether all pages of the PDF document have identical
|
||||||
* widths and heights.
|
* widths and heights.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user