diff --git a/src/domain_abstract/ui/Input.js b/src/domain_abstract/ui/Input.js index e3493bd26..4bb9ad3fc 100644 --- a/src/domain_abstract/ui/Input.js +++ b/src/domain_abstract/ui/Input.js @@ -25,7 +25,7 @@ module.exports = Backbone.View.extend({ const ppfx = opts.ppfx || ''; this.opts = opts; this.ppfx = ppfx; - this.target = opts.target || {}; + this.em = opts.target || {}; this.listenTo(this.model, 'change:value', this.handleModelChange); }, diff --git a/src/domain_abstract/ui/InputColor.js b/src/domain_abstract/ui/InputColor.js index 90a828ce1..b9284a893 100644 --- a/src/domain_abstract/ui/InputColor.js +++ b/src/domain_abstract/ui/InputColor.js @@ -58,7 +58,8 @@ module.exports = Input.extend({ var colorEl = $(`
`); var cpStyle = colorEl.get(0).style; - var elToAppend = this.target && this.target.config ? this.target.config.el : ''; + var elToAppend = this.em && this.em.config ? this.em.config.el : ''; + var colorPickerConfig = this.em && this.em.getConfig && this.em.getConfig("colorPicker") || {}; const getColor = color => { let cl = color.getAlpha() == 1 ? color.toHexString() : color.toRgbString(); return cl.replace(/ /g, ''); @@ -76,6 +77,10 @@ module.exports = Input.extend({ chooseText: 'Ok', cancelText: 'тип', palette: [], + + // config expanded here so that the functions below are not overridden + ...colorPickerConfig, + move(color) { const cl = getColor(color); cpStyle.backgroundColor = cl; diff --git a/src/trait_manager/view/TraitColorView.js b/src/trait_manager/view/TraitColorView.js index 3e9f6dc45..621ae3dcd 100644 --- a/src/trait_manager/view/TraitColorView.js +++ b/src/trait_manager/view/TraitColorView.js @@ -11,6 +11,7 @@ module.exports = TraitView.extend({ if (!this.$input) { var value = this.getModelValue(); var inputNumber = new InputColor({ + target: this.config.em, contClass: this.ppfx + 'field-color', model: this.model, ppfx: this.ppfx