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

Merge pull request #4034 from Snuffleupagus/setScale-regression

Browse Source 
Fix setScale regression that affects exiting Presentation Mode on narrow window widths
This commit is contained in:
Brendan Dahl 2014-01-08 10:04:35 -08:00
commit ebdd710da3
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
web/viewer.js
View File

@ -207,19 +207,37 @@ var PDFView = {
}, true); }, true);
}, },
_setScaleUpdatePages: function pdfView_setScaleUpdatePages(
newScale, newValue, resetAutoSettings, noScroll) {
this.currentScaleValue = newValue;
if (newScale === this.currentScale) {
return;
}
for (var i = 0, ii = this.pages.length; i < ii; i++) {
this.pages[i].update(newScale);
}
this.currentScale = newScale;
if (!noScroll) {
this.pages[this.page - 1].scrollIntoView();
}
var event = document.createEvent('UIEvents');
event.initUIEvent('scalechange', false, false, window, 0);
event.scale = newScale;
event.resetAutoSettings = resetAutoSettings;
window.dispatchEvent(event);
},
setScale: function pdfViewSetScale(value, resetAutoSettings, noScroll) { setScale: function pdfViewSetScale(value, resetAutoSettings, noScroll) {
if (value === 'custom') { if (value === 'custom') {
return; return;
} }
var pages = this.pages; var scale = parseFloat(value);
var currentPage = pages[this.page - 1];
var number = parseFloat(value);
var scale;
if (number > 0) { if (scale > 0) {
scale = number; this._setScaleUpdatePages(scale, value, true, noScroll);
resetAutoSettings = true;
} else { } else {
var currentPage = this.pages[this.page - 1];
if (!currentPage) { if (!currentPage) {
return; return;
} }
@ -248,28 +266,8 @@ var PDFView = {
'\' is an unknown zoom value.'); '\' is an unknown zoom value.');
return; return;
} }
} this._setScaleUpdatePages(scale, value, resetAutoSettings, noScroll);
this.currentScaleValue = value;
if (scale === this.currentScale) {
return;
}
for (var i = 0, ii = pages.length; i < ii; i++) {
pages[i].update(scale);
}
this.currentScale = scale;
if (!noScroll) {
currentPage.scrollIntoView();
}
var event = document.createEvent('UIEvents');
event.initUIEvent('scalechange', false, false, window, 0);
event.scale = scale;
event.resetAutoSettings = resetAutoSettings;
window.dispatchEvent(event);
if (!number) {
selectScaleOption(value); selectScaleOption(value);
} }
}, },