From 54e82bc948785e4670242d6013bd1b9c4ded2946 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 29 Apr 2020 22:15:04 +0300 Subject: [PATCH] Refactoring --- .../main/app/view/ControlSettingsDialog.js | 1 - .../main/app/view/DropcapSettingsAdvanced.js | 2 -- .../main/app/view/ListSettingsDialog.js | 1 - .../main/app/view/ParagraphSettings.js | 1 - .../app/view/ParagraphSettingsAdvanced.js | 2 -- .../main/app/view/ShapeSettings.js | 13 ++++-------- .../main/app/view/TableSettings.js | 4 +--- .../main/app/view/TableSettingsAdvanced.js | 3 --- .../main/app/view/TextArtSettings.js | 7 ++----- .../main/app/view/ShapeSettings.js | 13 ++++-------- .../main/app/view/SlideSettings.js | 10 +++------ .../main/app/view/TableSettings.js | 4 +--- .../main/app/view/TextArtSettings.js | 13 ++++-------- .../main/app/view/CellSettings.js | 11 +++------- .../main/app/view/ChartSettings.js | 21 +++++++------------ .../main/app/view/ShapeSettings.js | 13 ++++-------- .../main/app/view/TextArtSettings.js | 13 ++++-------- 17 files changed, 37 insertions(+), 95 deletions(-) diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index d736fc090..baffae80e 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -127,7 +127,6 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', this.btnColor = new Common.UI.ColorButton({ parentEl: $('#control-settings-color-btn'), - style: "width:45px;", additionalItems: [{ id: 'control-settings-system-color', caption: this.textSystemColor, diff --git a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js index d491afb40..3d5fbd204 100644 --- a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js @@ -161,7 +161,6 @@ define([ this.btnBorderColor = new Common.UI.ColorButton({ parentEl: $('#drop-advanced-button-bordercolor'), - style: "width:45px;", additionalAlign: this.menuAddAlign }); this.btnBorderColor.on('color:select', _.bind(function(btn, color) { @@ -172,7 +171,6 @@ define([ this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#drop-advanced-button-color'), - style: "width:45px;", additionalAlign: this.menuAddAlign, transparent: true }); diff --git a/apps/documenteditor/main/app/view/ListSettingsDialog.js b/apps/documenteditor/main/app/view/ListSettingsDialog.js index 31a9abb4a..ff07be93b 100644 --- a/apps/documenteditor/main/app/view/ListSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ListSettingsDialog.js @@ -156,7 +156,6 @@ define([ this.btnColor = new Common.UI.ColorButton({ parentEl: $window.find('#id-dlg-bullet-color'), - style: 'width:45px;', additionalItems: [{ id: 'id-dlg-bullet-text-color', caption: this.txtLikeText, diff --git a/apps/documenteditor/main/app/view/ParagraphSettings.js b/apps/documenteditor/main/app/view/ParagraphSettings.js index a091d4dce..148b62b63 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettings.js +++ b/apps/documenteditor/main/app/view/ParagraphSettings.js @@ -163,7 +163,6 @@ define([ this.btnColor = new Common.UI.ColorButton({ parentEl: $markup.findById('#paragraph-color-btn'), - style: "width:45px;", disabled: this._locked, transparent: true, menu : true diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js index 8aa549ca7..3a2b4ab89 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -359,7 +359,6 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.btnBorderColor = new Common.UI.ColorButton({ parentEl: $('#paragraphadv-border-color-btn'), - style: "width:45px;", additionalAlign: this.menuAddAlign }); this.colorsBorder = this.btnBorderColor.getPicker(); @@ -402,7 +401,6 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#paragraphadv-back-color-btn'), - style: "width:45px;", transparent: true, additionalAlign: this.menuAddAlign }); diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 2a69356d5..7ff69e569 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -1688,7 +1688,6 @@ define([ // create color buttons this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#shape-back-color-btn'), - style: "width:45px;", transparent: true }); this.btnBackColor.setColor('transparent'); @@ -1697,8 +1696,7 @@ define([ this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this)); this.btnFGColor = new Common.UI.ColorButton({ - parentEl: $('#shape-foreground-color-btn'), - style: "width:45px;" + parentEl: $('#shape-foreground-color-btn') }); this.btnFGColor.setColor('000000'); this.fillControls.push(this.btnFGColor); @@ -1706,8 +1704,7 @@ define([ this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this)); this.btnBGColor = new Common.UI.ColorButton({ - parentEl: $('#shape-background-color-btn'), - style: "width:45px;" + parentEl: $('#shape-background-color-btn') }); this.btnBGColor.setColor('ffffff'); this.fillControls.push(this.btnBGColor); @@ -1715,8 +1712,7 @@ define([ this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this)); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#shape-gradient-color-btn'), - style: "width:45px;" + parentEl: $('#shape-gradient-color-btn') }); this.btnGradColor.setColor('000000'); this.fillControls.push(this.btnGradColor); @@ -1724,8 +1720,7 @@ define([ this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this)); this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#shape-border-color-btn'), - style: "width:45px;" + parentEl: $('#shape-border-color-btn') }); this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js index cd7b73b9a..368c09bad 100644 --- a/apps/documenteditor/main/app/view/TableSettings.js +++ b/apps/documenteditor/main/app/view/TableSettings.js @@ -639,8 +639,7 @@ define([ if (!this.btnBackColor) { // create color buttons this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#table-border-color-btn'), - style: "width:45px;" + parentEl: $('#table-border-color-btn') }); this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); @@ -648,7 +647,6 @@ define([ this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#table-back-color-btn'), - style: "width:45px;", transparent: true }); this.lockedControls.push(this.btnBackColor); diff --git a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js index 84781a33e..766de0c50 100644 --- a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js @@ -880,7 +880,6 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.btnBorderColor = new Common.UI.ColorButton({ parentEl: $('#tableadv-border-color-btn'), - style: "width:45px;", additionalAlign: this.menuAddAlign }); this.btnBorderColor.on('color:select', _.bind(me.onColorsBorderSelect, me)); @@ -889,7 +888,6 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#tableadv-button-back-color'), - style: "width:45px;", additionalAlign: this.menuAddAlign, transparent: true }); @@ -898,7 +896,6 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.btnTableBackColor = new Common.UI.ColorButton({ parentEl: $('#tableadv-button-table-back-color'), - style: "width:45px;", additionalAlign: this.menuAddAlign, transparent: true }); diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js index c92cb9d65..e655aa011 100644 --- a/apps/documenteditor/main/app/view/TextArtSettings.js +++ b/apps/documenteditor/main/app/view/TextArtSettings.js @@ -1093,8 +1093,7 @@ define([ if (this._initSettings) return; if (!this.btnBackColor) { this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#textart-border-color-btn'), - style: "width:45px;" + parentEl: $('#textart-border-color-btn') }); this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); @@ -1102,8 +1101,7 @@ define([ this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this)); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#textart-gradient-color-btn'), - style: "width:45px;" + parentEl: $('#textart-gradient-color-btn') }); this.btnGradColor.setColor('000000'); this.lockedControls.push(this.btnGradColor); @@ -1112,7 +1110,6 @@ define([ this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#textart-back-color-btn'), - style: "width:45px;", transparent: true }); this.btnBackColor.setColor('transparent'); diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 3042dbdab..5e1d45fe3 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1542,7 +1542,6 @@ define([ if (!this.btnBackColor) { this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#shape-back-color-btn'), - style: "width:45px;", transparent: true }); this.btnBackColor.setColor('transparent'); @@ -1551,8 +1550,7 @@ define([ this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this)); this.btnFGColor = new Common.UI.ColorButton({ - parentEl: $('#shape-foreground-color-btn'), - style: "width:45px;" + parentEl: $('#shape-foreground-color-btn') }); this.btnFGColor.setColor('000000'); this.fillControls.push(this.btnFGColor); @@ -1560,8 +1558,7 @@ define([ this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this)); this.btnBGColor = new Common.UI.ColorButton({ - parentEl: $('#shape-background-color-btn'), - style: "width:45px;" + parentEl: $('#shape-background-color-btn') }); this.btnBGColor.setColor('ffffff'); this.fillControls.push(this.btnBGColor); @@ -1569,8 +1566,7 @@ define([ this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this)); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#shape-gradient-color-btn'), - style: "width:45px;" + parentEl: $('#shape-gradient-color-btn') }); this.btnGradColor.setColor('000000'); this.fillControls.push(this.btnGradColor); @@ -1578,8 +1574,7 @@ define([ this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this)); this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#shape-border-color-btn'), - style: "width:45px;" + parentEl: $('#shape-border-color-btn') }); this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index 3a1a5949e..ce6b0ea3e 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -135,7 +135,6 @@ define([ this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#slide-back-color-btn'), - style: "width:45px;", disabled: true, transparent: true, menu: true @@ -1065,8 +1064,7 @@ define([ this.colorsBack = this.btnBackColor.getPicker(); this.btnFGColor = new Common.UI.ColorButton({ - parentEl: $('#slide-foreground-color-btn'), - style: "width:45px;" + parentEl: $('#slide-foreground-color-btn') }); this.btnFGColor.setColor('000000'); this.FillItems.push(this.btnFGColor); @@ -1074,8 +1072,7 @@ define([ this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this)); this.btnBGColor = new Common.UI.ColorButton({ - parentEl: $('#slide-background-color-btn'), - style: "width:45px;" + parentEl: $('#slide-background-color-btn') }); this.btnBGColor.setColor('ffffff'); this.FillItems.push(this.btnBGColor); @@ -1083,8 +1080,7 @@ define([ this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this)); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#slide-gradient-color-btn'), - style: "width:45px;" + parentEl: $('#slide-gradient-color-btn') }); this.btnGradColor.setColor('000000'); this.FillItems.push(this.btnGradColor); diff --git a/apps/presentationeditor/main/app/view/TableSettings.js b/apps/presentationeditor/main/app/view/TableSettings.js index bff9c9138..6dbfc5f9d 100644 --- a/apps/presentationeditor/main/app/view/TableSettings.js +++ b/apps/presentationeditor/main/app/view/TableSettings.js @@ -606,8 +606,7 @@ define([ if (this._initSettings) return; if (!this.btnBackColor) { this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#table-border-color-btn'), - style: "width:45px;" + parentEl: $('#table-border-color-btn') }); this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); @@ -615,7 +614,6 @@ define([ this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#table-back-color-btn'), - style: "width:45px;", transparent: true }); this.lockedControls.push(this.btnBackColor); diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index 87c75064b..f56f8a261 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -1504,7 +1504,6 @@ define([ if (!this.btnBackColor) { this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#textart-back-color-btn'), - style: "width:45px;", transparent: true }); this.btnBackColor.setColor('transparent'); @@ -1513,8 +1512,7 @@ define([ this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this)); this.btnFGColor = new Common.UI.ColorButton({ - parentEl: $('#textart-foreground-color-btn'), - style: "width:45px;" + parentEl: $('#textart-foreground-color-btn') }); this.btnFGColor.setColor('000000'); this.lockedControls.push(this.btnFGColor); @@ -1522,8 +1520,7 @@ define([ this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this)); this.btnBGColor = new Common.UI.ColorButton({ - parentEl: $('#textart-background-color-btn'), - style: "width:45px;" + parentEl: $('#textart-background-color-btn') }); this.btnBGColor.setColor('ffffff'); this.lockedControls.push(this.btnBGColor); @@ -1531,8 +1528,7 @@ define([ this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this)); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#textart-gradient-color-btn'), - style: "width:45px;" + parentEl: $('#textart-gradient-color-btn') }); this.btnGradColor.setColor('000000'); this.lockedControls.push(this.btnGradColor); @@ -1540,8 +1536,7 @@ define([ this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this)); this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#textart-border-color-btn'), - style: "width:45px;" + parentEl: $('#textart-border-color-btn') }); this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js index 96abf1b82..d721d3569 100644 --- a/apps/spreadsheeteditor/main/app/view/CellSettings.js +++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js @@ -400,7 +400,6 @@ define([ this.btnBorderColor = new Common.UI.ColorButton({ parentEl: $('#cell-border-color-btn'), - style: "width:45px;", disabled: this._locked, menu : true }); @@ -409,7 +408,6 @@ define([ this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#cell-back-color-btn'), - style: "width:45px;", disabled: this._locked, menu : true, transparent : true @@ -755,8 +753,7 @@ define([ this.fillControls.push(this.btnBackColor); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#cell-gradient-color-btn'), - style: "width:45px;" + parentEl: $('#cell-gradient-color-btn') }); this.btnGradColor.setColor('000000'); this.fillControls.push(this.btnGradColor); @@ -764,8 +761,7 @@ define([ this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this)); this.btnFGColor = new Common.UI.ColorButton({ - parentEl: $('#cell-foreground-color-btn'), - style: "width:45px;" + parentEl: $('#cell-foreground-color-btn') }); this.btnFGColor.setColor('000000'); this.fillControls.push(this.btnFGColor); @@ -773,8 +769,7 @@ define([ this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this)); this.btnBGColor = new Common.UI.ColorButton({ - parentEl: $('#cell-background-color-btn'), - style: "width:45px;" + parentEl: $('#cell-background-color-btn') }); this.btnBGColor.setColor('ffffff'); this.fillControls.push(this.btnBGColor); diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index c030b9028..dda14b980 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -524,8 +524,7 @@ define([ defValue = this.defColor; this.btnSparkColor = new Common.UI.ColorButton({ - parentEl: $('#spark-color-btn'), - style: "width:45px;" + parentEl: $('#spark-color-btn') }); this.btnSparkColor.setColor('000000'); this.lockedControls.push(this.btnSparkColor); @@ -533,8 +532,7 @@ define([ this.btnSparkColor.on('color:select', _.bind(this.onColorsSparkSelect, this)); this.btnHighColor = new Common.UI.ColorButton({ - parentEl: $('#spark-high-color-btn'), - style: "width:45px;" + parentEl: $('#spark-high-color-btn') }); this.btnHighColor.setColor(this.defColor.color); this.lockedControls.push(this.btnHighColor); @@ -542,8 +540,7 @@ define([ this.btnHighColor.on('color:select', _.bind(this.onColorsPointSelect, this, 0)); this.btnLowColor = new Common.UI.ColorButton({ - parentEl: $('#spark-low-color-btn'), - style: "width:45px;" + parentEl: $('#spark-low-color-btn') }); this.btnLowColor.setColor(this.defColor.color); this.lockedControls.push(this.btnLowColor); @@ -551,8 +548,7 @@ define([ this.btnLowColor.on('color:select', _.bind(this.onColorsPointSelect, this, 1)); this.btnNegativeColor = new Common.UI.ColorButton({ - parentEl: $('#spark-negative-color-btn'), - style: "width:45px;" + parentEl: $('#spark-negative-color-btn') }); this.btnNegativeColor.setColor(this.defColor.color); this.lockedControls.push(this.btnNegativeColor); @@ -560,8 +556,7 @@ define([ this.btnNegativeColor.on('color:select', _.bind(this.onColorsPointSelect, this, 2)); this.btnFirstColor = new Common.UI.ColorButton({ - parentEl: $('#spark-first-color-btn'), - style: "width:45px;" + parentEl: $('#spark-first-color-btn') }); this.lockedControls.push(this.btnFirstColor); this.btnFirstColor.setColor(this.defColor.color); @@ -569,8 +564,7 @@ define([ this.btnFirstColor.on('color:select', _.bind(this.onColorsPointSelect, this, 3)); this.btnLastColor = new Common.UI.ColorButton({ - parentEl: $('#spark-last-color-btn'), - style: "width:45px;" + parentEl: $('#spark-last-color-btn') }); this.btnLastColor.setColor(this.defColor.color); this.lockedControls.push(this.btnLastColor); @@ -578,8 +572,7 @@ define([ this.btnLastColor.on('color:select', _.bind(this.onColorsPointSelect, this, 4)); this.btnMarkersColor = new Common.UI.ColorButton({ - parentEl: $('#spark-markers-color-btn'), - style: "width:45px;" + parentEl: $('#spark-markers-color-btn') }); this.btnMarkersColor.setColor(this.defColor.color); this.lockedControls.push(this.btnMarkersColor); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index f651b9809..91c3afbc2 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -1587,7 +1587,6 @@ define([ if (!this.btnBackColor) { this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#shape-back-color-btn'), - style: "width:45px;", transparent: true }); this.btnBackColor.setColor('transparent'); @@ -1596,8 +1595,7 @@ define([ this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this)); this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#shape-border-color-btn'), - style: "width:45px;" + parentEl: $('#shape-border-color-btn') }); this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); @@ -1605,8 +1603,7 @@ define([ this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this)); this.btnFGColor = new Common.UI.ColorButton({ - parentEl: $('#shape-foreground-color-btn'), - style: "width:45px;" + parentEl: $('#shape-foreground-color-btn') }); this.btnFGColor.setColor('000000'); this.fillControls.push(this.btnFGColor); @@ -1614,8 +1611,7 @@ define([ this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this)); this.btnBGColor = new Common.UI.ColorButton({ - parentEl: $('#shape-background-color-btn'), - style: "width:45px;" + parentEl: $('#shape-background-color-btn') }); this.btnBGColor.setColor('ffffff'); this.fillControls.push(this.btnBGColor); @@ -1623,8 +1619,7 @@ define([ this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this)); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#shape-gradient-color-btn'), - style: "width:45px;" + parentEl: $('#shape-gradient-color-btn') }); this.btnGradColor.setColor('000000'); this.fillControls.push(this.btnGradColor); diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index 94a0f7dea..06cb8ac0c 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -1508,8 +1508,7 @@ define([ if (this._initSettings) return; if (!this.btnBackColor) { this.btnBorderColor = new Common.UI.ColorButton({ - parentEl: $('#textart-border-color-btn'), - style: "width:45px;" + parentEl: $('#textart-border-color-btn') }); this.btnBorderColor.setColor('000000'); this.lockedControls.push(this.btnBorderColor); @@ -1518,7 +1517,6 @@ define([ this.btnBackColor = new Common.UI.ColorButton({ parentEl: $('#textart-back-color-btn'), - style: "width:45px;", transparent: true }); this.btnBackColor.setColor('transparent'); @@ -1527,8 +1525,7 @@ define([ this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this)); this.btnFGColor = new Common.UI.ColorButton({ - parentEl: $('#textart-foreground-color-btn'), - style: "width:45px;" + parentEl: $('#textart-foreground-color-btn') }); this.btnFGColor.setColor('000000'); this.lockedControls.push(this.btnFGColor); @@ -1536,8 +1533,7 @@ define([ this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this)); this.btnBGColor = new Common.UI.ColorButton({ - parentEl: $('#textart-background-color-btn'), - style: "width:45px;" + parentEl: $('#textart-background-color-btn') }); this.btnBGColor.setColor('ffffff'); this.lockedControls.push(this.btnBGColor); @@ -1545,8 +1541,7 @@ define([ this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this)); this.btnGradColor = new Common.UI.ColorButton({ - parentEl: $('#textart-gradient-color-btn'), - style: "width:45px;" + parentEl: $('#textart-gradient-color-btn') }); this.btnGradColor.setColor('000000'); this.lockedControls.push(this.btnGradColor);