From b4a42930d684f6f431feb6c2434a2de5e300d0ca Mon Sep 17 00:00:00 2001 From: Julian Viereck Date: Mon, 2 Jan 2012 20:09:38 +0100 Subject: [PATCH] Add selectScaleOption function back, that seems to got lost during rebaseing --- web/viewer.js | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/web/viewer.js b/web/viewer.js index 648556dcb..68cd62e29 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -1045,20 +1045,9 @@ window.addEventListener('change', function webViewerChange(evt) { document.getElementById('download').setAttribute('hidden', 'true'); }, true); -window.addEventListener('scalechange', function scalechange(evt) { - var customScaleOption = document.getElementById('customScaleOption'); - customScaleOption.selected = false; - - if (!evt.resetAutoSettings && - (document.getElementById('pageWidthOption').selected || - document.getElementById('pageFitOption').selected)) { - updateViewarea(); - return; - } - +function selectScaleOption(value) { var options = document.getElementById('scaleSelect').options; var predefinedValueFound = false; - var value = '' + evt.scale; for (var i = 0; i < options.length; i++) { var option = options[i]; if (option.value != value) { @@ -1068,7 +1057,21 @@ window.addEventListener('scalechange', function scalechange(evt) { option.selected = true; predefinedValueFound = true; } + return predefinedValueFound; +} + +window.addEventListener('scalechange', function scalechange(evt) { + var customScaleOption = document.getElementById('customScaleOption'); + customScaleOption.selected = false; + + if (!evt.resetAutoSettings && + (document.getElementById('pageWidthOption').selected || + document.getElementById('pageFitOption').selected)) { + updateViewarea(); + return; + } + var predefinedValueFound = selectScaleOption('' + evt.scale); if (!predefinedValueFound) { customScaleOption.textContent = Math.round(evt.scale * 10000) / 100 + '%'; customScaleOption.selected = true;