ZenBrowserMirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/zen-browser/pdf.js.git synced 2025-07-10 10:15:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Display the index of the currently active search result in the matches counter of the findbar (issue 6993, bug 1062025)

Browse source 
For the `PDFFindBar` implementation, similar to the native Firefox findbar, the matches count displayed is now limited to a (hopefully) reasonable value.

*Please note:* In order to enable this feature in the `MOZCENTRAL` version, a follow-up patch will be required once this has landed in `mozilla-central`.
This commit is contained in:
Jonas Jenwald 2018-09-08 14:19:34 +02:00
parent 510f1c84d2
commit c9a2564882
7 changed files with 77 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

35
web/pdf_find_controller.js
View file

@ -68,7 +68,7 @@ class PDFFindController {
this.pageContents = []; // Stores the text for each page.
this.pageMatches = [];
this.pageMatchesLength = null;
this.matchCount = 0;
this.matchesCountTotal = 0;
this.selected = { // Currently selected match.
pageIdx: -1,
matchIdx: -1,
@ -269,8 +269,9 @@ class PDFFindController {
}
// Update the match count.
if (this.pageMatches[pageIndex].length > 0) {
this.matchCount += this.pageMatches[pageIndex].length;
const pageMatchesCount = this.pageMatches[pageIndex].length;
if (pageMatchesCount > 0) {
this.matchesCountTotal += pageMatchesCount;
this._updateUIResultsCount();
}
}
@ -338,7 +339,7 @@ class PDFFindController {
this.hadMatch = false;
this.resumePageIdx = null;
this.pageMatches = [];
this.matchCount = 0;
this.matchesCountTotal = 0;
this.pageMatchesLength = null;
for (let i = 0; i < numPages; i++) {
@ -475,16 +476,32 @@ class PDFFindController {
}
}
_updateUIResultsCount() {
if (this.onUpdateResultsCount) {
this.onUpdateResultsCount(this.matchCount);
_requestMatchesCount() {
const { pageIdx, matchIdx, } = this.selected;
let current = 0;
if (matchIdx !== -1) {
for (let i = 0; i < pageIdx; i++) {
current += (this.pageMatches[i] && this.pageMatches[i].length) || 0;
}
current += matchIdx + 1;
}
return { current, total: this.matchesCountTotal, };
}
_updateUIResultsCount() {
if (!this.onUpdateResultsCount) {
return;
}
const matchesCount = this._requestMatchesCount();
this.onUpdateResultsCount(matchesCount);
}
_updateUIState(state, previous) {
if (this.onUpdateState) {
this.onUpdateState(state, previous, this.matchCount);
if (!this.onUpdateState) {
return;
}
const matchesCount = this._requestMatchesCount();
this.onUpdateState(state, previous, matchesCount);
}
}