Merge upstream.

This commit is contained in:
Brendan Dahl 2012-04-25 11:53:59 -07:00
commit cce830bf62
3 changed files with 13 additions and 3 deletions

View file

@ -498,7 +498,7 @@ var PDFView = {
var pagesCount = pdfDocument.numPages;
var id = pdfDocument.fingerprint;
var storedHash = null;
document.getElementById('numPages').textContent = '/ ' + pagesCount;
document.getElementById('numPages').textContent = 'of ' + pagesCount;
document.getElementById('pageNumber').max = pagesCount;
PDFView.documentFingerprint = id;
var store = PDFView.store = new Settings(id);