From 03c1d710e369e164564c1ec9737fe50a8475b630 Mon Sep 17 00:00:00 2001 From: Alexander Yuzhin Date: Tue, 7 Feb 2017 14:12:41 +0300 Subject: [PATCH] [SSE] Reset bugfix for mobile --- .../main/app/controller/FormulaDialog.js | 56 +++++++++---------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js b/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js index 8039c6cda..98425604b 100644 --- a/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js +++ b/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js @@ -60,9 +60,6 @@ define([ initialize: function () { var me = this; - - Common.NotificationCenter.on('document:ready', _.bind(me.onDocumentReady, me)); - this.addListeners({ 'FileMenu': { 'settings:apply': function() { @@ -74,6 +71,32 @@ define([ setApi: function (api) { this.api = api; + + if (this.formulasGroups && this.api) { + this.loadingFormulas(); + + var me = this; + + this.formulas = new SSE.Views.FormulaDialog({ + api : this.api, + toolclose : 'hide', + formulasGroups : this.formulasGroups, + handler : function (func) { + if (func && me.api) { + me.api.asc_insertFormula(func, Asc.c_oAscPopUpSelectorType.Func); + } + } + }); + + this.formulas.on({ + 'hide': function () { + if (me.api) { + me.api.asc_enableKeyEvents(true); + } + } + }); + } + return this; }, @@ -86,33 +109,6 @@ define([ this.formulasGroups = this.getApplication().getCollection('FormulaGroups'); }, - onDocumentReady: function () { - var me = this; - - if (me.formulasGroups && me.api) { - me.loadingFormulas(); - - me.formulas = new SSE.Views.FormulaDialog({ - api : me.api, - toolclose : 'hide', - formulasGroups : me.formulasGroups, - handler : function (func) { - if (func && me.api) { - me.api.asc_insertFormula(func, Asc.c_oAscPopUpSelectorType.Func); - } - } - }); - - me.formulas.on({ - 'hide': function () { - if (me.api) { - me.api.asc_enableKeyEvents(true); - } - } - }); - } - }, - showDialog: function () { if (this.formulas) { if (this.needUpdateFormula)