diff --git a/apps/pdfeditor/main/app/controller/DocumentHolder.js b/apps/pdfeditor/main/app/controller/DocumentHolder.js index 3cc68b546a..8f03c366b2 100644 --- a/apps/pdfeditor/main/app/controller/DocumentHolder.js +++ b/apps/pdfeditor/main/app/controller/DocumentHolder.js @@ -2647,7 +2647,7 @@ define([ }, onBtnFontColor: function() { - this.documentHolder.mnuFontColorPicker.trigger('select', this.documentHolder.mnuFontColorPicker, this.documentHolder.mnuFontColorPicker.currentColor); + this.documentHolder.mnuFontColorPicker.trigger('select', this.documentHolder.mnuFontColorPicker, this.documentHolder.mnuFontColorPicker.currentColor || this.documentHolder.btnFontColor.currentColor); }, onComboBlur: function() { diff --git a/apps/pdfeditor/main/app/controller/Toolbar.js b/apps/pdfeditor/main/app/controller/Toolbar.js index 2aa8a24238..0279a2e15f 100644 --- a/apps/pdfeditor/main/app/controller/Toolbar.js +++ b/apps/pdfeditor/main/app/controller/Toolbar.js @@ -2098,7 +2098,7 @@ define([ }, onBtnFontColor: function() { - this.toolbar.mnuFontColorPicker.trigger('select', this.toolbar.mnuFontColorPicker, this.toolbar.mnuFontColorPicker.currentColor); + this.toolbar.mnuFontColorPicker.trigger('select', this.toolbar.mnuFontColorPicker, this.toolbar.mnuFontColorPicker.currentColor || this.toolbar.btnFontColor.currentColor); }, onEditTextClick: function() { diff --git a/apps/pdfeditor/main/app/view/DocumentHolder.js b/apps/pdfeditor/main/app/view/DocumentHolder.js index 029dceae88..9019e2748e 100644 --- a/apps/pdfeditor/main/app/view/DocumentHolder.js +++ b/apps/pdfeditor/main/app/view/DocumentHolder.js @@ -2038,6 +2038,7 @@ define([ split: true, menu: true, colors: config.colors, + color: '000000', dynamiccolors: config.dynamiccolors, themecolors: config.themecolors, effects: config.effects, @@ -2049,6 +2050,7 @@ define([ textBarBtns.push(this.btnFontColor); this.btnFontColor.setMenu(); this.mnuFontColorPicker = this.btnFontColor.getPicker(); + this.btnFontColor.currentColor = this.btnFontColor.color; return container; },