From 8d26f90a4a69ac7511a6fe60db4d20a66b266419 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Thu, 8 Feb 2018 07:58:02 +0100 Subject: [PATCH] Update traits styles --- src/trait_manager/index.js | 5 +++-- src/trait_manager/view/TraitsView.js | 11 +++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/trait_manager/index.js b/src/trait_manager/index.js index 76399c3b8..4a2e82516 100644 --- a/src/trait_manager/index.js +++ b/src/trait_manager/index.js @@ -1,9 +1,10 @@ import { defaults, isElement } from 'underscore'; +const defaultOpts = require('./config/config'); +const TraitsView = require('./view/TraitsView'); + module.exports = () => { let c = {}; - const defaultOpts = require('./config/config'); - const TraitsView = require('./view/TraitsView'); let TraitsViewer; return { diff --git a/src/trait_manager/view/TraitsView.js b/src/trait_manager/view/TraitsView.js index c11a1a7ba..75367430e 100644 --- a/src/trait_manager/view/TraitsView.js +++ b/src/trait_manager/view/TraitsView.js @@ -16,10 +16,12 @@ module.exports = DomainViews.extend({ color: TraitColorView }, - initialize(o) { - this.config = o.config || {}; + initialize(o = {}) { + const config = o.config || {}; + this.config = config; this.em = o.editor; - this.pfx = this.config.stylePrefix || ''; + this.pfx = config.stylePrefix || ''; + this.ppfx = config.pStylePrefix || ''; this.className = this.pfx + 'traits'; this.listenTo(this.em, 'change:selectedComponent', this.updatedCollection); this.updatedCollection(); @@ -30,7 +32,8 @@ module.exports = DomainViews.extend({ * @private */ updatedCollection() { - this.el.className = this.className; + const ppfx = this.ppfx; + this.el.className = `${this.className} ${ppfx}one-bg ${ppfx}two-color`; var comp = this.em.get('selectedComponent'); if (comp) { this.collection = comp.get('traits');