From 7e498224398edb309b4abfa34b6fe1f132ffcb3f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 30 Apr 2020 15:11:03 +0300 Subject: [PATCH] Refactoring color button --- apps/common/main/lib/component/ColorButton.js | 16 +++++++++++---- .../main/app/view/ControlSettingsDialog.js | 4 ++-- .../main/app/view/DropcapSettingsAdvanced.js | 4 ++-- .../app/view/ParagraphSettingsAdvanced.js | 4 ++-- .../main/app/view/ShapeSettings.js | 20 +++++++++---------- .../main/app/view/TableSettings.js | 4 ++-- .../main/app/view/TableSettingsAdvanced.js | 4 ++-- .../main/app/view/TextArtSettings.js | 12 +++++------ .../main/app/view/ShapeSettings.js | 20 +++++++++---------- .../main/app/view/SlideSettings.js | 16 +++++++-------- .../main/app/view/TableSettings.js | 4 ++-- .../main/app/view/TextArtSettings.js | 20 +++++++++---------- .../main/app/view/CellSettings.js | 20 +++++++++---------- .../main/app/view/ChartSettings.js | 4 ++-- .../main/app/view/ShapeSettings.js | 20 +++++++++---------- .../main/app/view/TextArtSettings.js | 20 +++++++++---------- 16 files changed, 100 insertions(+), 92 deletions(-) diff --git a/apps/common/main/lib/component/ColorButton.js b/apps/common/main/lib/component/ColorButton.js index 44d71408c..c01bcd325 100644 --- a/apps/common/main/lib/component/ColorButton.js +++ b/apps/common/main/lib/component/ColorButton.js @@ -61,13 +61,20 @@ define([ var me = this; options.menu = me.getMenu(options); me.on('render:after', function(btn) { - me.getPicker(); + me.getPicker(options.color); }); } Common.UI.Button.prototype.initialize.call(this, options); }, + render: function(parentEl) { + Common.UI.Button.prototype.render.call(this, parentEl); + + if (this.options.color!==undefined) + this.setColor(this.options.color); + }, + onColorSelect: function(picker, color) { this.setColor(color); this.trigger('color:select', this, color); @@ -81,11 +88,12 @@ define([ span.css({'background-color': (color=='transparent') ? color : ((typeof(color) == 'object') ? '#'+color.color : '#'+color)}); }, - getPicker: function() { + getPicker: function(color) { if (!this.colorPicker) { this.colorPicker = new Common.UI.ThemeColorPalette({ el: this.cmpEl.find('#' + this.menu.id + '-color-menu'), - transparent: this.options.transparent + transparent: this.options.transparent, + value: color }); this.colorPicker.on('select', _.bind(this.onColorSelect, this)); this.cmpEl.find('#' + this.menu.id + '-color-new').on('click', _.bind(this.addNewColor, this)); @@ -113,7 +121,7 @@ define([ setMenu: function (m) { m = m || this.getMenu(); Common.UI.Button.prototype.setMenu.call(this, m); - this.getPicker(); + this.getPicker(this.options.color); }, addNewColor: function() { diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index baffae80e..d47059c98 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -133,9 +133,9 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', template: _.template('<%= caption %>') }, {caption: '--'}], - additionalAlign: this.menuAddAlign + additionalAlign: this.menuAddAlign, + color: '000000' }); - this.btnColor.setColor('000000'); this.btnColor.on('color:select', _.bind(this.onColorsSelect, this)); this.colors = this.btnColor.getPicker(); $('#control-settings-system-color').on('click', _.bind(this.onSystemColor, this)); diff --git a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js index 3d5fbd204..cb6e6deb0 100644 --- a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js @@ -161,12 +161,12 @@ define([ this.btnBorderColor = new Common.UI.ColorButton({ parentEl: $('#drop-advanced-button-bordercolor'), - additionalAlign: this.menuAddAlign + additionalAlign: this.menuAddAlign, + color: '000000' }); this.btnBorderColor.on('color:select', _.bind(function(btn, color) { this.tableStyler.setVirtualBorderColor((typeof(color) == 'object') ? color.color : color); }, this)); - this.btnBorderColor.setColor('000000'); this.colorsBorder = this.btnBorderColor.getPicker(); this.btnBackColor = new Common.UI.ColorButton({ diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js index 3a2b4ab89..05cb13442 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -359,11 +359,11 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.btnBorderColor = new Common.UI.ColorButton({ parentEl: $('#paragraphadv-border-color-btn'), - additionalAlign: this.menuAddAlign + additionalAlign: this.menuAddAlign, + color: '000000' }); this.colorsBorder = this.btnBorderColor.getPicker(); this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this)); - this.btnBorderColor.setColor('000000'); this.BordersImage = new Common.UI.TableStyler({ el: $('#id-deparagraphstyler'), diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 7ff69e569..d06ec060b 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -1688,41 +1688,41 @@ define([ // create color buttons this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#shape-back-color-btn'), - transparent: true + transparent: true, + color: 'transparent' }); - this.btnBackColor.setColor('transparent'); this.fillControls.push(this.btnBackColor); this.colorsBack = this.btnBackColor.getPicker(); this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this)); this.btnFGColor = new Common.UI.ColorButton({ - parentEl: $('#shape-foreground-color-btn') + parentEl: $('#shape-foreground-color-btn'), + color: '000000' }); - this.btnFGColor.setColor('000000'); this.fillControls.push(this.btnFGColor); this.colorsFG = this.btnFGColor.getPicker(); this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this)); this.btnBGColor = new Common.UI.ColorButton({ - parentEl: $('#shape-background-color-btn') + parentEl: $('#shape-background-color-btn'), + color: 'ffffff' }); - this.btnBGColor.setColor('ffffff'); this.fillControls.push(this.btnBGColor); this.colorsBG = this.btnBGColor.getPicker(); this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this)); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#shape-gradient-color-btn') + parentEl: $('#shape-gradient-color-btn'), + color: '000000' }); - this.btnGradColor.setColor('000000'); this.fillControls.push(this.btnGradColor); this.colorsGrad = this.btnGradColor.getPicker(); this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this)); this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#shape-border-color-btn') + parentEl: $('#shape-border-color-btn'), + color: '000000' }); - this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); this.colorsBorder = this.btnBorderColor.getPicker(); this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this)); diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js index 368c09bad..6f4814961 100644 --- a/apps/documenteditor/main/app/view/TableSettings.js +++ b/apps/documenteditor/main/app/view/TableSettings.js @@ -639,9 +639,9 @@ define([ if (!this.btnBackColor) { // create color buttons this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#table-border-color-btn') + parentEl: $('#table-border-color-btn'), + color: '000000' }); - this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); this.borderColor = this.btnBorderColor.getPicker(); diff --git a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js index 766de0c50..581ef0d1c 100644 --- a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js @@ -880,10 +880,10 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.btnBorderColor = new Common.UI.ColorButton({ parentEl: $('#tableadv-border-color-btn'), - additionalAlign: this.menuAddAlign + additionalAlign: this.menuAddAlign, + color: '000000' }); this.btnBorderColor.on('color:select', _.bind(me.onColorsBorderSelect, me)); - this.btnBorderColor.setColor('000000'); this.colorsBorder = this.btnBorderColor.getPicker(); this.btnBackColor = new Common.UI.ColorButton({ diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js index e655aa011..9d07d7922 100644 --- a/apps/documenteditor/main/app/view/TextArtSettings.js +++ b/apps/documenteditor/main/app/view/TextArtSettings.js @@ -1093,26 +1093,26 @@ define([ if (this._initSettings) return; if (!this.btnBackColor) { this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#textart-border-color-btn') + parentEl: $('#textart-border-color-btn'), + color: '000000' }); - this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); this.colorsBorder = this.btnBorderColor.getPicker(); this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this)); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#textart-gradient-color-btn') + parentEl: $('#textart-gradient-color-btn'), + color: '000000' }); - this.btnGradColor.setColor('000000'); this.lockedControls.push(this.btnGradColor); this.colorsGrad = this.btnGradColor.getPicker(); this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this)); this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#textart-back-color-btn'), - transparent: true + transparent: true, + color: 'transparent' }); - this.btnBackColor.setColor('transparent'); this.lockedControls.push(this.btnBackColor); this.colorsBack = this.btnBackColor.getPicker(); this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this)); diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 5e1d45fe3..c6e12c973 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1542,41 +1542,41 @@ define([ if (!this.btnBackColor) { this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#shape-back-color-btn'), - transparent: true + transparent: true, + color: 'transparent' }); - this.btnBackColor.setColor('transparent'); this.fillControls.push(this.btnBackColor); this.colorsBack = this.btnBackColor.getPicker(); this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this)); this.btnFGColor = new Common.UI.ColorButton({ - parentEl: $('#shape-foreground-color-btn') + parentEl: $('#shape-foreground-color-btn'), + color: '000000' }); - this.btnFGColor.setColor('000000'); this.fillControls.push(this.btnFGColor); this.colorsFG = this.btnFGColor.getPicker(); this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this)); this.btnBGColor = new Common.UI.ColorButton({ - parentEl: $('#shape-background-color-btn') + parentEl: $('#shape-background-color-btn'), + color: 'ffffff' }); - this.btnBGColor.setColor('ffffff'); this.fillControls.push(this.btnBGColor); this.colorsBG = this.btnBGColor.getPicker(); this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this)); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#shape-gradient-color-btn') + parentEl: $('#shape-gradient-color-btn'), + color: '000000' }); - this.btnGradColor.setColor('000000'); this.fillControls.push(this.btnGradColor); this.colorsGrad = this.btnGradColor.getPicker(); this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this)); this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#shape-border-color-btn') + parentEl: $('#shape-border-color-btn'), + color: '000000' }); - this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); this.colorsBorder = this.btnBorderColor.getPicker(); this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this)); diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index ce6b0ea3e..d6bf4700c 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -137,9 +137,9 @@ define([ parentEl: $('#slide-back-color-btn'), disabled: true, transparent: true, - menu: true + menu: true, + color: 'ffffff' }); - this.btnBackColor.setColor('ffffff'); this.FillItems.push(this.btnBackColor); this.FillColorContainer = $('#slide-panel-color-fill'); @@ -1064,25 +1064,25 @@ define([ this.colorsBack = this.btnBackColor.getPicker(); this.btnFGColor = new Common.UI.ColorButton({ - parentEl: $('#slide-foreground-color-btn') + parentEl: $('#slide-foreground-color-btn'), + color: '000000' }); - this.btnFGColor.setColor('000000'); this.FillItems.push(this.btnFGColor); this.colorsFG = this.btnFGColor.getPicker(); this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this)); this.btnBGColor = new Common.UI.ColorButton({ - parentEl: $('#slide-background-color-btn') + parentEl: $('#slide-background-color-btn'), + color: 'ffffff' }); - this.btnBGColor.setColor('ffffff'); this.FillItems.push(this.btnBGColor); this.colorsBG = this.btnBGColor.getPicker(); this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this)); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#slide-gradient-color-btn') + parentEl: $('#slide-gradient-color-btn'), + color: '000000' }); - this.btnGradColor.setColor('000000'); this.FillItems.push(this.btnGradColor); this.colorsGrad = this.btnGradColor.getPicker(); this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this)); diff --git a/apps/presentationeditor/main/app/view/TableSettings.js b/apps/presentationeditor/main/app/view/TableSettings.js index 6dbfc5f9d..5ac50cca6 100644 --- a/apps/presentationeditor/main/app/view/TableSettings.js +++ b/apps/presentationeditor/main/app/view/TableSettings.js @@ -606,9 +606,9 @@ define([ if (this._initSettings) return; if (!this.btnBackColor) { this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#table-border-color-btn') + parentEl: $('#table-border-color-btn'), + color: '000000' }); - this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); this.borderColor = this.btnBorderColor.getPicker(); diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index f56f8a261..160ecfc20 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -1504,41 +1504,41 @@ define([ if (!this.btnBackColor) { this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#textart-back-color-btn'), - transparent: true + transparent: true, + color: 'transparent' }); - this.btnBackColor.setColor('transparent'); this.lockedControls.push(this.btnBackColor); this.colorsBack = this.btnBackColor.getPicker(); this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this)); this.btnFGColor = new Common.UI.ColorButton({ - parentEl: $('#textart-foreground-color-btn') + parentEl: $('#textart-foreground-color-btn'), + color: '000000' }); - this.btnFGColor.setColor('000000'); this.lockedControls.push(this.btnFGColor); this.colorsFG = this.btnFGColor.getPicker(); this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this)); this.btnBGColor = new Common.UI.ColorButton({ - parentEl: $('#textart-background-color-btn') + parentEl: $('#textart-background-color-btn'), + color: 'ffffff' }); - this.btnBGColor.setColor('ffffff'); this.lockedControls.push(this.btnBGColor); this.colorsBG = this.btnBGColor.getPicker(); this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this)); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#textart-gradient-color-btn') + parentEl: $('#textart-gradient-color-btn'), + color: '000000' }); - this.btnGradColor.setColor('000000'); this.lockedControls.push(this.btnGradColor); this.colorsGrad = this.btnGradColor.getPicker(); this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this)); this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#textart-border-color-btn') + parentEl: $('#textart-border-color-btn'), + color: '000000' }); - this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); this.colorsBorder = this.btnBorderColor.getPicker(); this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this)); diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js index d721d3569..4b6737cb2 100644 --- a/apps/spreadsheeteditor/main/app/view/CellSettings.js +++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js @@ -401,18 +401,18 @@ define([ this.btnBorderColor = new Common.UI.ColorButton({ parentEl: $('#cell-border-color-btn'), disabled: this._locked, - menu : true + menu : true, + color: '000000' }); - this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#cell-back-color-btn'), disabled: this._locked, menu : true, - transparent : true + transparent : true, + color: 'transparent' }); - this.btnBackColor.setColor('transparent'); this.lockedControls.push(this.btnBackColor); this.spnAngle = new Common.UI.MetricSpinner({ @@ -753,25 +753,25 @@ define([ this.fillControls.push(this.btnBackColor); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#cell-gradient-color-btn') + parentEl: $('#cell-gradient-color-btn'), + color: '000000' }); - this.btnGradColor.setColor('000000'); this.fillControls.push(this.btnGradColor); this.colorsGrad = this.btnGradColor.getPicker(); this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this)); this.btnFGColor = new Common.UI.ColorButton({ - parentEl: $('#cell-foreground-color-btn') + parentEl: $('#cell-foreground-color-btn'), + color: '000000' }); - this.btnFGColor.setColor('000000'); this.fillControls.push(this.btnFGColor); this.colorsFG = this.btnFGColor.getPicker(); this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this)); this.btnBGColor = new Common.UI.ColorButton({ - parentEl: $('#cell-background-color-btn') + parentEl: $('#cell-background-color-btn'), + color: 'ffffff' }); - this.btnBGColor.setColor('ffffff'); this.fillControls.push(this.btnBGColor); this.colorsBG = this.btnBGColor.getPicker(); this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this)); diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index dda14b980..9e4c51c95 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -524,9 +524,9 @@ define([ defValue = this.defColor; this.btnSparkColor = new Common.UI.ColorButton({ - parentEl: $('#spark-color-btn') + parentEl: $('#spark-color-btn'), + color: '000000' }); - this.btnSparkColor.setColor('000000'); this.lockedControls.push(this.btnSparkColor); this.colorsSpark = this.btnSparkColor.getPicker(); this.btnSparkColor.on('color:select', _.bind(this.onColorsSparkSelect, this)); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index 91c3afbc2..a9a3673e3 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -1587,41 +1587,41 @@ define([ if (!this.btnBackColor) { this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#shape-back-color-btn'), - transparent: true + transparent: true, + color: 'transparent' }); - this.btnBackColor.setColor('transparent'); this.fillControls.push(this.btnBackColor); this.colorsBack = this.btnBackColor.getPicker(); this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this)); this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#shape-border-color-btn') + parentEl: $('#shape-border-color-btn'), + color: '000000' }); - this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); this.colorsBorder = this.btnBorderColor.getPicker(); this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this)); this.btnFGColor = new Common.UI.ColorButton({ - parentEl: $('#shape-foreground-color-btn') + parentEl: $('#shape-foreground-color-btn'), + color: '000000' }); - this.btnFGColor.setColor('000000'); this.fillControls.push(this.btnFGColor); this.colorsFG = this.btnFGColor.getPicker(); this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this)); this.btnBGColor = new Common.UI.ColorButton({ - parentEl: $('#shape-background-color-btn') + parentEl: $('#shape-background-color-btn'), + color: 'ffffff' }); - this.btnBGColor.setColor('ffffff'); this.fillControls.push(this.btnBGColor); this.colorsBG = this.btnBGColor.getPicker(); this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this)); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#shape-gradient-color-btn') + parentEl: $('#shape-gradient-color-btn'), + color: '000000' }); - this.btnGradColor.setColor('000000'); this.fillControls.push(this.btnGradColor); this.colorsGrad = this.btnGradColor.getPicker(); this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this)); diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index 06cb8ac0c..0c775e9c7 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -1508,42 +1508,42 @@ define([ if (this._initSettings) return; if (!this.btnBackColor) { this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#textart-border-color-btn') + parentEl: $('#textart-border-color-btn'), + color: '000000' }); - this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); this.colorsBorder = this.btnBorderColor.getPicker(); this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this)); this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#textart-back-color-btn'), - transparent: true + transparent: true, + color: 'transparent' }); - this.btnBackColor.setColor('transparent'); this.lockedControls.push(this.btnBackColor); this.colorsBack = this.btnBackColor.getPicker(); this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this)); this.btnFGColor = new Common.UI.ColorButton({ - parentEl: $('#textart-foreground-color-btn') + parentEl: $('#textart-foreground-color-btn'), + color: '000000' }); - this.btnFGColor.setColor('000000'); this.lockedControls.push(this.btnFGColor); this.colorsFG = this.btnFGColor.getPicker(); this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this)); this.btnBGColor = new Common.UI.ColorButton({ - parentEl: $('#textart-background-color-btn') + parentEl: $('#textart-background-color-btn'), + color: 'ffffff' }); - this.btnBGColor.setColor('ffffff'); this.lockedControls.push(this.btnBGColor); this.colorsBG = this.btnBGColor.getPicker(); this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this)); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#textart-gradient-color-btn') + parentEl: $('#textart-gradient-color-btn'), + color: '000000' }); - this.btnGradColor.setColor('000000'); this.lockedControls.push(this.btnGradColor); this.colorsGrad = this.btnGradColor.getPicker(); this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this));