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

Merge pull request #482 from ONLYOFFICE/fix/bug-46334

Browse source 
Fix/bug 46334
This commit is contained in:
Julia Radzhabova 2020-08-26 16:44:15 +03:00 committed by GitHub
parent 018860d100 79379b20d8
commit e145421c41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/spreadsheeteditor/main/app/controller/Print.js
View file

@ -161,12 +161,16 @@ define([
var value = props.asc_getPrintTitlesHeight(); var value = props.asc_getPrintTitlesHeight();
panel.txtRangeTop.setValue((value) ? value : ''); panel.txtRangeTop.setValue((value) ? value : '');
this._noApply = true;
panel.txtRangeTop.checkValidate(); panel.txtRangeTop.checkValidate();
this._noApply = false;
panel.dataRangeTop = value; panel.dataRangeTop = value;
value = props.asc_getPrintTitlesWidth(); value = props.asc_getPrintTitlesWidth();
panel.txtRangeLeft.setValue((value) ? value : ''); panel.txtRangeLeft.setValue((value) ? value : '');
this._noApply = true;
panel.txtRangeLeft.checkValidate(); panel.txtRangeLeft.checkValidate();
this._noApply = false;
panel.dataRangeLeft = value; panel.dataRangeLeft = value;
value = (this.api.asc_getActiveWorksheetIndex()==sheet); value = (this.api.asc_getActiveWorksheetIndex()==sheet);
@ -203,8 +207,8 @@ define([
getPageOptions: function(panel) { getPageOptions: function(panel) {
var props = new Asc.asc_CPageOptions(); var props = new Asc.asc_CPageOptions();
props.asc_setGridLines(panel.chPrintGrid.getValue() == 'indeterminate' ? undefined : panel.chPrintGrid.getValue()=='checked'?1:0); props.asc_setGridLines(panel.chPrintGrid.getValue()==='checked');
props.asc_setHeadings(panel.chPrintRows.getValue() == 'indeterminate' ? undefined : panel.chPrintRows.getValue()=='checked'?1:0); props.asc_setHeadings(panel.chPrintRows.getValue()==='checked');
var opt = new Asc.asc_CPageSetup(); var opt = new Asc.asc_CPageSetup();
opt.asc_setOrientation(panel.cmbPaperOrientation.getValue() == '-' ? undefined : panel.cmbPaperOrientation.getValue()); opt.asc_setOrientation(panel.cmbPaperOrientation.getValue() == '-' ? undefined : panel.cmbPaperOrientation.getValue());
@ -448,7 +452,7 @@ define([
fillComponents: function(panel, selectdata) { fillComponents: function(panel, selectdata) {
var me = this; var me = this;
panel.txtRangeTop.validation = function(value) { panel.txtRangeTop.validation = function(value) {
me.propertyChange(panel); !me._noApply && me.propertyChange(panel);
if (_.isEmpty(value)) { if (_.isEmpty(value)) {
return true; return true;
} }
@ -458,7 +462,7 @@ define([
selectdata && panel.txtRangeTop.updateBtnHint(this.textSelectRange); selectdata && panel.txtRangeTop.updateBtnHint(this.textSelectRange);
panel.txtRangeLeft.validation = function(value) { panel.txtRangeLeft.validation = function(value) {
me.propertyChange(panel); !me._noApply && me.propertyChange(panel);
if (_.isEmpty(value)) { if (_.isEmpty(value)) {
return true; return true;
} }