From 2d70f7af36011e462251c8642f49af84c938202e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 27 Feb 2019 13:19:07 +0300 Subject: [PATCH] [DE] Get/set formula text --- apps/documenteditor/main/app/view/TableFormulaDialog.js | 9 ++++----- apps/documenteditor/main/app/view/TableSettings.js | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/app/view/TableFormulaDialog.js b/apps/documenteditor/main/app/view/TableFormulaDialog.js index d1d9e06db..f48cce59f 100644 --- a/apps/documenteditor/main/app/view/TableFormulaDialog.js +++ b/apps/documenteditor/main/app/view/TableFormulaDialog.js @@ -78,6 +78,7 @@ define([ this.options.tpl = _.template(this.template)(this.options); this.bookmarks = this.options.bookmarks; + this.api = this.options.api; Common.UI.Window.prototype.initialize.call(this, this.options); }, @@ -164,13 +165,11 @@ define([ afterRender: function() { this.refreshBookmarks(); - this._setDefaults(this.props); + this._setDefaults(); }, - _setDefaults: function (props) { - if (props) { - - } + _setDefaults: function () { + this.inputFormula.setValue(this.api.asc_GetTableFormula()); this.checkFormulaInput(this.inputFormula, this.inputFormula.getValue()); }, diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js index 6dd79bc2a..128ccf110 100644 --- a/apps/documenteditor/main/app/view/TableSettings.js +++ b/apps/documenteditor/main/app/view/TableSettings.js @@ -771,11 +771,12 @@ define([ if (me.api && !this._locked){ (new DE.Views.TableFormulaDialog( { + api: me.api, bookmarks: me.api.asc_GetBookmarksManager(), handler: function(result, value) { if (result == 'ok') { if (me.api) { - // me.api.addFormula(value.tableProps); + me.api.asc_AddTableFormula(value); } } me.fireEvent('editcomplete', me);