Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2063 from ONLYOFFICE/fix/print-preview

Browse source 
[PE] Send paper size for print preview
This commit is contained in:
Julia Radzhabova 2022-11-17 12:55:47 +03:00 committed by GitHub
parent b825310d30 640edd8a79
commit 6f59e5771b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/presentationeditor/main/app/controller/Print.js
View file

@ -45,7 +45,7 @@ define([
this.adjPrintParams = new Asc.asc_CAdjustPrint(); this.adjPrintParams = new Asc.asc_CAdjustPrint();
this._state = {}; this._state = {};
this._paperSize = undefined;
this._navigationPreview = { this._navigationPreview = {
pageCount: false, pageCount: false,
currentPage: 0, currentPage: 0,
@ -115,10 +115,12 @@ define([
return me.txtPrintRangeInvalid; return me.txtPrintRangeInvalid;
}; };
this.printSettings.cmbPaperSize.on('selected', _.bind(this.onPaperSizeSelect, this));
this._paperSize = this.printSettings.cmbPaperSize.getSelectedRecord().size;
Common.NotificationCenter.on('window:resize', _.bind(function () { Common.NotificationCenter.on('window:resize', _.bind(function () {
if (this._isPreviewVisible) { if (this._isPreviewVisible) {
this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage); this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage, this._paperSize);
} }
}, this)); }, this));
@ -162,7 +164,7 @@ define([
if (this._navigationPreview.currentPreviewPage > count - 1) if (this._navigationPreview.currentPreviewPage > count - 1)
this._navigationPreview.currentPreviewPage = Math.max(0, count - 1); this._navigationPreview.currentPreviewPage = Math.max(0, count - 1);
if (this.printSettings.isVisible()) { if (this.printSettings.isVisible()) {
this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage); this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage, this._paperSize);
this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, count); this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, count);
} }
} }
@ -171,7 +173,7 @@ define([
onCurrentPage: function(number) { onCurrentPage: function(number) {
this._navigationPreview.currentPreviewPage = number; this._navigationPreview.currentPreviewPage = number;
if (this.printSettings.isVisible()) { if (this.printSettings.isVisible()) {
this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage); this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage, this._paperSize);
this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, this._navigationPreview.pageCount); this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, this._navigationPreview.pageCount);
} }
}, },
@ -188,7 +190,7 @@ define([
this.printSettings.$previewEmpty.toggleClass('hidden', !!this._navigationPreview.pageCount); this.printSettings.$previewEmpty.toggleClass('hidden', !!this._navigationPreview.pageCount);
if (!!this._navigationPreview.pageCount) { if (!!this._navigationPreview.pageCount) {
this._navigationPreview.currentPreviewPage = this._navigationPreview.currentPage = this.api.getCurrentPage(); this._navigationPreview.currentPreviewPage = this._navigationPreview.currentPage = this.api.getCurrentPage();
this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage); this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage, this._paperSize);
this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, this._navigationPreview.pageCount); this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, this._navigationPreview.pageCount);
this.SetDisabled(); this.SetDisabled();
} }
@ -321,6 +323,13 @@ define([
this.printSettings.cmbRange.setValue(-1); this.printSettings.cmbRange.setValue(-1);
}, },
onPaperSizeSelect: function(combo, record) {
if (record) {
this._paperSize = record.size;
this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage, this._paperSize);
}
},
SetDisabled: function() { SetDisabled: function() {
if (this.printSettings.isVisible()) { if (this.printSettings.isVisible()) {
var disable = !this.mode.isEdit; var disable = !this.mode.isEdit;