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

Merge pull request #8994 from Snuffleupagus/PDFHistory-forward

Browse Source 
Fix a regression that (effectively) makes `PDFHistory.forward` a no-op
This commit is contained in:
Tim van der Meij 2017-10-05 23:04:46 +02:00 committed by GitHub
commit 460c4e38cc
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/pdf_history.js
View File

@ -109,7 +109,7 @@ class PDFHistory {
this._currentHash = getCurrentHash(); this._currentHash = getCurrentHash();
this._numPositionUpdates = 0; this._numPositionUpdates = 0;
this._currentUid = this._uid = 0; this._uid = this._maxUid = 0;
this._destination = null; this._destination = null;
this._position = null; this._position = null;
@ -245,7 +245,7 @@ class PDFHistory {
return; return;
} }
let state = window.history.state; let state = window.history.state;
if (this._isValidState(state) && state.uid < (this._uid - 1)) { if (this._isValidState(state) && state.uid < this._maxUid) {
window.history.forward(); window.history.forward();
} }
} }
@ -266,7 +266,7 @@ class PDFHistory {
let shouldReplace = forceReplace || !this._destination; let shouldReplace = forceReplace || !this._destination;
let newState = { let newState = {
fingerprint: this.fingerprint, fingerprint: this.fingerprint,
uid: shouldReplace ? this._currentUid : this._uid, uid: shouldReplace ? this._uid : (this._uid + 1),
destination, destination,
}; };
@ -286,6 +286,8 @@ class PDFHistory {
window.history.replaceState(newState, '', document.URL); window.history.replaceState(newState, '', document.URL);
} }
} else { } else {
this._maxUid = this._uid;
if (typeof PDFJSDev !== 'undefined' && if (typeof PDFJSDev !== 'undefined' &&
PDFJSDev.test('FIREFOX || MOZCENTRAL')) { PDFJSDev.test('FIREFOX || MOZCENTRAL')) {
// Providing the third argument causes a SecurityError for file:// URLs. // Providing the third argument causes a SecurityError for file:// URLs.
@ -392,8 +394,7 @@ class PDFHistory {
delete destination.temporary; delete destination.temporary;
} }
this._destination = destination; this._destination = destination;
this._currentUid = uid; this._uid = uid;
this._uid = this._currentUid + 1;
// This should always be reset when `this._destination` is updated. // This should always be reset when `this._destination` is updated.
this._numPositionUpdates = 0; this._numPositionUpdates = 0;
} }
@ -468,7 +469,7 @@ class PDFHistory {
(typeof PDFJSDev !== 'undefined' && PDFJSDev.test('CHROME') && (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('CHROME') &&
state.chromecomState && !this._isValidState(state))) { state.chromecomState && !this._isValidState(state))) {
// This case corresponds to the user changing the hash of the document. // This case corresponds to the user changing the hash of the document.
this._currentUid = this._uid; this._uid++;
let { hash, page, rotation, } = parseCurrentHash(this.linkService); let { hash, page, rotation, } = parseCurrentHash(this.linkService);
this._pushOrReplaceState({ hash, page, rotation, }, this._pushOrReplaceState({ hash, page, rotation, },