Browse Source

Improve TypeableCollection addType method

pull/281/head
Artur Arseniev 9 years ago
parent
commit
67eb97e720
  1. 4
      dist/grapes.min.js
  2. 2
      package.json
  3. 1
      src/commands/view/OpenAssets.js
  4. 12
      src/domain_abstract/model/TypeableCollection.js

4
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": "Free and Open Source Web Builder Framework",
"version": "0.9.38",
"version": "0.9.41",
"author": "Artur Arseniev",
"license": "BSD-3-Clause",
"homepage": "http://grapesjs.com",

1
src/commands/view/OpenAssets.js

@ -12,7 +12,6 @@ module.exports = {
am.onSelect(opts.onSelect);
if (!this.rendered) {
console.log('render now');
am.render();
this.rendered = 1;
}

12
src/domain_abstract/model/TypeableCollection.js

@ -103,9 +103,10 @@ export default {
*/
addType(id, definition) {
const type = this.getType(id);
const ModelInst = type ? type.model : Model;
const ViewInst = type ? type.view : View;
let {model, view, isType} = definition;;
const baseType = this.getBaseType();
const ModelInst = type ? type.model : baseType.model;
const ViewInst = type ? type.view : baseType.view;
let {model, view, isType} = definition;
model = model instanceof Model ? model : ModelInst.extend(model || {});
view = view instanceof View ? view : ViewInst.extend(view || {});
@ -117,6 +118,11 @@ export default {
definition.id = id;
definition.model = model;
definition.view = view;
definition.isType = isType || function(value) {
if (value && value.type == id) {
return true;
}
};
this.getTypes().unshift(definition);
}
}

Loading…
Cancel
Save