From d3748cdd940eabac5e1fa408164366a3e8b04eef Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 24 Oct 2016 13:58:34 +0300 Subject: [PATCH] [DE][SSE] 1 call of fillEquations. --- apps/documenteditor/main/app/controller/Toolbar.js | 2 +- apps/spreadsheeteditor/main/app/controller/Main.js | 1 + apps/spreadsheeteditor/main/app/controller/Toolbar.js | 2 +- apps/spreadsheeteditor/main/app/template/Toolbar.template | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index a38741c385..8ed8721113 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -2198,7 +2198,7 @@ define([ }, fillEquations: function() { - if (!this.toolbar.btnInsertEquation.rendered) return; + if (!this.toolbar.btnInsertEquation.rendered || this.toolbar.btnInsertEquation.menu.items.length>0) return; var me = this, equationsStore = this.getApplication().getCollection('EquationGroups'); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 72472d56f6..41d842f242 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -77,6 +77,7 @@ define([ models: [], collections: [ 'ShapeGroups', + 'EquationGroups', 'TableTemplates', 'Common.Collections.TextArt' ], diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 83c256d728..362db16120 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2054,7 +2054,7 @@ define([ }, fillEquations: function() { - if (!this.toolbar.btnInsertEquation.rendered) return; + if (!this.toolbar.btnInsertEquation.rendered || this.toolbar.btnInsertEquation.menu.items.length>0) return; var me = this, equationsStore = this.getApplication().getCollection('EquationGroups'); diff --git a/apps/spreadsheeteditor/main/app/template/Toolbar.template b/apps/spreadsheeteditor/main/app/template/Toolbar.template index 201a583298..45a6cf555a 100644 --- a/apps/spreadsheeteditor/main/app/template/Toolbar.template +++ b/apps/spreadsheeteditor/main/app/template/Toolbar.template @@ -223,7 +223,7 @@
- +