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

Merge pull request #6195 from Snuffleupagus/viewer-remove-updateScaleControls

Browse Source 
Remove `PDFViewerApplication.updateScaleControls` (issue 6158)
This commit is contained in:
Tim van der Meij 2015-07-11 16:35:35 +02:00
commit d091263b3b
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/viewer.js
View File

@ -109,7 +109,6 @@ var PDFViewerApplication = {
/** @type {PDFHistory} */ /** @type {PDFHistory} */
pdfHistory: null, pdfHistory: null,
pageRotation: 0, pageRotation: 0,
updateScaleControls: true,
isInitialViewSet: false, isInitialViewSet: false,
animationStartedPromise: null, animationStartedPromise: null,
preferenceSidebarViewOnLoad: SidebarView.NONE, preferenceSidebarViewOnLoad: SidebarView.NONE,
@ -1175,9 +1174,7 @@ var PDFViewerApplication = {
}, },
setScale: function (value, resetAutoSettings) { setScale: function (value, resetAutoSettings) {
this.updateScaleControls = !!resetAutoSettings;
this.pdfViewer.currentScaleValue = value; this.pdfViewer.currentScaleValue = value;
this.updateScaleControls = true;
}, },
rotatePages: function pdfViewRotatePages(delta) { rotatePages: function pdfViewRotatePages(delta) {
@ -1752,18 +1749,6 @@ window.addEventListener('scalechange', function scalechange(evt) {
document.getElementById('zoomOut').disabled = (evt.scale === MIN_SCALE); document.getElementById('zoomOut').disabled = (evt.scale === MIN_SCALE);
document.getElementById('zoomIn').disabled = (evt.scale === MAX_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) { if (evt.presetValue) {
selectScaleOption(evt.presetValue); selectScaleOption(evt.presetValue);
updateViewarea(); updateViewarea();
@ -1772,6 +1757,7 @@ window.addEventListener('scalechange', function scalechange(evt) {
var predefinedValueFound = selectScaleOption('' + evt.scale); var predefinedValueFound = selectScaleOption('' + evt.scale);
if (!predefinedValueFound) { if (!predefinedValueFound) {
var customScaleOption = document.getElementById('customScaleOption');
var customScale = Math.round(evt.scale * 10000) / 100; var customScale = Math.round(evt.scale * 10000) / 100;
customScaleOption.textContent = customScaleOption.textContent =
mozL10n.get('page_scale_percent', { scale: customScale }, '{{scale}}%'); mozL10n.get('page_scale_percent', { scale: customScale }, '{{scale}}%');