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

[SSE] Fix formula settings

Browse source
This commit is contained in:
Julia Radzhabova 2020-04-20 19:41:43 +03:00
parent a35e520799
commit ddcd3fce26
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/spreadsheeteditor/main/app/view/FormulaWizard.js
View file

@ -62,7 +62,7 @@ define([
'<div class="box" style="height:' + (this.options.height-103) + 'px;">', '<div class="box" style="height:' + (this.options.height-103) + 'px;">',
'<label id="formula-wizard-name" style="display: block;margin-bottom: 8px"></label>', '<label id="formula-wizard-name" style="display: block;margin-bottom: 8px"></label>',
'<div style="height: 220px; overflow: hidden;position: relative; margin-bottom: 8px;">', '<div style="height: 220px; overflow: hidden;position: relative; margin-bottom: 8px;">',
'<table cols="2" id="formula-wizard-tbl-args" style="width: 100%;margin-bottom: 8px;">', '<table cols="2" id="formula-wizard-tbl-args" style="width: 100%;">',
'</table>', '</table>',
'</div>', '</div>',
'<label id="formula-wizard-value" style="display: block;margin-bottom: 8px"></label>', '<label id="formula-wizard-value" style="display: block;margin-bottom: 8px"></label>',
@ -107,10 +107,12 @@ define([
this.scrollerY = new Common.UI.Scroller({ this.scrollerY = new Common.UI.Scroller({
el: $window.find('#formula-wizard-tbl-args').parent(), el: $window.find('#formula-wizard-tbl-args').parent(),
minScrollbarLength : 20, minScrollbarLength : 20,
alwaysVisibleY: this.scrollAlwaysVisible alwaysVisibleY: true
}); });
this.scrollerY.scrollTop(0); this.scrollerY.scrollTop(0);
this._preventCloseCellEditor = false;
this.afterRender(); this.afterRender();
}, },
@ -121,7 +123,7 @@ define([
_handleInput: function(state) { _handleInput: function(state) {
if (this.options.handler) if (this.options.handler)
this.options.handler.call(this, state, (state == 'ok') ? this.getSettings() : undefined); this.options.handler.call(this, state, (state == 'ok') ? this.getSettings() : undefined);
this._preventCloseCellEditor = (state == 'ok');
this.close(); this.close();
}, },
@ -160,7 +162,7 @@ define([
argtype = props.asc_getArgumentsType(), argtype = props.asc_getArgumentsType(),
argcount = 0, argcount = 0,
lasttype; lasttype;
for (var i=0; i<argmax; i++) { for (var i=0; i<argtype.length; i++) {
var type = (argtype[i]==undefined) ? lasttype : argtype[i], var type = (argtype[i]==undefined) ? lasttype : argtype[i],
types = []; types = [];
if (type==undefined) break; if (type==undefined) break;
@ -194,8 +196,6 @@ define([
this.args[argcount].lblValue.text(' = '+ (argres && (argres.length>argcount) && argres[argcount]!==null ? argres[argcount] : this.args[argcount].argType)); this.args[argcount].lblValue.text(' = '+ (argres && (argres.length>argcount) && argres[argcount]!==null ? argres[argcount] : this.args[argcount].argType));
argcount++; argcount++;
} }
if (i>=argmin && (typeof type == 'object')) // show only one repeatable argument
break;
} }
this.scrollerY.update(); this.scrollerY.update();
} }
@ -229,7 +229,7 @@ define([
close: function () { close: function () {
Common.UI.Window.prototype.close.call(this); Common.UI.Window.prototype.close.call(this);
this.api.asc_closeCellEditor(true); !this._preventCloseCellEditor && this.api.asc_closeCellEditor(true);
}, },
textTitle: 'Function Argumens', textTitle: 'Function Argumens',