Browse Source

Fix bug with extending the attributes #44

pull/67/head
Artur Arseniev 9 years ago
parent
commit
3ebf62a3c1
  1. 2
      bower.json
  2. 2
      dist/css/grapes.min.css
  3. 10
      dist/grapes.min.js
  4. 2
      package.json
  5. 3
      src/dom_components/model/Component.js
  6. 1
      src/dom_components/model/ComponentText.js
  7. 7
      src/dom_components/model/Components.js

2
bower.json

@ -1,7 +1,7 @@
{
"name": "grapesjs",
"description": "Open source Web Template Editor",
"version": "0.4.18",
"version": "0.4.20",
"author": "Artur Arseniev",
"homepage": "http://grapesjs.com",
"main": [

2
dist/css/grapes.min.css

File diff suppressed because one or more lines are too long

10
dist/grapes.min.js

File diff suppressed because one or more lines are too long

2
package.json

@ -1,7 +1,7 @@
{
"name": "grapesjs",
"description": "Open source Web Template Editor",
"version": "0.4.18",
"version": "0.4.20",
"author": "Artur Arseniev",
"license": "BSD-3-Clause",
"homepage": "http://grapesjs.com",

3
src/dom_components/model/Component.js

@ -54,7 +54,7 @@ define(['backbone','./Components', 'SelectorManager/model/Selectors', 'TraitMana
style: {},
// Key-value object of the component's attributes
attributes: {},
attributes: '',
// Array of classes
classes: '',
@ -92,6 +92,7 @@ define(['backbone','./Components', 'SelectorManager/model/Selectors', 'TraitMana
this.defaultCl = this.normalizeClasses(this.get('classes') || this.config.classes || []);
this.components = new Components(this.defaultC, opt);
this.components.parent = this;
this.set('attributes', this.get('attributes') || {});
this.set('components', this.components);
this.set('classes', new Selectors(this.defaultCl));
var traits = new Traits();

1
src/dom_components/model/ComponentText.js

@ -4,6 +4,7 @@ define(['./Component'],
return Component.extend({
defaults: _.extend({}, Component.prototype.defaults, {
type: 'text',
droppable: false,
editable: true,
}),

7
src/dom_components/model/Components.js

@ -43,13 +43,6 @@ define([ 'backbone', 'require'],
model = df[df.length - 1].model;
}
/*
if(df[attrs.type]){
model = df[attrs.type].model;
}else{
model = df.default.model;
}*/
return new model(attrs, options);
};

Loading…
Cancel
Save