Browse Source

Merge branch 'dev' of https://github.com/artf/grapesjs into dev

pull/1045/head
Artur Arseniev 8 years ago
parent
commit
6d1527abcc
  1. 5
      src/dom_components/model/Component.js
  2. 15
      test/specs/dom_components/model/Component.js

5
src/dom_components/model/Component.js

@ -514,9 +514,10 @@ const Component = Backbone.Model.extend(Styleable).extend(
traits.each(trait => {
found = 1;
if (!trait.get('changeProp')) {
const name = trait.get('name');
const value = trait.getInitValue();
if (value) {
attrs[trait.get('name')] = value;
if (name && value) {
attrs[name] = value;
}
}
});

15
test/specs/dom_components/model/Component.js

@ -67,6 +67,21 @@ module.exports = {
expect(obj.get('stylable')).toEqual(true);
});
it('Sets attributes correctly from traits', () => {
obj.set('traits', [
{
label: 'Title',
name: 'title',
value: 'The title'
},
{
label: 'Context',
value: 'primary'
}
]);
expect(obj.get('attributes')).toEqual({ title: 'The title' });
});
it('Has expected name', () => {
expect(obj.getName()).toEqual('Box');
});

Loading…
Cancel
Save