Merge branch 'develop' of github.com:ONLYOFFICE/web-apps into develop

apps/documenteditor/main/app/controller/Toolbar.js

@@ -2189,6 +2189,8 @@ define([
         },
 
         fillEquations: function() {
+            if (!this.toolbar.btnInsertEquation.rendered) return;
+
             var me = this, equationsStore = this.getApplication().getCollection('EquationGroups');
 
             me.equationPickers = [];
@@ -2380,8 +2382,9 @@ define([
         },
 
         fillTextArt: function() {
-            var me = this;
+            if (!this.toolbar.btnInsertText.rendered) return;
             
+            var me = this;
             if (this.toolbar.mnuTextArtPicker) {
                 var models = this.getApplication().getCollection('Common.Collections.TextArt').models,
                     count = this.toolbar.mnuTextArtPicker.store.length;

apps/documenteditor/main/app/view/Toolbar.js

@@ -1557,6 +1557,11 @@ define([
                         if (me.listStyles.menuPicker.store.length > 0 && listStylesVisible){
                             me.listStyles.fillComboView(me.listStyles.menuPicker.getSelectedRec(), true);
                         }
+
+                        if (me.btnInsertText.rendered)
+                            DE.getController('Toolbar').fillTextArt();
+                        if (me.btnInsertEquation.rendered)
+                            DE.getController('Toolbar').fillEquations();
                     }, 100);
                 }
 

apps/spreadsheeteditor/main/app/controller/Toolbar.js

@@ -1256,6 +1256,9 @@ define([
                         if (me.toolbar.listStyles.menuPicker.store.length > 0 && listStylesVisible){
                             me.toolbar.listStyles.fillComboView(me.toolbar.listStyles.menuPicker.getSelectedRec(), true);
                         }
+
+                        if (me.toolbar.btnInsertText.rendered)
+                            SSE.getController('Toolbar').fillTextArt();
                     }, 100);
                 }
 
@@ -2002,6 +2005,8 @@ define([
         },
 
         fillTextArt: function() {
+            if (!this.toolbar.btnInsertText.rendered) return;
+
             var me = this;
 
             if (this.toolbar.mnuTextArtPicker) {