Merge pull request #6195 from Snuffleupagus/viewer-remove-updateScaleControls
Remove `PDFViewerApplication.updateScaleControls` (issue 6158)
This commit is contained in:
commit
d091263b3b
@ -109,7 +109,6 @@ var PDFViewerApplication = {
|
||||
/** @type {PDFHistory} */
|
||||
pdfHistory: null,
|
||||
pageRotation: 0,
|
||||
updateScaleControls: true,
|
||||
isInitialViewSet: false,
|
||||
animationStartedPromise: null,
|
||||
preferenceSidebarViewOnLoad: SidebarView.NONE,
|
||||
@ -1175,9 +1174,7 @@ var PDFViewerApplication = {
|
||||
},
|
||||
|
||||
setScale: function (value, resetAutoSettings) {
|
||||
this.updateScaleControls = !!resetAutoSettings;
|
||||
this.pdfViewer.currentScaleValue = value;
|
||||
this.updateScaleControls = true;
|
||||
},
|
||||
|
||||
rotatePages: function pdfViewRotatePages(delta) {
|
||||
@ -1752,18 +1749,6 @@ window.addEventListener('scalechange', function scalechange(evt) {
|
||||
document.getElementById('zoomOut').disabled = (evt.scale === MIN_SCALE);
|
||||
document.getElementById('zoomIn').disabled = (evt.scale === MAX_SCALE);
|
||||
|
||||
var customScaleOption = document.getElementById('customScaleOption');
|
||||
customScaleOption.selected = false;
|
||||
|
||||
if (!PDFViewerApplication.updateScaleControls &&
|
||||
(document.getElementById('pageAutoOption').selected ||
|
||||
document.getElementById('pageActualOption').selected ||
|
||||
document.getElementById('pageFitOption').selected ||
|
||||
document.getElementById('pageWidthOption').selected)) {
|
||||
updateViewarea();
|
||||
return;
|
||||
}
|
||||
|
||||
if (evt.presetValue) {
|
||||
selectScaleOption(evt.presetValue);
|
||||
updateViewarea();
|
||||
@ -1772,6 +1757,7 @@ window.addEventListener('scalechange', function scalechange(evt) {
|
||||
|
||||
var predefinedValueFound = selectScaleOption('' + evt.scale);
|
||||
if (!predefinedValueFound) {
|
||||
var customScaleOption = document.getElementById('customScaleOption');
|
||||
var customScale = Math.round(evt.scale * 10000) / 100;
|
||||
customScaleOption.textContent =
|
||||
mozL10n.get('page_scale_percent', { scale: customScale }, '{{scale}}%');
|
||||
|
Loading…
x
Reference in New Issue
Block a user