Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14623 from Snuffleupagus/viewer-deprecated-cleanup

Browse Source 
Remove some deprecated code from the viewer
This commit is contained in:
Tim van der Meij 2022-03-02 20:46:27 +01:00 committed by GitHub
commit 038c832719
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/components/simpleviewer.js
View File

@ -77,11 +77,7 @@ eventBus.on("pagesinit", function () {
// We can try searching for things. // We can try searching for things.
if (SEARCH_FOR) { if (SEARCH_FOR) {
if (!pdfFindController._onFind) { eventBus.dispatch("find", { type: "", query: SEARCH_FOR });
pdfFindController.executeCommand("find", { query: SEARCH_FOR });
} else {
eventBus.dispatch("find", { type: "", query: SEARCH_FOR });
}
} }
}); });

6
examples/components/singlepageviewer.js
View File

@ -77,11 +77,7 @@ eventBus.on("pagesinit", function () {
// We can try searching for things. // We can try searching for things.
if (SEARCH_FOR) { if (SEARCH_FOR) {
if (!pdfFindController._onFind) { eventBus.dispatch("find", { type: "", query: SEARCH_FOR });
pdfFindController.executeCommand("find", { query: SEARCH_FOR });
} else {
eventBus.dispatch("find", { type: "", query: SEARCH_FOR });
}
} }
}); });

25
web/pdf_find_controller.js
View File

@ -261,22 +261,8 @@ class PDFFindController {
this._eventBus = eventBus; this._eventBus = eventBus;
this._reset(); this._reset();
eventBus._on("find", this._onFind.bind(this)); eventBus._on("find", this.#onFind.bind(this));
eventBus._on("findbarclose", this._onFindBarClose.bind(this)); eventBus._on("findbarclose", this.#onFindBarClose.bind(this));
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
this.executeCommand = (cmd, state) => {
console.error(
"Deprecated method `PDFFindController.executeCommand` called, " +
'please dispatch a "find"-event using the EventBus instead.'
);
const eventState = Object.assign(Object.create(null), state, {
type: cmd.substring("find".length),
});
this._onFind(eventState);
};
}
} }
get highlightMatches() { get highlightMatches() {
@ -316,10 +302,7 @@ class PDFFindController {
this._firstPageCapability.resolve(); this._firstPageCapability.resolve();
} }
/** #onFind(state) {
* @private
*/
_onFind(state) {
if (!state) { if (!state) {
return; return;
} }
@ -895,7 +878,7 @@ class PDFFindController {
} }
} }
_onFindBarClose(evt) { #onFindBarClose(evt) {
const pdfDocument = this._pdfDocument; const pdfDocument = this._pdfDocument;
// Since searching is asynchronous, ensure that the removal of highlighted // Since searching is asynchronous, ensure that the removal of highlighted
// matches (from the UI) is async too such that the 'updatetextlayermatches' // matches (from the UI) is async too such that the 'updatetextlayermatches'

17
web/pdf_page_view.js
View File

@ -320,23 +320,6 @@ class PDFPageView {
} }
update({ scale = 0, rotation = null, optionalContentConfigPromise = null }) { update({ scale = 0, rotation = null, optionalContentConfigPromise = null }) {
if (
typeof PDFJSDev !== "undefined" &&
PDFJSDev.test("GENERIC") &&
typeof arguments[0] !== "object"
) {
console.error(
"PDFPageView.update called with separate parameters, please use an object instead."
);
this.update({
scale: arguments[0],
rotation: arguments[1],
optionalContentConfigPromise: arguments[2],
});
return;
}
this.scale = scale || this.scale; this.scale = scale || this.scale;
if (typeof rotation === "number") { if (typeof rotation === "number") {
this.rotation = rotation; // The rotation may be zero. this.rotation = rotation; // The rotation may be zero.