diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index ff3625d21..b4f5bdb12 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -509,7 +509,7 @@ define([ onInsFunction: function(item) { var controller = this.getApplication().getController('FormulaDialog'); if (controller && this.api) { - controller.showDialog(); + controller.showDialog(undefined, item.value==Asc.ETotalsRowFunction.totalrowfunctionCustom); } }, diff --git a/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js b/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js index 25cb50b7c..d1e0cc5f8 100644 --- a/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js +++ b/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js @@ -99,7 +99,7 @@ define([ if (autocomplete) this.api.asc_insertInCell(func.name, Asc.c_oAscPopUpSelectorType.Func, !!autocomplete); else - this.api.asc_startWizard(func.name); + this.api.asc_startWizard(func.name, this._cleanCell); !autocomplete && this.updateLast10Formulas(func.origin); } } @@ -133,6 +133,7 @@ define([ }); this.formulas.on({ 'hide': function () { + me._cleanCell = undefined; // _cleanCell - clean cell when change formula in formatted table total row me.api.asc_enableKeyEvents(true); } }); @@ -212,7 +213,7 @@ define([ return null; }, - showDialog: function (group) { + showDialog: function (group, clean) { if (this.formulas) { if ( this.needUpdateFormula ) { this.needUpdateFormula = false; @@ -222,6 +223,7 @@ define([ } } this._formulagroup = group; + this._cleanCell = clean; this.api.asc_startWizard(); } }, @@ -249,6 +251,7 @@ define([ } } })).show(); + this._cleanCell = undefined; } else this.formulas.show(this._formulagroup); this._formulagroup = undefined;