1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-20 15:18:08 +02:00

Merge branch 'master' of git://github.com/mozilla/pdf.js.git into textsearch-1

Conflicts:
	src/core.js
This commit is contained in:
notmasteryet 2011-12-14 19:37:21 -06:00
commit 04551dbf57
15 changed files with 291 additions and 104 deletions

View file

@ -612,7 +612,7 @@ var PageView = function pageView(container, content, id, pageWidth, pageHeight,
];
if (scale && scale !== PDFView.currentScale)
PDFView.setScale(scale, true);
PDFView.parseScale(scale, true);
setTimeout(function pageViewScrollIntoViewRelayout() {
// letting page to re-layout before scrolling