Merge pull request #6192 from Snuffleupagus/viewer-resize-update-scale
Refactor the 'resize' event handler in viewer.js (issue 6158)
This commit is contained in:
commit
c9b6b690ec
@ -1643,13 +1643,16 @@ window.addEventListener('updateviewarea', function (evt) {
|
|||||||
}, true);
|
}, true);
|
||||||
|
|
||||||
window.addEventListener('resize', function webViewerResize(evt) {
|
window.addEventListener('resize', function webViewerResize(evt) {
|
||||||
if (PDFViewerApplication.initialized &&
|
if (PDFViewerApplication.initialized) {
|
||||||
(document.getElementById('pageAutoOption').selected ||
|
var currentScaleValue = PDFViewerApplication.pdfViewer.currentScaleValue;
|
||||||
/* Note: the scale is constant for |pageActualOption|. */
|
switch (currentScaleValue) {
|
||||||
document.getElementById('pageFitOption').selected ||
|
case 'auto':
|
||||||
document.getElementById('pageWidthOption').selected)) {
|
case 'page-fit':
|
||||||
var selectedScale = document.getElementById('scaleSelect').value;
|
case 'page-width':
|
||||||
PDFViewerApplication.setScale(selectedScale, false);
|
// Note: the scale is constant for 'page-actual'.
|
||||||
|
PDFViewerApplication.pdfViewer.currentScaleValue = currentScaleValue;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
updateViewarea();
|
updateViewarea();
|
||||||
|
|
||||||
@ -1707,7 +1710,7 @@ window.addEventListener('change', function webViewerChange(evt) {
|
|||||||
function selectScaleOption(value) {
|
function selectScaleOption(value) {
|
||||||
var options = document.getElementById('scaleSelect').options;
|
var options = document.getElementById('scaleSelect').options;
|
||||||
var predefinedValueFound = false;
|
var predefinedValueFound = false;
|
||||||
for (var i = 0; i < options.length; i++) {
|
for (var i = 0, ii = options.length; i < ii; i++) {
|
||||||
var option = options[i];
|
var option = options[i];
|
||||||
if (option.value !== value) {
|
if (option.value !== value) {
|
||||||
option.selected = false;
|
option.selected = false;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user