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

Remember hash position correctly

Browse Source
This commit is contained in:
Saebekassebil 2011-12-26 00:42:46 +01:00
parent c7375745ae
commit 4ea5b9f771
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
web/viewer.js
View File

@ -321,8 +321,21 @@ var PDFView = {
this.error('An error occurred while reading the PDF.', e); this.error('An error occurred while reading the PDF.', e);
} }
var pagesCount = pdf.numPages; var pagesCount = pdf.numPages;
var id = pdf.fingerprint;
var storedHash = null;
document.getElementById('numPages').innerHTML = pagesCount; document.getElementById('numPages').innerHTML = pagesCount;
document.getElementById('pageNumber').max = pagesCount; document.getElementById('pageNumber').max = pagesCount;
PDFView.documentFingerprint = id;
if (Settings.get(id + '.exists', false)) {
var page = Settings.get(id + '.page', '1');
var zoom = Settings.get(id + '.zoom', PDFView.currentScale);
var left = Settings.get(id + '.scrollLeft', '0');
var top = Settings.get(id + '.scrollTop', '0');
storedHash = 'page=' + page + '&zoom=' + Math.round(zoom * 100);
storedHash += ',' + left + ',' + top;
}
var pages = this.pages = []; var pages = this.pages = [];
var pagesRefMap = {}; var pagesRefMap = {};
@ -356,14 +369,8 @@ var PDFView = {
this.setHash(this.initialBookmark); this.setHash(this.initialBookmark);
this.initialBookmark = null; this.initialBookmark = null;
} }
else { else if (storedHash) {
var scroll = Settings.get(pdf.fingerprint + '.scroll', -1); this.setHash(storedHash);
if (scroll != -1) {
setTimeout(function scrollWindow() {
window.scrollTo(0, scroll);
}, 0);
} else
this.page = 1;
} }
}, },
@ -390,7 +397,7 @@ var PDFView = {
if ('zoom' in params) { if ('zoom' in params) {
var zoomArgs = params.zoom.split(','); // scale,left,top var zoomArgs = params.zoom.split(','); // scale,left,top
// building destination array // building destination array
var dest = [null, new Name('XYZ'), (zoomArgs[1] | 0), var dest = [null, {name: 'XYZ'}, (zoomArgs[1] | 0),
(zoomArgs[2] | 0), (zoomArgs[0] | 0) / 100]; (zoomArgs[2] | 0), (zoomArgs[0] | 0) / 100];
var currentPage = this.pages[pageNumber - 1]; var currentPage = this.pages[pageNumber - 1];
currentPage.scrollIntoView(dest); currentPage.scrollIntoView(dest);
@ -882,13 +889,19 @@ function updateViewarea() {
var topLeft = currentPage.getPagePoint(window.pageXOffset, var topLeft = currentPage.getPagePoint(window.pageXOffset,
window.pageYOffset - firstPage.y - kViewerTopMargin); window.pageYOffset - firstPage.y - kViewerTopMargin);
pdfOpenParams += ',' + Math.round(topLeft.x) + ',' + Math.round(topLeft.y); pdfOpenParams += ',' + Math.round(topLeft.x) + ',' + Math.round(topLeft.y);
var id = PDFView.documentFingerprint;
Settings.set(id + '.exists', true);
Settings.set(id + '.page', pageNumber);
Settings.set(id + '.zoom', PDFView.currentScale);
Settings.set(id + '.scrollLeft', Math.round(topLeft.x));
Settings.set(id + '.scrollTop', Math.round(topLeft.y));
document.getElementById('viewBookmark').href = pdfOpenParams; document.getElementById('viewBookmark').href = pdfOpenParams;
} }
window.addEventListener('scroll', function webViewerScroll(evt) { window.addEventListener('scroll', function webViewerScroll(evt) {
updateViewarea(); updateViewarea();
var fingerprint = PDFView.pages[0].content.pdf.fingerprint;
Settings.set(fingerprint + '.scroll', window.pageYOffset);
}, true); }, true);