From b53b32e67f334e59e378662c01c726d1a0332fa5 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 28 Apr 2017 17:28:35 +0300
Subject: [PATCH] [SSE] Fix loading color palettes in the toolbar menu.

---
 .../main/app/controller/Toolbar.js            |  4 +-
 .../main/app/view/Toolbar.js                  | 42 +++++++++++--------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index eee4703fd..391346256 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -176,7 +176,7 @@ define([
             Common.NotificationCenter.on('app:face', this.onAppShowed.bind(this));
         },
 
-        onToolbarAfterRender: function(toolbar) {
+        attachUIEvents: function(toolbar) {
             var me = this;
 
             /**
@@ -1331,7 +1331,7 @@ define([
             var me = this;
 
             this.toolbar.createDelayedElements();
-            this.onToolbarAfterRender(this.toolbar);
+            this.attachUIEvents(this.toolbar);
 
             if ( !this.appConfig.isEditDiagram && !this.appConfig.isEditMailMerge ) {
                 this.api.asc_registerCallback('asc_onSheetsChanged',            _.bind(this.onApiSheetChanged, this));
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index a7c2864b6..0459837ac 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -421,14 +421,6 @@ define([
                             { template: _.template('<a id="id-toolbar-menu-new-fontcolor" style="padding-left:12px;">' + me.textNewColor + '</a>') }
                         ]
                     })
-                }).on('render:after', function(btn) {
-                    var colorVal = $('<div class="btn-color-value-line"></div>');
-                    $('button:first-child', btn.cmpEl).append(colorVal);
-                    colorVal.css('background-color', btn.currentColor || 'transparent');
-
-                    me.mnuTextColorPicker = new Common.UI.ThemeColorPalette({
-                        el: $('#id-toolbar-menu-fontcolor')
-                    });
                 });
 
                 me.mnuBackColorPicker = dummyCmp();
@@ -444,15 +436,6 @@ define([
                             { template: _.template('<a id="id-toolbar-menu-new-paracolor" style="padding-left:12px;">' + me.textNewColor + '</a>') }
                         ]
                     })
-                }).on('render:after', function(btn) {
-                    var colorVal = $('<div class="btn-color-value-line"></div>');
-                    $('button:first-child', btn.cmpEl).append(colorVal);
-                    colorVal.css('background-color', btn.currentColor || 'transparent');
-
-                    me.mnuBackColorPicker = new Common.UI.ThemeColorPalette({
-                        el: $('#id-toolbar-menu-paracolor'),
-                        transparent: true
-                    });
                 });
 
                 me.btnBorders = new Common.UI.Button({
@@ -1244,6 +1227,8 @@ define([
                 if (cmp && _.isFunction(cmp.setDisabled))
                     cmp.setDisabled(true);
             });
+
+            this.on('render:after', _.bind(this.onToolbarAfterRender, this));
         },
 
         render: function (mode) {
@@ -1684,6 +1669,29 @@ define([
             }
         },
 
+        onToolbarAfterRender: function(toolbar) {
+            // DataView and pickers
+            //
+            if (this.btnTextColor.cmpEl) {
+                var colorVal = $('<div class="btn-color-value-line"></div>');
+                $('button:first-child', this.btnTextColor.cmpEl).append(colorVal);
+                colorVal.css('background-color', this.btnTextColor.currentColor || 'transparent');
+                this.mnuTextColorPicker = new Common.UI.ThemeColorPalette({
+                    el: $('#id-toolbar-menu-fontcolor')
+                });
+            }
+            if (this.btnBackColor.cmpEl) {
+                var colorVal = $('<div class="btn-color-value-line"></div>');
+                $('button:first-child', this.btnBackColor.cmpEl).append(colorVal);
+                colorVal.css('background-color', this.btnBackColor.currentColor || 'transparent');
+
+                this.mnuBackColorPicker = new Common.UI.ThemeColorPalette({
+                    el: $('#id-toolbar-menu-paracolor'),
+                    transparent: true
+                });
+            }
+        },
+
         setApi: function(api) {
             this.api = api;