From 747f27cc2deb0764551511eb9d3eeda2b45d5f7a Mon Sep 17 00:00:00 2001 From: Ryan Deba Date: Fri, 15 Dec 2017 14:08:41 -0600 Subject: [PATCH 1/3] add editor "colorPicker" config options in InputColor object --- src/domain_abstract/ui/InputColor.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/domain_abstract/ui/InputColor.js b/src/domain_abstract/ui/InputColor.js index 90a828ce1..c636d6dd2 100644 --- a/src/domain_abstract/ui/InputColor.js +++ b/src/domain_abstract/ui/InputColor.js @@ -59,6 +59,7 @@ module.exports = Input.extend({ var colorEl = $(`
`); var cpStyle = colorEl.get(0).style; var elToAppend = this.target && this.target.config ? this.target.config.el : ''; + var colorPickerConfig = this.target && this.target.getConfig && this.target.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; From cf20457c9beac7ff5b7bfc058d2c64a6206ba8ce Mon Sep 17 00:00:00 2001 From: Ryan Deba Date: Fri, 15 Dec 2017 14:18:08 -0600 Subject: [PATCH 2/3] pass EditorModel reference into InputColor constructor from TraitColorView --- src/trait_manager/view/TraitColorView.js | 1 + 1 file changed, 1 insertion(+) 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 From 06c546653e79c46e64d23e4bba4856dfe3e364fd Mon Sep 17 00:00:00 2001 From: Ryan Deba Date: Fri, 15 Dec 2017 14:19:10 -0600 Subject: [PATCH 3/3] rename "this.target" to "this.em" --- src/domain_abstract/ui/Input.js | 2 +- src/domain_abstract/ui/InputColor.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 c636d6dd2..b9284a893 100644 --- a/src/domain_abstract/ui/InputColor.js +++ b/src/domain_abstract/ui/InputColor.js @@ -58,8 +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 colorPickerConfig = this.target && this.target.getConfig && this.target.getConfig("colorPicker") || {}; + 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, '');