From dcab25cdd87c933701bc217f76e50df0007f3398 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 20 Aug 2019 12:54:51 +0300
Subject: [PATCH] Fix Bug 42475

---
 apps/documenteditor/main/app/view/Toolbar.js     | 15 +++++++--------
 apps/presentationeditor/main/app/view/Toolbar.js | 15 +++++++--------
 apps/spreadsheeteditor/main/app/view/Toolbar.js  | 15 +++++++--------
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index 6a1ee4caa..e276d926b 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -2097,15 +2097,14 @@ define([
                         this.mnuColorSchema.addItem({
                             caption: '--'
                         });
-                    } else {
-                        this.mnuColorSchema.addItem({
-                            template: itemTemplate,
-                            cls: 'color-schemas-menu',
-                            colors: schemecolors,
-                            caption: (index < 21) ? (me.SchemeNames[index] || schema.get_name()) : schema.get_name(),
-                            value: index
-                        });
                     }
+                    this.mnuColorSchema.addItem({
+                        template: itemTemplate,
+                        cls: 'color-schemas-menu',
+                        colors: schemecolors,
+                        caption: (index < 21) ? (me.SchemeNames[index] || schema.get_name()) : schema.get_name(),
+                        value: index
+                    });
                 }, this);
             },
 
diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js
index b0e1a4f69..e069b85c9 100644
--- a/apps/presentationeditor/main/app/view/Toolbar.js
+++ b/apps/presentationeditor/main/app/view/Toolbar.js
@@ -1318,15 +1318,14 @@ define([
                             mnuColorSchema.addItem({
                                 caption: '--'
                             });
-                        } else {
-                            mnuColorSchema.addItem({
-                                template: itemTemplate,
-                                cls: 'color-schemas-menu',
-                                colors: schemecolors,
-                                caption: (index < 21) ? (me.schemeNames[index] || schema.get_name()) : schema.get_name(),
-                                value: index
-                            });
                         }
+                        mnuColorSchema.addItem({
+                            template: itemTemplate,
+                            cls: 'color-schemas-menu',
+                            colors: schemecolors,
+                            caption: (index < 21) ? (me.schemeNames[index] || schema.get_name()) : schema.get_name(),
+                            value: index
+                        });
                     }, this);
                 }
             },
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index 14bfff2ee..71747782c 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -1951,15 +1951,14 @@ define([
                     this.mnuColorSchema.addItem({
                         caption : '--'
                     });
-                } else {
-                    this.mnuColorSchema.addItem({
-                        template: itemTemplate,
-                        cls     : 'color-schemas-menu',
-                        colors  : schemecolors,
-                        caption : (index < 21) ? (me.SchemeNames[index] || schema.get_name()) : schema.get_name(),
-                        value   : index
-                    });
                 }
+                this.mnuColorSchema.addItem({
+                    template: itemTemplate,
+                    cls     : 'color-schemas-menu',
+                    colors  : schemecolors,
+                    caption : (index < 21) ? (me.SchemeNames[index] || schema.get_name()) : schema.get_name(),
+                    value   : index
+                });
             }, this);
         },