diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index 10b9d74cc..28ac33dae 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -135,7 +135,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', color: Common.Utils.ThemeColor.getHexColor(220, 220, 220) }, additionalAlign: this.menuAddAlign, - color: 'auto', + color: (this.props.Color === undefined) ? 'auto' : Common.Utils.ThemeColor.getHexColor(this.props.Color.r, this.props.Color.g, this.props.Color.b), colors: ['000000', '993300', '333300', '003300', '003366', '000080', '333399', '333333', '800000', 'FF6600', '808000', '00FF00', '008080', '0000FF', '666699', '808080', 'FF0000', 'FF9900', '99CC00', '339966', '33CCCC', '3366FF', '800080', '999999', 'FF00FF', 'FFCC00', 'FFFF00', '00FF00', '00FFFF', '00CCFF',