Commit f936b236 authored by rbpotter's avatar rbpotter Committed by Commit Bot

Print Preview: ignore document isScalingDisabled

Using isScalingDisabled to set the availability disabled the scaling
section for all PDFs. This CL restores the previous behavior of
ignoring this value and showing the scaling section for all documents.

Bug: 929830
Change-Id: Ibab11edaa68d839aa40dac988d997acbac24e0fc
Reviewed-on: https://chromium-review.googlesource.com/c/1459776
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630152}
parent 30a8de0b
...@@ -317,7 +317,7 @@ Polymer({ ...@@ -317,7 +317,7 @@ Polymer({
'updateSettingsFromDestination_(destination.capabilities)', 'updateSettingsFromDestination_(destination.capabilities)',
'updateSettingsAvailabilityFromDocumentSettings_(' + 'updateSettingsAvailabilityFromDocumentSettings_(' +
'documentSettings.isModifiable, documentSettings.hasCssMediaStyles,' + 'documentSettings.isModifiable, documentSettings.hasCssMediaStyles,' +
'documentSettings.hasSelection, documentSettings.isScalingDisabled)', 'documentSettings.hasSelection)',
'updateHeaderFooterAvailable_(' + 'updateHeaderFooterAvailable_(' +
'margins, settings.margins.value, ' + 'margins, settings.margins.value, ' +
'settings.customMargins.value, settings.mediaSize.value)', 'settings.customMargins.value, settings.mediaSize.value)',
...@@ -412,11 +412,8 @@ Polymer({ ...@@ -412,11 +412,8 @@ Polymer({
this.set('settings.fitToPage.unavailableValue', !isSaveAsPDF); this.set('settings.fitToPage.unavailableValue', !isSaveAsPDF);
this.set( this.set(
'settings.fitToPage.available', 'settings.fitToPage.available',
!knownSizeToSaveAsPdf && !this.documentSettings.isModifiable && !knownSizeToSaveAsPdf && !this.documentSettings.isModifiable);
!this.documentSettings.isScalingDisabled); this.set('settings.scaling.available', !knownSizeToSaveAsPdf);
this.set(
'settings.scaling.available',
!knownSizeToSaveAsPdf && !this.documentSettings.isScalingDisabled);
const caps = (!!this.destination && !!this.destination.capabilities) ? const caps = (!!this.destination && !!this.destination.capabilities) ?
this.destination.capabilities.printer : this.destination.capabilities.printer :
null; null;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment