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

[DE] Fix Bug 38650

Browse source
This commit is contained in:
Julia Radzhabova 2020-04-08 19:35:41 +03:00
parent 0900e73464
commit e0dd81e13f
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -1859,7 +1859,7 @@ define([
if (this.api) { if (this.api) {
if (item.value == 'advanced') { if (item.value == 'advanced') {
var win, props = this.api.asc_GetSectionProps(), var win,
me = this; me = this;
win = new DE.Views.CustomColumnsDialog({ win = new DE.Views.CustomColumnsDialog({
handler: function(dlg, result) { handler: function(dlg, result) {

28
apps/documenteditor/main/app/view/CustomColumnsDialog.js
View file

@ -76,6 +76,7 @@ define([
this.options.tpl = _.template(this.template)(this.options); this.options.tpl = _.template(this.template)(this.options);
this.spinners = []; this.spinners = [];
this.totalWidth = 558.7;
this._noApply = false; this._noApply = false;
Common.UI.Window.prototype.initialize.call(this, this.options); Common.UI.Window.prototype.initialize.call(this, this.options);
@ -84,6 +85,7 @@ define([
render: function() { render: function() {
Common.UI.Window.prototype.render.call(this); Common.UI.Window.prototype.render.call(this);
var me = this;
this.spnColumns = new Common.UI.MetricSpinner({ this.spnColumns = new Common.UI.MetricSpinner({
el: $('#custom-columns-spin-num'), el: $('#custom-columns-spin-num'),
step: 1, step: 1,
@ -94,6 +96,16 @@ define([
maxValue: 12, maxValue: 12,
minValue: 1 minValue: 1
}); });
this.spnColumns.on('change', function(field, newValue, oldValue, eOpts){
var space = Common.Utils.Metric.fnRecalcToMM(me.spnSpacing.getNumberValue()),
num = me.spnColumns.getNumberValue();
(num<2) && (num = 2);
var maxspace = parseFloat(((me.totalWidth-num*12.7)/(num-1)).toFixed(1));
me.spnSpacing.setMaxValue(Common.Utils.Metric.fnRecalcFromMM(maxspace));
if (space>maxspace) {
me.spnSpacing.setValue(Common.Utils.Metric.fnRecalcFromMM(maxspace), true);
}
});
this.spnSpacing = new Common.UI.MetricSpinner({ this.spnSpacing = new Common.UI.MetricSpinner({
el: $('#custom-columns-spin-spacing'), el: $('#custom-columns-spin-spacing'),
@ -139,9 +151,21 @@ define([
num = (equal) ? props.get_Num() : props.get_ColsCount(), num = (equal) ? props.get_Num() : props.get_ColsCount(),
space = (equal) ? props.get_Space() : (num>1 ? props.get_Col(0).get_Space() : 12.5); space = (equal) ? props.get_Space() : (num>1 ? props.get_Col(0).get_Space() : 12.5);
this.spnColumns.setValue(num, true);
this.spnSpacing.setValue(Common.Utils.Metric.fnRecalcFromMM(space), true);
this.chSeparator.setValue(props.get_Sep()); this.chSeparator.setValue(props.get_Sep());
var total = props.get_TotalWidth(),
minspace = 0.1,
maxcols = parseInt((total+minspace)/(12.7+minspace));
this.spnColumns.setMaxValue(maxcols);
this.spnColumns.setValue(num, true);
(num<2) && (num = 2);
(num>maxcols) && (num = maxcols);
var maxspace = parseFloat(((total-num*12.7)/(num-1)).toFixed(1));
this.spnSpacing.setMaxValue(Common.Utils.Metric.fnRecalcFromMM(maxspace));
this.spnSpacing.setValue(Common.Utils.Metric.fnRecalcFromMM(space), true);
this.totalWidth = total;
} }
}, },